Hot-fix release 1.2.1 to fix #70

Rob-Bishop · Rob-Bishop · commit 13821d09a000 · 2013-06-26T17:05:49.000+01:00
diff --git a/BUILDME.sh b/BUILDME.sh
@@ -16,14 +16,12 @@ for i in $*; do
     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
 
@@ -44,8 +42,8 @@ BUILD_INFO="../output/BUILD-DATA"
 echo "Build-date: $(date +"%Y-%m-%d")" > "$BUILD_INFO"
 echo "NOOBS Version: "`git describe` >> "$BUILD_INFO"
 echo "NOOBS Git HEAD @ "`git rev-parse --verify HEAD` >> "$BUILD_INFO"
-cat rpi-userland-head >> "$BUILD_INFO"
-cat rpi-firmware-head >> "$BUILD_INFO"
+cat dl/rpi-userland-head.version >> "$BUILD_INFO"
+cat dl/rpi-firmware-head.version >> "$BUILD_INFO"
 
 cd ..
 
diff --git a/buildroot/.config b/buildroot/.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Buildroot 2013.05-git-00063-gbf7d7fb-dirty Configuration
+# Buildroot 2013.05-git-00009-g28d662a-dirty Configuration
 #
 BR2_HAVE_DOT_CONFIG=y
 BR2_arm=y
@@ -247,6 +247,7 @@ BR2_BUSYBOX_VERSION="1.21.0"
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.21.x.config"
 BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
 # BR2_PACKAGE_BUSYBOX_WATCHDOG is not set
+BR2_PACKAGE_MTOOLS=y
 
 #
 # Audio and video applications
@@ -532,7 +533,7 @@ BR2_PACKAGE_QT_SCRIPT=y
 BR2_PACKAGE_DOSFSTOOLS=y
 BR2_PACKAGE_DOSFSTOOLS_MKDOSFS=y
 BR2_PACKAGE_DOSFSTOOLS_DOSFSCK=y
-BR2_PACKAGE_DOSFSTOOLS_DOSFSLABEL=y
+# BR2_PACKAGE_DOSFSTOOLS_DOSFSLABEL is not set
 BR2_PACKAGE_E2FSPROGS=y
 # BR2_PACKAGE_E2FSPROGS_BADBLOCKS is not set
 # BR2_PACKAGE_E2FSPROGS_CHATTR is not set
diff --git a/buildroot/package/Config.in b/buildroot/package/Config.in
@@ -3,7 +3,7 @@ menu "Package Selection for the target"
 source "package/recovery/Config.in"
 source "package/arora/Config.in"
 source "package/busybox/Config.in"
-
+source "package/mtools/Config.in"
 # Audio and video applications
 source "package/multimedia/Config.in"
 
diff --git a/buildroot/package/Config.in.host b/buildroot/package/Config.in.host
@@ -6,7 +6,7 @@ source "package/e2fsprogs/Config.in.host"
 source "package/genimage/Config.in.host"
 source "package/genpart/Config.in.host"
 source "package/lpc3250loader/Config.in.host"
-source "package/mtools/Config.in.host"
+source "package/mtools-host/Config.in.host"
 source "package/omap-u-boot-utils/Config.in.host"
 source "package/openocd/Config.in.host"
 source "package/sam-ba/Config.in.host"
