merge of '603b2d0c7e4ad80e5779bd3bbdb822331cc0ea2b'

     and '6ab53da82d157971966f5a17d0c29d54df22cac9'

14 files changed, 35 insertions, 14 deletions

diff --git a/packages/base-files/base-files/fic-gta01/fstab b/packages/base-files/base-files/fic-gta01/fstab
index d2976a4205..4a0cc7750d 100644
--- a/packages/base-files/base-files/fic-gta01/fstab
+++ b/packages/base-files/base-files/fic-gta01/fstab
@@ -12,7 +12,7 @@ tmpfs		/dev/shm		tmpfs	mode=0777			0  0
 tmpfs		/media/ram	tmpfs	defaults		0  0
 
 # microSD slot
-/dev/mmcblk0p1	/media/card	auto	defaults,sync,noauto	0  0
+/dev/mmcblk0p1	/media/card	auto	defaults,async,noauto	0  0
 
 # USB Storage
 /dev/sda1 /media/hdd         vfat    noauto,umask=000,noatime,iocharset=utf8,codepage=932    0       0
diff --git a/packages/base-files/base-files/fic-gta02/fstab b/packages/base-files/base-files/fic-gta02/fstab
index d2976a4205..4a0cc7750d 100644
--- a/packages/base-files/base-files/fic-gta02/fstab
+++ b/packages/base-files/base-files/fic-gta02/fstab
@@ -12,7 +12,7 @@ tmpfs		/dev/shm		tmpfs	mode=0777			0  0
 tmpfs		/media/ram	tmpfs	defaults		0  0
 
 # microSD slot
-/dev/mmcblk0p1	/media/card	auto	defaults,sync,noauto	0  0
+/dev/mmcblk0p1	/media/card	auto	defaults,async,noauto	0  0
 
 # USB Storage
 /dev/sda1 /media/hdd         vfat    noauto,umask=000,noatime,iocharset=utf8,codepage=932    0       0
diff --git a/packages/base-files/base-files/gumstix-connex/.mtn2git_empty b/packages/base-files/base-files/gumstix-connex/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/base-files/base-files/gumstix-connex/.mtn2git_empty
diff --git a/packages/base-files/base-files/gumstix-connex/fstab b/packages/base-files/base-files/gumstix-connex/fstab
new file mode 100644
index 0000000000..418f9978d4
--- /dev/null
+++ b/packages/base-files/base-files/gumstix-connex/fstab
@@ -0,0 +1,11 @@
+# fstab for gumstix-connex
+
+rootfs               /                    auto       defaults              1  1
+proc                 /proc                proc       defaults              0  0
+sysfs                /sys                 sysfs      defaults              0  0
+tmpfs                /dev                 tmpfs      defaults              0  0
+devpts               /dev/pts             devpts     gid=5,mode=620        0  0
+tmpfs                /dev/shm             tmpfs      mode=0777             0  0
+tmpfs                /var/volatile        tmpfs      mode=0755             0  0
+tmpfs                /media/ram           tmpfs      defaults              0  0
+
diff --git a/packages/base-files/base-files/gumstix-verdex/.mtn2git_empty b/packages/base-files/base-files/gumstix-verdex/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/base-files/base-files/gumstix-verdex/.mtn2git_empty
diff --git a/packages/base-files/base-files/gumstix-verdex/fstab b/packages/base-files/base-files/gumstix-verdex/fstab
new file mode 100644
index 0000000000..9b5f00c4a7
--- /dev/null
+++ b/packages/base-files/base-files/gumstix-verdex/fstab
@@ -0,0 +1,11 @@
+# fstab for gumstix-verdex
+
+rootfs               /                    auto       defaults              1  1
+proc                 /proc                proc       defaults              0  0
+sysfs                /sys                 sysfs      defaults              0  0
+tmpfs                /dev                 tmpfs      defaults              0  0
+devpts               /dev/pts             devpts     gid=5,mode=620        0  0
+tmpfs                /dev/shm             tmpfs      mode=0777             0  0
+tmpfs                /var/volatile        tmpfs      mode=0755             0  0
+tmpfs                /media/ram           tmpfs      defaults              0  0
+
diff --git a/packages/base-files/base-files/h2200/fstab b/packages/base-files/base-files/h2200/fstab
index 8243195d99..5063f84359 100644
--- a/packages/base-files/base-files/h2200/fstab
+++ b/packages/base-files/base-files/h2200/fstab
@@ -1,4 +1,4 @@
-/dev/mtdblock3	/		jffs2	defaults	1  1		
+rootfs		/		auto	defaults	1  1		
 proc            /proc		proc    defaults        0  0
 sys             /sys		sysfs	defaults        0  0
 tmpfs		/var/volatile	tmpfs	mode=0755	0  0
diff --git a/packages/base-files/base-files/h3600/fstab b/packages/base-files/base-files/h3600/fstab
index 92293a59af..9ec7df1928 100644
--- a/packages/base-files/base-files/h3600/fstab
+++ b/packages/base-files/base-files/h3600/fstab
@@ -1,4 +1,4 @@
-/dev/mtdblock4	/ 	jffs2	defaults	1  1 
+rootfs		/ 		auto	defaults	1  1 
 proc            /proc   proc    defaults        0  0
 /dev/hda1	/media/cf	auto	defaults,noauto,noatime,user,exec,suid	0  0
 /dev/mmc/part1	/media/card	auto	defaults,noauto,noatime,user,exec,suid	0  0
