aboutsummaryrefslogtreecommitdiffstats
path: root/packages/base-files
diff options
context:
space:
mode:
authornslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-06-10 10:40:10 +0000
committernslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-06-10 10:40:10 +0000
commit3eb5c4cf54427a7ce0448a0ce309bb1be4cc45dd (patch)
treed3b78256a7562425cb0d29f8d0c54024aa81e855 /packages/base-files
parentded20989e4946873ee2419423dfba59364151325 (diff)
downloadopenembedded-3eb5c4cf54427a7ce0448a0ce309bb1be4cc45dd.tar.gz
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/06/10 12:39:17+02:00 utwente.nl!koen base-files_3.0.14.bb: and bump PR 2005/06/10 12:36:25+02:00 utwente.nl!koen Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into bitbake.utwente.nl:/home/koen/OE/openembedded 2005/06/10 12:35:56+02:00 utwente.nl!koen comment mtd2 for h3900 to unbreak h51xx ipaqs 2005/06/10 11:27:41+01:00 reciva.com!pb update binutils csl-arm to new snapshot 2005/06/10 11:24:59+01:00 reciva.com!pb forgotten files from last changeset 2005/06/10 11:16:09+01:00 reciva.com!pb Merge bk://oe-devel@openembedded-devel.bkbits.net/openembedded into mill.internal.reciva.com:/nexus/home/pb/oe/oe 2005/06/10 11:09:14+01:00 reciva.com!pb add binutils-2.16; set DEFAULT_PREFERENCE=-1 to linux-uclibc due to bit-rotten patches 2005/06/10 11:43:41+02:00 utwente.nl!koen Add sapwood, part of the maemo.org suite, courtesy Florian Boor BKrev: 42a96e0a6H0Mfmumh3jmOFKLIpXNPQ
Diffstat (limited to 'packages/base-files')
-rw-r--r--packages/base-files/base-files/h3900/fstab2
-rw-r--r--packages/base-files/base-files_3.0.14.bb2
2 files changed, 3 insertions, 1 deletions
diff --git a/packages/base-files/base-files/h3900/fstab b/packages/base-files/base-files/h3900/fstab
index 32f08a13e5..2a3929fd17 100644
--- a/packages/base-files/base-files/h3900/fstab
+++ b/packages/base-files/base-files/h3900/fstab
@@ -1,4 +1,6 @@
/dev/mtdblock/1 / jffs2 defaults 1 1
+#breaks h51xx
+#/dev/mtdblock/2 /home jffs2 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_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb
index 62d8967efa..57bf381129 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 = "r33"
+PR = "r34"
LICENSE = "GPL"
SRC_URI = " \