Merge bk://oe-devel.bkbits.net/openembedded

into  bkbits.net:/repos/n/nslu2-linux/openembedded

2005/06/01 11:28:50+02:00 uni-frankfurt.de!mickeyl
add /media/ram as ramdisk on Zaurus and SIMpad machines

BKrev: 429d8277JTeUPkNriZjBbf_XbuZFqg

diff --git a/packages/base-files/base-files/akita/fstab b/packages/base-files/base-files/akita/fstab
index e69de29..754f140 100644 (file)
--- a/packages/base-files/base-files/akita/fstab
+++ b/packages/base-files/base-files/akita/fstab
@@ -0,0 +1,16 @@
+/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
+
+tmpfs          /var            tmpfs   defaults        0  0
+tmpfs          /media/ram      tmpfs   defaults        0  0
+
+# SD/MMC in kernel 2.4
+/dev/mmcda1    /media/card     auto    defaults,sync,noauto    0  0
+# SD/MMC in kernel 2.6
+/dev/mmcblk0p1 /media/card     auto    defaults,sync,noauto    0  0
+
+# USB Storage
+/dev/sda1 /media/usbhdd                vfat    noauto,umask=000,noatime,iocharset=utf8,codepage=932    0       0
+

diff --git a/packages/base-files/base-files/c7x0/fstab b/packages/base-files/base-files/c7x0/fstab
index ae068e0..fb37e07 100644 (file)
--- a/packages/base-files/base-files/c7x0/fstab
+++ b/packages/base-files/base-files/c7x0/fstab
@@ -2,7 +2,9 @@
 /dev/mtdblock3 /home   jffs2   defaults,noatime        1  2
 proc           /proc   proc    defaults        0  0
 /dev/hda1      /media/cf       auto    defaults,sync,noauto    0  0
-tmpfs          /var    tmpfs   defaults        0  0
+
+tmpfs          /var            tmpfs   defaults        0  0
+tmpfs          /media/ram      tmpfs   defaults        0  0
 
 # SD/MMC in kernel 2.4
 /dev/mmcda1    /media/card     auto    defaults,sync,noauto    0  0

diff --git a/packages/base-files/base-files/poodle/fstab b/packages/base-files/base-files/poodle/fstab
index b54283a..31e2edb 100644 (file)
--- a/packages/base-files/base-files/poodle/fstab
+++ b/packages/base-files/base-files/poodle/fstab
@@ -3,5 +3,6 @@
 proc           /proc   proc    defaults        0  0
 /dev/hda1      /media/cf       auto    defaults,sync,noauto    0  0
 /dev/mmcda1    /media/card     auto    defaults,sync,noauto    0  0
-tmpfs          /var    tmpfs   defaults        0  0
-# tmpfs                /media/ram      tmpfs   defaults        0  0
+
+tmpfs          /var            tmpfs   defaults        0  0
+tmpfs          /media/ram      tmpfs   defaults        0  0

diff --git a/packages/base-files/base-files/spitz/fstab b/packages/base-files/base-files/spitz/fstab
index 53fdb34..94880f8 100644 (file)
--- a/packages/base-files/base-files/spitz/fstab
+++ b/packages/base-files/base-files/spitz/fstab
@@ -9,6 +9,7 @@ devpts               /dev/pts             devpts     mode=0620,gid=5       0 0
 usbdevfs             /proc/bus/usb        usbdevfs   noauto                0 0
 
 tmpfs          /var            tmpfs   defaults                0 0
+tmpfs          /media/ram      tmpfs   defaults                0 0
 
 # Compact Flash memory cards
 /dev/hdb1       /media/cf       auto    defaults,sync,noauto    0 0

diff --git a/packages/base-files/base-files/tosa/fstab b/packages/base-files/base-files/tosa/fstab
index 14d39a7..886b065 100644 (file)
--- a/packages/base-files/base-files/tosa/fstab
+++ b/packages/base-files/base-files/tosa/fstab
@@ -2,7 +2,9 @@
 /dev/mtdblock3 /home   jffs2   defaults,noatime        1  2
 proc           /proc   proc    defaults        0  0
 /dev/hda1      /media/cf       auto    defaults,sync,noauto    0  0
-tmpfs          /var    tmpfs   defaults        0  0
+
+tmpfs          /var            tmpfs   defaults        0  0
+tmpfs          /media/ram      tmpfs   defaults        0  0
 
 # SD/MMC in kernel 2.4
 /dev/mmcda1    /media/card     auto    defaults,sync,noauto    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 f6b3b83..62d8967 100644 (file)
--- 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 = "r32"
+PR = "r33"
 LICENSE = "GPL"
 
 SRC_URI = " \