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

into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/03/04 13:57:15+01:00 uni-frankfurt.de!mickeyl
c7x0,tosa: add fstab entries for mmc/sd with kernel 2.6

BKrev: 42285b40ORNVui__IioDI2GZnoa9Cw

diff --git a/packages/base-files/base-files/c7x0/fstab b/packages/base-files/base-files/c7x0/fstab
index e69de29..22214a5 100644 (file)
--- a/packages/base-files/base-files/c7x0/fstab
+++ b/packages/base-files/base-files/c7x0/fstab
@@ -0,0 +1,10 @@
+/dev/mtdblock2 /       jffs2   rw,noatime      1  1 
+/dev/mtdblock3 /home   jffs2   defaults,noatime        1  2
+proc           /proc   proc    defaults        0  0
+/dev/hda1      /mnt/cf auto    defaults,sync,noauto    0  0
+tmpfs          /var    tmpfs   defaults        0  0
+
+# SD/MMC in kernel 2.4
+/dev/mmcda1    /mnt/card       auto    defaults,sync,noauto    0  0
+# SD/MMC in kernel 2.6
+/dev/mmcblk0p1 /mnt/card       auto    defaults,sync,auto      0  0

diff --git a/packages/base-files/base-files/tosa/fstab b/packages/base-files/base-files/tosa/fstab
index e69de29..22214a5 100644 (file)
--- a/packages/base-files/base-files/tosa/fstab
+++ b/packages/base-files/base-files/tosa/fstab
@@ -0,0 +1,10 @@
+/dev/mtdblock2 /       jffs2   rw,noatime      1  1 
+/dev/mtdblock3 /home   jffs2   defaults,noatime        1  2
+proc           /proc   proc    defaults        0  0
+/dev/hda1      /mnt/cf auto    defaults,sync,noauto    0  0
+tmpfs          /var    tmpfs   defaults        0  0
+
+# SD/MMC in kernel 2.4
+/dev/mmcda1    /mnt/card       auto    defaults,sync,noauto    0  0
+# SD/MMC in kernel 2.6
+/dev/mmcblk0p1 /mnt/card       auto    defaults,sync,auto      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 b080e4d..f9df951 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 = "r25"
+PR = "r26"
 LICENSE = "GPL"
 
 SRC_URI = " \