diff --git a/packages/base-files/base-files/h3900/fstab b/packages/base-files/base-files/h3900/fstab
index 2a106ef945..9ec7df1928 100644
--- a/packages/base-files/base-files/h3900/fstab
+++ b/packages/base-files/base-files/h3900/fstab
@@ -1,6 +1,4 @@
-/dev/mtdblock/1	/ 	jffs2	defaults	1  1 
-#breaks h51xx
-#/dev/mtdblock/2 /home   jffs2   defaults        1  1
+rootfs		/ 		auto	defaults	1  1 
 proc            /proc   proc    defaults        0  0
 /dev/hda1	/media/cf	auto	defaults,noauto,noatime,user,exec,suid	0  0
 /dev/mmc/part1	/media/card	auto	defaults,noauto,noatime,user,exec,suid	0  0
diff --git a/packages/base-files/base-files/h5000/fstab b/packages/base-files/base-files/h5000/fstab
index 4d3c38eca8..ad05f3b799 100644
--- a/packages/base-files/base-files/h5000/fstab
+++ b/packages/base-files/base-files/h5000/fstab
@@ -1,4 +1,4 @@
-/dev/mtdblock1	/ 	jffs2	defaults	1  1 
+rootfs		/ 	auto	defaults	1  1 
 #breaks h51xx
 /dev/mtdblock2 /home   jffs2   defaults        1  1
 proc            /proc   proc    defaults        0  0
diff --git a/packages/base-files/base-files/hx4700/fstab b/packages/base-files/base-files/hx4700/fstab
index 04ac4849fd..49b5c96030 100644
--- a/packages/base-files/base-files/hx4700/fstab
+++ b/packages/base-files/base-files/hx4700/fstab
@@ -1,4 +1,4 @@
-/dev/mtdblock2 	/		jffs2	defaults		1  1		
+rootfs	 	/		auto	defaults		1  1		
 /dev/mtdblock3 	/home   jffs2   defaults        1  1
 
 proc            /proc		proc    defaults        0  0
diff --git a/packages/base-files/base-files/jornada56x/fstab b/packages/base-files/base-files/jornada56x/fstab
index d8258a0c05..de6e192fa1 100644
--- a/packages/base-files/base-files/jornada56x/fstab
+++ b/packages/base-files/base-files/jornada56x/fstab
@@ -1,4 +1,4 @@
-/dev/mtdblock1	/ 	jffs2	rw,noatime	1  1 
+rootfs		/	auto	rw,noatime	1  1 
 proc		/proc	proc	defaults	0  0
 /dev/hda1	/mnt/cf	auto	defaults,sync,noauto	0  0
 tmpfs		/var/volatile	tmpfs	mode=0755	0  0
diff --git a/packages/base-files/base-files/omap5912osk/fstab b/packages/base-files/base-files/omap5912osk/fstab
index 687fd00227..5e881f77f9 100644
--- a/packages/base-files/base-files/omap5912osk/fstab
+++ b/packages/base-files/base-files/omap5912osk/fstab
@@ -2,8 +2,9 @@
 
 rootfs               /                    auto       defaults              1  1
 proc                 /proc                proc       defaults              0  0
-sysfs                /sysfs               sysfs      defaults              0  0
+sysfs                /sys                 sysfs      defaults              0  0
 tmpfs                /dev                 tmpfs      defaults              0  0
+devpts               /dev/pts             devpts     gid=5,mode=620        0  0
 tmpfs                /dev/shm             tmpfs      mode=0777             0  0
 tmpfs                /var/volatile        tmpfs      mode=0755             0  0
 tmpfs                /media/ram           tmpfs      defaults              0  0
diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb
index ac12f5e08a..7ccd26b5cf 100644
--- a/packages/base-files/base-files_3.0.14.bb
+++ b/packages/base-files/base-files_3.0.14.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Miscellaneous files for the base system."
 SECTION = "base"
 PRIORITY = "required"
-PR = "r71"
+PR = "r74"
 LICENSE = "GPL"
 
 SRC_URI = " \
@@ -24,8 +24,6 @@ SRC_URI = " \
            file://licenses/Artistic "
 S = "${WORKDIR}"
 
-SRC_URI_OVERRIDES_PACKAGE_ARCH = "1"
-
 docdir_append = "/${P}"
 dirs1777 = "/tmp ${localstatedir}/volatile/lock ${localstatedir}/volatile/tmp"
 dirs2775 = "/home ${prefix}/src ${localstatedir}/local"
@@ -152,6 +150,8 @@ FILES_${PN}-doc = "${docdir} ${datadir}/common-licenses"
 PACKAGE_ARCH_mnci = "mnci"
 PACKAGE_ARCH_rt3000 = "rt3000"
 
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
 # Unslung distribution specific packaging
 
 PACKAGES_unslung = "${PN}-unslung"