NOOBS 1.2.1 release for testing (fixes #70 by adding FAT partition label

with mtools instead of dosfslabel).

Author: Rob-Bishop

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

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"
 

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"

buildroot/package/mtools/Config.in.host renamed to buildroot/package/mtools-host/Config.in.host

@@ -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))

buildroot/package/mtools-host/mtools.mk

@@ -0,0 +1 @@
+mtools_skip_check=1

buildroot/package/mtools/.mtoolsrc

@@ -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/

buildroot/package/mtools/Config.in

@@ -0,0 +1 @@
+drive p:file="/dev/mmcblk0p1"

buildroot/package/mtools/mtools.conf

@@ -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))