Update master to v1.2 release (note: requires OS images that use the

revised partitioning scheme - see #64 for details)

Author: Rob-Bishop

.gitignore

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

BUILDME.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Bash script to rebuild recovery
 
@@ -11,11 +11,21 @@ if [ -e output/build ]; then
     rm -rf output/build/recovery* || true
 fi
 
-# Redownload firmware from raspberrypi/firmware master HEAD to update to latest
-if [ $1 = "update-firmware" ]; then
-    rm -rf output/build/rpi-firmware-master
-    rm -rf dl/rpi-firmware-master.tar.gz
-fi
+for i in $*; do
+    # Redownload firmware from raspberrypi/firmware master HEAD to update to latest
+    if [ $i = "update-firmware" ]; then
+        rm -rf output/build/rpi-firmware-master
+        rm -rf dl/rpi-firmware-master.tar.gz
+        echo "rpi-firmware Git HEAD @ "`git ls-remote --heads https://github.com/raspberrypi/firmware | sed -n 2p` > rpi-firmware-head &
+    fi
+
+    # Redownload userland from raspberrypi/userland master HEAD to update to latest
+    if [ $i = "update-userland" ]; then
+        rm -rf output/build/rpi-userland-master
+        rm -rf dl/rpi-userland-master.tar.gz
+        echo "rpi-userland Git HEAD @ "`git ls-remote --heads https://github.com/raspberrypi/firmware | sed -n 2p` > rpi-userland-head &
+    fi
+done
 
 # Let buildroot build everything
 make
@@ -28,12 +38,13 @@ cp output/images/rootfs.cpio.lzo ../output/recovery.rfs
 cp output/images/rpi-firmware/start_cd.elf ../output/recovery.elf
 cp output/images/rpi-firmware/bootcode.bin ../output
 
-# Add build-date timestamp to files$
-
-rm ../output/BUILT* || true
-touch ../output/"BUILT-"$(date +"%Y-%m-%d")
+# Create build-date timestamp file containing Git HEAD info for build
+rm -f ../output/BUILT* || true
+echo "NOOBS Git HEAD @ "`git rev-parse --verify HEAD` > "../output/"BUILT-"$(date +"%Y-%m-%d")"
+cat rpi-userland-head >> "../output/"BUILT-"$(date +"%Y-%m-%d")"
+cat rpi-firmware-head >> "../output/"BUILT-"$(date +"%Y-%m-%d")"
 
 cd ..
 
 clear
-echo Build complete. Copy files in \'output\' directory onto a clean FAT formatted SD card to use.
+echo "Build complete. Copy files in 'output' directory onto a clean FAT formatted SD card to use."

README.md

@@ -96,11 +96,11 @@ To add a new translation:
 - Add to recovery/recovery.pro `TRANSLATIONS += translation_<languagecode>.ts`
 - Run `lupdate recovery.pro` which extracts strings from the source code and generates/updates the .ts files.
 - The .ts can then be send to the translator, opened in Qt Linguist and filled in.
-- Turn the .ts XML file into a binary .qm file by running `lrelease translation_code.ts`
-- The .qm file needs to be added to "icons.qrc". This file contains a list with resource files that will be embedded into the
-  application's executable during build.
-
-Can add a flag icon to the "icons" folder and add that flag to "icons.qrc" as well.
+- Add a line for the .ts file in to "icons.qrc", but substitute .ts extension with .qm. This file contains a list
+  of resource files that will be embedded into the application's executable during build.
+- Add a flag icon for your language from http://www.famfamfam.com/lab/icons/flags/ flag icon collection or if it
+  doesn't have the one you need, you may use some other small png icon for it. Copy the icon file to the "icons"
+  folder and add a line for it into "icons.qrc" as well.
 
 
 ### Legal compliance

buildroot/.config

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Buildroot 2013.05-git-gafb231e-dirty Configuration
+# Buildroot 2013.05-git-00063-gbf7d7fb-dirty Configuration
 #
 BR2_HAVE_DOT_CONFIG=y
 BR2_arm=y
@@ -368,7 +368,7 @@ BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
 # BR2_PACKAGE_DIRECTFB is not set
 # BR2_PACKAGE_FBDUMP is not set
 # BR2_PACKAGE_FBGRAB is not set
-# BR2_PACKAGE_FBSET is not set
+BR2_PACKAGE_FBSET=y
 
 #
 # fbterm requires a toolchain with C++, WCHAR and locale support

buildroot/kernelconfig-recovery

@@ -1,5 +1,5 @@
 CONFIG_EXPERIMENTAL=y
-CONFIG_LOCALVERSION="rescue"
+CONFIG_LOCALVERSION="-rescue"
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_SYSVIPC=y
 CONFIG_POSIX_MQUEUE=y
@@ -105,7 +105,9 @@ CONFIG_THERMAL_BCM2835=y
 CONFIG_FB=y
 CONFIG_FB_BCM2708=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_LOGO=y
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+# CONFIG_LOGO is not set
 # CONFIG_LOGO_LINUX_MONO is not set
 # CONFIG_LOGO_LINUX_VGA16 is not set
 CONFIG_HIDRAW=y
@@ -120,6 +122,11 @@ CONFIG_MMC_SDHCI_PLTFM=y
 CONFIG_MMC_SDHCI_BCM2708=y
 CONFIG_MMC_SDHCI_BCM2708_DMA=y
 CONFIG_LEDS_GPIO=y
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
+CONFIG_LEDS_GPIO=y
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
 # CONFIG_IOMMU_SUPPORT is not set
 CONFIG_EXT4_FS=y
 CONFIG_FANOTIFY=y

buildroot/package/arora/arora.mk

@@ -6,6 +6,8 @@
 
 ARORA_SITE=git://github.com/Arora/arora.git
 ARORA_VERSION=master
+ARORA_LICENSE = GPLv2
+ARORA_LICENSE_FILES = LICENSE.GPL2
 ARORA_INSTALL_STAGING=NO
 ARORA_DEPENDENCIES=qt
 

buildroot/package/directfb-examples/directfb-examples.mk

@@ -8,7 +8,7 @@ DIRECTFB_EXAMPLES_VERSION = 1.6.0
 DIRECTFB_EXAMPLES_SITE = http://www.directfb.org/downloads/Extras
 DIRECTFB_EXAMPLES_SOURCE = DirectFB-examples-$(DIRECTFB_EXAMPLES_VERSION).tar.gz
 DIRECTFB_EXAMPLES_LICENSE = MIT
-DIRECTFB_EXAMPLES_LICENSE_FILE = COPYING
+DIRECTFB_EXAMPLES_LICENSE_FILES = COPYING
 DIRECTFB_EXAMPLES_INSTALL_STAGING = YES
 DIRECTFB_EXAMPLES_DEPENDENCIES = directfb
 

buildroot/package/divine/divine.mk

@@ -8,7 +8,7 @@
 DIVINE_VERSION = 83cafc257a42b9465cd9d6185bf66b8c1b7ed704
 DIVINE_SITE = git://git.directfb.org/git/directfb/extras/DiVine.git
 DIVINE_LICENSE = LGPLv2.1+
-DIVINE_LICENSE_FILE = COPYING
+DIVINE_LICENSE_FILES = COPYING
 DIVINE_INSTALL_STAGING = YES
 DIVINE_DEPENDENCIES = directfb
 DIVINE_CONFIG_SCRIPTS = divine-config

buildroot/package/dosfstools/dosfstools.mk

@@ -5,7 +5,7 @@
 #############################################################
 
 DOSFSTOOLS_VERSION = 3.0.16
-DOSFSTOOLS_SITE = http://fossies.org/linux/misc
+DOSFSTOOLS_SITE = http://daniel-baumann.ch/files/software/dosfstools
 DOSFSTOOLS_LICENSE = GPLv3+
 DOSFSTOOLS_LICENSE_FILES = COPYING
 DOSFSTOOLS_LDFLAGS = $(TARGET_LDFLAGS)

buildroot/package/fb-test-app/fb-test-app.mk

@@ -7,7 +7,7 @@
 FB_TEST_APP_VERSION = v1.0.0
 FB_TEST_APP_SITE = http://github.com/prpplague/fb-test-app/tarball/$(FB_TEST_APP_VERSION)
 FB_TEST_APP_LICENSE = GPLv2
-FB_TEST_APP_LICENSE_FILE = COPYING
+FB_TEST_APP_LICENSE_FILES = COPYING
 
 define FB_TEST_APP_BUILD_CMDS
 	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) all