diff --git a/buildroot/package/mtools-host/Config.in.host b/buildroot/package/mtools-host/Config.in.host
diff --git a/buildroot/package/mtools-host/mtools.mk b/buildroot/package/mtools-host/mtools.mk
@@ -0,0 +1,17 @@
+#############################################################
+#
+# mtools
+#
+#############################################################
+
+MTOOLS_VERSION       = 4.0.18
+MTOOLS_SOURCE        = mtools-$(MTOOLS_VERSION).tar.bz2
+MTOOLS_SITE          = $(BR2_GNU_MIRROR)/mtools/
+MTOOLS_LICENSE       = GPLv3+
+MTOOLS_LICENSE_FILES = COPYING
+
+MTOOLS_CONF_OPT = --enable-xdf        \
+                  --enable-vold       \
+                  --enable-new-vold
+
+$(eval $(host-autotools-package))
diff --git a/buildroot/package/mtools/.mtoolsrc b/buildroot/package/mtools/.mtoolsrc
@@ -0,0 +1 @@
+mtools_skip_check=1
diff --git a/buildroot/package/mtools/Config.in b/buildroot/package/mtools/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_MTOOLS
+	bool "mtools"
+	help
+	  Mtools is a collection of utilities to access MS-DOS disks from
+	  Unix without mounting them. It supports Win'95 style long file
+	  names, OS/2 Xdf disks and 2m disks (store up to 1992k on a high
+	  density 3 1/2 disk).
+
+	  http://www.tux.org/pub/tux/mtools/
diff --git a/buildroot/package/mtools/mtools.conf b/buildroot/package/mtools/mtools.conf
@@ -0,0 +1 @@
+drive p:file="/dev/mmcblk0p1"
diff --git a/buildroot/package/mtools/mtools.mk b/buildroot/package/mtools/mtools.mk
@@ -9,9 +9,24 @@ MTOOLS_SOURCE        = mtools-$(MTOOLS_VERSION).tar.bz2
 MTOOLS_SITE          = $(BR2_GNU_MIRROR)/mtools/
 MTOOLS_LICENSE       = GPLv3+
 MTOOLS_LICENSE_FILES = COPYING
+MTOOLS_LDFLAGS       = $(TARGET_LDFLAGS)
 
 MTOOLS_CONF_OPT = --enable-xdf        \
-                  --enable-vold       \
-                  --enable-new-vold
+                  --enable-vold
 
-$(eval $(host-autotools-package))
+ifneq ($(BR2_ENABLE_LOCALE),y)
+MTOOLS_DEPENDENCIES += libiconv
+MTOOLS_LDFLAGS += -liconv
+endif
+
+define MTOOLS_BUILD_CMDS
+  $(MAKE) CC="$(TARGET_CC)" LDFLAGS="$(MTOOLS_LDFLAGS)" -C $(@D)
+endef
+
+define MTOOLS_INSTALL_TARGET_CMDS
+  $(INSTALL) -m 0755 $(@D)/mlabel $(TARGET_DIR)/sbin/mlabel
+	$(INSTALL) -m 0755 package/mtools/.mtoolsrc $(TARGET_DIR)/.mtoolsrc
+	$(INSTALL) -m 0755 package/mtools/mtools.conf $(TARGET_DIR)/etc/mtools.conf
+endef
+
+$(eval $(autotools-package))
diff --git a/buildroot/package/rpi-firmware/rpi-firmware.mk b/buildroot/package/rpi-firmware/rpi-firmware.mk
@@ -9,6 +9,13 @@ RPI_FIRMWARE_SITE = http://github.com/raspberrypi/firmware/tarball/$(RPI_FIRMWAR
 RPI_FIRMWARE_LICENSE = BSD-3c
 RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom
 
+# we're downloading a branchname rather than a commit-id, so this gets the commit-id we just downloaded
+define RPI_FIRMWARE_GET_CURRENT_VERSION
+	echo "rpi-firmware Git HEAD @ "`git ls-remote --heads https://github.com/raspberrypi/firmware | grep refs/heads/$(RPI_FIRMWARE_VERSION)` > $(BR2_DL_DIR)/rpi-firmware-head.version
+endef
+
+RPI_FIRMWARE_POST_DOWNLOAD_HOOKS += RPI_FIRMWARE_GET_CURRENT_VERSION
+
 define RPI_FIRMWARE_INSTALL_TARGET_CMDS
 	$(INSTALL) -D -m 0644 $(@D)/boot/bootcode.bin $(BINARIES_DIR)/rpi-firmware/bootcode.bin
 	$(INSTALL) -D -m 0644 $(@D)/boot/start.elf $(BINARIES_DIR)/rpi-firmware/start.elf
