Update master to v1.3 release

.gitignore

@@ -1,3 +1,4 @@
 buildroot/output/
 buildroot/dl/
+output/
 *.qm

BUILDME.sh

@@ -28,13 +28,18 @@ done
 # Let buildroot build everything
 make
 
-# Copy recovery kernel and rootfs to output dir
+# Create output dir and copy files
+mkdir -p ../output
+mkdir -p ../output/os
+cp -r ../sdcontent/* ../output
 cp output/images/zImage ../output/recovery.img
 cp output/images/rootfs.cpio.lzo ../output/recovery.rfs
 
 # Ensure that output dir contains files necessary to boot
 cp output/images/rpi-firmware/start_cd.elf ../output/recovery.elf
 cp output/images/rpi-firmware/bootcode.bin ../output
+cp output/images/cmdline.txt ../output/recovery.cmdline
+touch ../output/RECOVERY_FILES_DO_NOT_EDIT
 
 # Create build-date timestamp file containing Git HEAD info for build
 rm -f ../output/BUILT* || true

buildroot/.config

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Buildroot 2013.05-git-00009-g28d662a-dirty Configuration
+# Buildroot 2013.05-git-g203f56e-dirty Configuration
 #
 BR2_HAVE_DOT_CONFIG=y
 BR2_arm=y
@@ -492,7 +492,7 @@ BR2_PACKAGE_QT_SCRIPT=y
 #
 # BR2_PACKAGE_GRANTLEE is not set
 # BR2_PACKAGE_QEXTSERIALPORT is not set
-# BR2_PACKAGE_QJSON is not set
+BR2_PACKAGE_QJSON=y
 # BR2_PACKAGE_QTUIO is not set
 # BR2_PACKAGE_QWT is not set
 
@@ -1054,11 +1054,7 @@ BR2_PACKAGE_READLINE=y
 # BR2_PACKAGE_DHCP is not set
 # BR2_PACKAGE_DHCPDUMP is not set
 # BR2_PACKAGE_DNSMASQ is not set
-BR2_PACKAGE_DROPBEAR=y
-# BR2_PACKAGE_DROPBEAR_DISABLE_REVERSEDNS is not set
-BR2_PACKAGE_DROPBEAR_SMALL=y
-# BR2_PACKAGE_DROPBEAR_WTMP is not set
-# BR2_PACKAGE_DROPBEAR_LASTLOG is not set
+# BR2_PACKAGE_DROPBEAR is not set
 
 #
 # ebtables requires a toolchain with IPv6 support
@@ -1190,7 +1186,7 @@ BR2_PACKAGE_DROPBEAR_SMALL=y
 # BR2_PACKAGE_VPNC is not set
 # BR2_PACKAGE_VSFTPD is not set
 # BR2_PACKAGE_VTUN is not set
-# BR2_PACKAGE_WGET is not set
+BR2_PACKAGE_WGET=y
 # BR2_PACKAGE_WIRELESS_REGDB is not set
 # BR2_PACKAGE_WIRELESS_TOOLS is not set
 # BR2_PACKAGE_WIRESHARK is not set

buildroot/kernelconfig-recovery

@@ -9,7 +9,9 @@ CONFIG_BLK_DEV_INITRD=y
 CONFIG_RD_LZO=y
 CONFIG_EXPERT=y
 # CONFIG_COMPAT_BRK is not set
-CONFIG_SLAB=y
+CONFIG_COMPACTION=y
+CONFIG_MIGRATION=y
+CONFIG_SLUB=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODVERSIONS=y
@@ -117,6 +119,7 @@ CONFIG_USB=y
 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 CONFIG_USB_DWCOTG=y
 CONFIG_MMC=y
+CONFIG_MMC_BLOCK_MINORS=32
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_PLTFM=y
 CONFIG_MMC_SDHCI_BCM2708=y

buildroot/package/arora/arora-add-language-cmdline-option.patch

@@ -0,0 +1,22 @@
+--- arora-master.orig/src/browserapplication.cpp
++++ arora-master/src/browserapplication.cpp
+@@ -164,6 +164,19 @@ BrowserApplication::BrowserApplication(i
+     QTimer::singleShot(0, this, SLOT(postLaunch()));
+ #endif
+     languageManager();
++
++    for (int i=1; i<argc; i++)
++    {
++        if (strcmp(argv[i], "-lang") == 0)
++        {
++            if (argc > i+1)
++            {
++                char* defaultLang = argv[++i];
++                if (s_languageManager)
++                    s_languageManager->setCurrentLanguage(strcmp(defaultLang, "en")!=0?QString::fromLocal8Bit(defaultLang):QString());
++            }
++        }
++    }
+ }
+
+ BrowserApplication::~BrowserApplication()

buildroot/package/arora/arora-fix-language-fallback.patch

@@ -0,0 +1,20 @@
+--- arora-master.orig/src/utils/languagemanager.cpp
++++ arora-master/src/utils/languagemanager.cpp
+@@ -125,7 +125,7 @@ QString LanguageManager::convertStringTo
+     foreach (const QString &language, m_languages) {
+         QString country = QLocale(language).name().split(QLatin1Char('_')).value(0);
+         if (country == fallback)
+-            return country;
++            return language;
+     }
+
+     return QString();
+@@ -246,7 +246,7 @@ void LanguageManager::chooseNewLanguage() 
+
+     QStringList items;
+     int defaultItem = -1;
+-    QString current = currentLanguage();
++    QString current = convertStringToLanguageFile(currentLanguage());
+     foreach (const QString &name, m_languages) {
+         QLocale locale(name);
+         QString string = QString(QLatin1String("%1, %2 (%3) %4"))

buildroot/package/arora/arora.mk

@@ -19,6 +19,8 @@ endef
 
 define ARORA_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 0755 $(@D)/arora $(TARGET_DIR)/usr/bin/arora
+	$(INSTALL) -d -m 0755 $(TARGET_DIR)/.qws/share/data/Arora/locale
+	$(INSTALL) -D -m 0755 $(@D)/src/.qm/locale/*.qm $(TARGET_DIR)/.qws/share/data/Arora/locale
 endef
 
 $(eval $(generic-package))

buildroot/package/parted/increase_max_dos_partitions.patch

@@ -0,0 +1,12 @@
+diff -urN parted-2.3.orig/libparted/labels/dos.c parted-2.3/libparted/labels/dos.c
+--- parted-2.3.orig/libparted/labels/dos.c	2010-05-25 14:42:21.000000000 +0100
++++ parted-2.3/libparted/labels/dos.c	2013-09-06 11:07:46.421786138 +0100
+@@ -103,7 +103,7 @@
+  * (i.e. 1022 is sometimes used to indicate "use LBA").
+  */
+ #define MAX_CHS_CYLINDER	1021
+-#define MAX_TOTAL_PART		16
++#define MAX_TOTAL_PART		64
+
+ typedef struct _DosRawPartition		DosRawPartition;
+ typedef struct _DosRawTable		DosRawTable;

