Updates against mainline openembedded + removal of some unneeded files

git-svn-id: https://svn.o-hand.com/repos/poky@19 311d38ba-8fff-0310-9ca6-ca027cbcb966

3 files changed, 9 insertions, 2 deletions

diff --git a/openembedded/packages/base-files/base-files/borzoi/fstab b/openembedded/packages/base-files/base-files/borzoi/fstab
index 754f140b34..a44243923a 100644
--- a/openembedded/packages/base-files/base-files/borzoi/fstab
+++ b/openembedded/packages/base-files/base-files/borzoi/fstab
@@ -1,7 +1,8 @@
+# Internal
 /dev/mtdblock2  /       jffs2   rw,noatime      1  1 
 /dev/mtdblock3  /home   jffs2   defaults,noatime        1  2
 proc            /proc   proc    defaults        0  0
-/dev/hda1       /media/cf       auto    defaults,sync,noauto    0  0
+/dev/hda1       /media/hdd1     ext3    defaults,noatime,nodiratime     0  0
 
 tmpfs           /var            tmpfs   defaults        0  0
 tmpfs           /media/ram      tmpfs   defaults        0  0
@@ -14,3 +15,5 @@ tmpfs		/media/ram	tmpfs	defaults	0  0
 # USB Storage
 /dev/sda1 /media/usbhdd         vfat    noauto,umask=000,noatime,iocharset=utf8,codepage=932    0       0
 
+# CF Storage
+/dev/hdb1 /media/cf             ext3    defaults,sync,noauto    0  0
diff --git a/openembedded/packages/base-files/base-files/nokia770/fstab b/openembedded/packages/base-files/base-files/nokia770/fstab
index 3224c61b5e..febe217b34 100644
--- a/openembedded/packages/base-files/base-files/nokia770/fstab
+++ b/openembedded/packages/base-files/base-files/nokia770/fstab
@@ -2,3 +2,7 @@ rootfs  /               rootfs  defaults,errors=remount-ro,noatime      0 0
 /dev/mmcblk0p1  /media/card     auto defaults,noauto,noatime,user,exec,suid  0  0
 tmpfs           /var    tmpfs   defaults             0  0
 tmpfs           /media/ram      tmpfs   defaults        0  0
+rootfs               /                    auto       defaults              1 1
+proc                 /proc                proc       defaults              0 0
+devpts               /dev/pts             devpts     mode=0620,gid=5       0 0
+usbdevfs             /proc/bus/usb        usbdevfs   noauto                0 0
diff --git a/openembedded/packages/base-files/base-files_3.0.14.bb b/openembedded/packages/base-files/base-files_3.0.14.bb
index 144bf2e135..e2c1003c58 100644
--- a/openembedded/packages/base-files/base-files_3.0.14.bb
+++ b/openembedded/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 = "r39"
+PR = "r40"
 LICENSE = "GPL"
 
 SRC_URI = " \