diff --git a/buildroot/package/rpi-userland/rpi-userland.mk b/buildroot/package/rpi-userland/rpi-userland.mk
@@ -11,6 +11,12 @@ RPI_USERLAND_LICENSE_FILES = LICENCE
 RPI_USERLAND_INSTALL_STAGING = YES
 RPI_USERLAND_CONF_OPT = -DVMCS_INSTALL_PREFIX=/usr
 
+# we're downloading a branchname rather than a commit-id, so this gets the commit-id we just downloaded
+define RPI_USERLAND_GET_CURRENT_VERSION
+	echo "rpi-userland Git HEAD @ "`git ls-remote --heads https://github.com/raspberrypi/userland | grep refs/heads/$(RPI_USERLAND_VERSION)` > $(BR2_DL_DIR)/rpi-userland-head.version
+endef
+
+RPI_USERLAND_POST_DOWNLOAD_HOOKS += RPI_USERLAND_GET_CURRENT_VERSION
 
 define RPI_USERLAND_POST_TARGET_CLEANUP
     rm -Rf $(TARGET_DIR)/usr/src
diff --git a/output b/output
@@ -1 +1 @@
-Subproject commit 08e0924c5b06df9a42d811f8dcee0f43bb6d4ebb
+Subproject commit 1976ed03130ef9e99e91598516324c849a85bb4c
diff --git a/recovery/initdrivethread.cpp b/recovery/initdrivethread.cpp
@@ -1,12 +1,12 @@
 /* Prepare SD card for first use thread
  *
  * Initial author: Floris Bos
- *                                                                                                                                                                            
- * Initial author: Floris Bos                                                                                                                                                 
- * Maintained by Raspberry Pi                                                                                                                                                   
- *                                                                                                                                                                            
- * See LICENSE.txt for license details                                                                                                                                        
- *                                                                                                                                                                           
+ *
+ * Initial author: Floris Bos
+ * Maintained by Raspberry Pi
+ *
+ * See LICENSE.txt for license details
+ *
  */
 
 
@@ -183,7 +183,28 @@ bool InitDriveThread::method_resizePartitions()
 
     if (!QFile::exists("/dev/mmcblk0p1"))
     {
-        emit error(tr("SD card does not have a MBR. Cannot resize FAT partition."));
+        // SD card does not have a MBR.
+
+        // TODO: Warn user that their SD card does not have an MBR and ask
+        // if they would like us to create one for them
+
+        // Create MBR containing single FAT partition
+        QProcess proc;
+        proc.setProcessChannelMode(proc.MergedChannels);
+        proc.start("parted /dev/mmcblk0 --script -- mkpartfs primary fat32 8192s -1");
+        proc.waitForFinished(-1);
+        if (proc.exitCode() != 0)
+        {
+            // Warn user if we failed to create an MBR on their card
+            emit error(tr("Error creating MBR")+"\n"+proc.readAll());
+            return false;
+        }
+        qDebug() << "Created missing MBR on SD card. parted output:" << proc.readAll();
+
+        // Advise user that their SD card has now been formatted
+        // suitably for installing NOOBS and that they will have to
+        // re-copy the files before rebooting
+        emit error(tr("SD card has now been formatted ready for NOOBS installation. Please re-copy the NOOBS files onto the card and reboot"));
         return false;
     }
 
@@ -271,7 +292,7 @@ bool InitDriveThread::method_resizePartitions()
         QThread::msleep(1500);
     }
 
-    QProcess::execute("/sbin/dosfslabel /dev/mmcblk0p1 RECOVERY");
+    QProcess::execute("/sbin/mlabel p:RECOVERY");
 
     emit statusUpdate(tr("Mounting FAT partition"));
     if (!mountSystemPartition())