buildroot/package/qt/qt.mk

@@ -11,9 +11,9 @@
 #
 ######################################################################
 
-QT_VERSION = 4.8.4
+QT_VERSION = 4.8.5
 QT_SOURCE  = qt-everywhere-opensource-src-$(QT_VERSION).tar.gz
-QT_SITE    = http://releases.qt-project.org/qt4/source
+QT_SITE    = http://download.qt-project.org/official_releases/qt/4.8/$(QT_VERSION)
 QT_DEPENDENCIES = host-pkgconf
 QT_INSTALL_STAGING = YES
 

buildroot/package/recovery/init

@@ -11,7 +11,11 @@
 /bin/hostname -F /etc/hostname
 
 # Load kbd driver
-/sbin/modprobe usbkbd
+#/sbin/modprobe usbkbd
+/sbin/modprobe usbhid
+
+# Set up ACT LED to be triggered by mmc0
+echo mmc0 > /sys/class/leds/led0/trigger
 
 # Set up ACT LED to be triggered by mmc0
 echo mmc0 > /sys/class/leds/led0/trigger
@@ -28,48 +32,52 @@ if grep -q vncinstall /proc/cmdline; then
     ifup eth0
 fi
 
-# Setup dropbear SSH server if specified on cmdline
-if grep -q SSH /proc/cmdline; then
-
-    ifup eth0
-
-    if [ ! -d /etc/dropbear ] ; then
-        mkdir -p /etc/dropbear
-    fi
-
-    if [ ! -f /etc/dropbear/dropbear_rsa_host_key ] ; then
-        echo -n "generating rsa key... "
-        /usr/bin/dropbearkey -t rsa -f /etc/dropbear/dropbear_rsa_host_key > /dev/null 2>&1
-    fi
-
-    if [ ! -f /etc/dropbear/dropbear_dss_host_key ] ; then
-        echo -n "generating dsa key... "
-        /usr/bin/dropbearkey -t dss -f /etc/dropbear/dropbear_dss_host_key > /dev/null 2>&1
-    fi
-
-    umask 077
-
-    start-stop-daemon -S -q -p /var/run/dropbear.pid --exec /usr/sbin/dropbear
-fi
-
 # Mouse acceleration
 #export QWS_MOUSE_PROTO=:accel=1
 
-if grep -q rescueshell /proc/cmdline; then
+SAFE_MODE=`vcgencmd get_config safe_mode_gpio`
+
+if [ ${SAFE_MODE#*=} -eq 1 ] || [ `grep -q rescueshell /proc/cmdline` ]; then
     sh
 else
     RUN_INSTALLER=
+    GPIO_TRIGGER=
+    KEYBOARD_NO_TRIGGER=
+    FORCE_TRIGGER=
     DEFAULT_LANG=
+    DEFAULT_KBD=
+    DEFAULT_DISPLAY=
+    DEFAULT_PARTITION=
+
     if grep -q runinstaller /proc/cmdline; then
         RUN_INSTALLER=-runinstaller
     fi
+    if grep -q gpiotriggerenable /proc/cmdline; then
+        GPIO_TRIGGER=-gpiotriggerenable
+    fi
+    if grep -q keyboardtriggerdisable /proc/cmdline; then
+        KEYBOARD_NO_TRIGGER=-keyboardtriggerdisable
+    fi
+    if grep -q forcetrigger /proc/cmdline; then
+        FORCE_TRIGGER=-forcetrigger
+    fi
     for p in `cat /proc/cmdline` ; do
         if [ "${p%%=*}" == "lang" ] ; then
             DEFAULT_LANG="-lang ${p#*=}";
-            break;
+        fi
+        if [ "${p%%=*}" == "keyboard" ] ; then
+            DEFAULT_KBD="-kbdlayout ${p#*=}";
+        fi
+        if [ "${p%%=*}" == "display" ] ; then
+            DEFAULT_DISPLAY="-dispmode ${p#*=}"
+        fi
+        if [ "${p%%=*}" == "partition" ] ; then
+            DEFAULT_PARTITION="-partition ${p#*=}"
         fi
     done
-    /usr/bin/recovery $RUN_INSTALLER $DEFAULT_LANG -qws 2>/tmp/debug
+
+    /usr/bin/recovery $RUN_INSTALLER $GPIO_TRIGGER $KEYBOARD_NO_TRIGGER $FORCE_TRIGGER $DEFAULT_KBD $DEFAULT_LANG $DEFAULT_DISPLAY $DEFAULT_PARTITION -qws 2>/tmp/debug
+
 fi
 
 # Recovery should have rebooted

buildroot/package/recovery/recovery.mk

@@ -11,7 +11,7 @@ RECOVERY_SITE_METHOD=local
 RECOVERY_LICENSE = BSD-3c
 RECOVERY_LICENSE_FILES = LICENSE.txt
 RECOVERY_INSTALL_STAGING = NO
-RECOVERY_DEPENDENCIES=qt dropbear
+RECOVERY_DEPENDENCIES=qt
 
 define RECOVERY_BUILD_CMDS
 	(cd $(@D) ; $(QT_QMAKE))
@@ -29,6 +29,9 @@ define RECOVERY_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 0755 package/recovery/unicode-fonts/DejaVuSans-Bold.ttf $(TARGET_DIR)/usr/lib/fonts/DejaVuSans-Bold.ttf
 	$(INSTALL) -m 0755 package/recovery/unicode-fonts/DroidSansJapanese.ttf $(TARGET_DIR)/usr/lib/fonts/DroidSansJapanese.ttf
 	$(INSTALL) -m 0755 package/recovery/data/data $(TARGET_DIR)/usr/data
+	$(INSTALL) -m 0644 $(@D)/cmdline.txt $(BINARIES_DIR)/cmdline.txt
+	mkdir -p $(TARGET_DIR)/keymaps/
+	$(INSTALL) -m 0755 package/recovery/keymaps/* $(TARGET_DIR)/keymaps/
 endef
 
 $(eval $(generic-package))

pre-commit-translation-update-hook.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+# Automatically update the translation files on every commit
+#
+# To enable this commit hook, run the following commands in the project root:
+# chmod +x pre-commit-translation-update-hook.sh
+# cp pre-commit-translation-update-hook.sh .git/hooks/pre-commit
+
+cd "$(git rev-parse --show-toplevel)"
+lupdate -no-obsolete recovery/recovery.pro
+git add recovery/*.ts