From 9e72b44ccb9708648eefc6d250c84067525b776a Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sat, 25 Sep 2004 13:36:43 +0000 Subject: [PATCH] Merge bk://openembedded@openembedded.bkbits.net/packages into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2004/09/25 09:59:00+02:00 uni-frankfurt.de!mickeyl Merge bk://openembedded@openembedded.bkbits.net/packages into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2004/09/24 20:48:55+02:00 uni-frankfurt.de!mickeyl Merge bk://openembedded@openembedded.bkbits.net/packages into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2004/09/24 16:11:47+02:00 uni-frankfurt.de!mickeyl Merge bk://openembedded@openembedded.bkbits.net/packages into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2004/09/24 11:20:30+02:00 uni-frankfurt.de!mickeyl Merge bk://openembedded@openembedded.bkbits.net/packages into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2004/09/23 21:41:31+02:00 uni-frankfurt.de!mickeyl Merge bk://openembedded@openembedded.bkbits.net/packages into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2004/09/23 17:13:37+02:00 uni-frankfurt.de!mickeyl specify FSTAPE in ramdisk script 2004/09/23 16:26:22+02:00 uni-frankfurt.de!mickeyl Merge bk://openembedded@openembedded.bkbits.net/packages into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2004/09/23 08:21:29+02:00 uni-frankfurt.de!mickeyl remove python-numarray from task-python-everything since this doesn't want to build with soft-float :/ 2004/09/23 08:20:49+02:00 uni-frankfurt.de!mickeyl bump oz version in issue[.net] BKrev: 4155746b2RbCeWQvN_Ec7r-X5yjy-g --- base-files/base-files/openzaurus/issue | 2 ++ base-files/base-files/openzaurus/issue.net | 2 ++ initscripts/initscripts-1.0/ramdisk | 6 ++++-- initscripts/initscripts_1.0.oe | 2 +- meta/task-python-everything_0.9.0.oe | 2 +- 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/base-files/base-files/openzaurus/issue b/base-files/base-files/openzaurus/issue index e69de29bb2..4d39af87e2 100644 --- a/base-files/base-files/openzaurus/issue +++ b/base-files/base-files/openzaurus/issue @@ -0,0 +1,2 @@ +OpenZaurus 3.5.2-pre1 \n \l + diff --git a/base-files/base-files/openzaurus/issue.net b/base-files/base-files/openzaurus/issue.net index e69de29bb2..e4f10405a8 100644 --- a/base-files/base-files/openzaurus/issue.net +++ b/base-files/base-files/openzaurus/issue.net @@ -0,0 +1,2 @@ +OpenZaurus 3.5.2-pre1 %h + diff --git a/initscripts/initscripts-1.0/ramdisk b/initscripts/initscripts-1.0/ramdisk index b1bc8d6992..fc04e33852 100644 --- a/initscripts/initscripts-1.0/ramdisk +++ b/initscripts/initscripts-1.0/ramdisk @@ -2,6 +2,8 @@ . /etc/default/rcS +FSTYPE=ext2 + if test ! -e /proc/mtd then test "$VERBOSE" != "no" && echo >&2 "/proc not mounted, or mtd support not enabled in kernel." @@ -33,12 +35,12 @@ if (test ! -e /etc/.configured) || test "$OLD_MTD_SIZE" != "$RAM_MTD_SIZE"; then dd if=/dev/zero bs=1024 count=$RAM_MTD_SIZE of=$RAM_MTD 2>/dev/null >&2 || exit 1 test "$VERBOSE" != "no" && echo "$RAM_MTD"; test "$VERBOSE" != "no" && echo -n "Creating filesystem on ramdisk: " - mkfs.ext2 $RAM_MTDBLK 2>/dev/null >&2 || exit 1 + mkfs -t $FSTYPE $RAM_MTDBLK 2>/dev/null >&2 || exit 1 test "$VERBOSE" != "no" && echo "$RAM_MTDBLK"; fi test "$VERBOSE" != "no" && echo -n "Mounting ramdisk: " -mount $RAM_MTDBLK $RAM_MNTPT 2>/dev/null >&2 || exit 1 +mount -t $FSTYPE $RAM_MTDBLK $RAM_MNTPT 2>/dev/null >&2 || exit 1 test "$VERBOSE" != "no" && echo "$RAM_MTDBLK"; exit 0 diff --git a/initscripts/initscripts_1.0.oe b/initscripts/initscripts_1.0.oe index 7e4814e909..91934666a6 100644 --- a/initscripts/initscripts_1.0.oe +++ b/initscripts/initscripts_1.0.oe @@ -4,7 +4,7 @@ SECTION = "base" PRIORITY = "required" DEPENDS = "makedevs" RDEPENDS = "makedevs" -PR = "r9" +PR = "r10" SRC_URI = "file://halt \ file://ramdisk \ diff --git a/meta/task-python-everything_0.9.0.oe b/meta/task-python-everything_0.9.0.oe index 82263fddb0..babfe07233 100644 --- a/meta/task-python-everything_0.9.0.oe +++ b/meta/task-python-everything_0.9.0.oe @@ -15,7 +15,6 @@ DEPENDS = " python-ao \ python-mad \ python-native \ python-numeric \ - python-numarray \ python-ogg \ python-pexpect \ python-pychecker \ @@ -46,3 +45,4 @@ RDEPENDS=${DEPENDS} #fixme add python-pycap once libdnet is in again #fixme add python-pyx once kpathwhich-native is there #fixme add packages dynamically +#fixme python-numarray doesn't work with soft-float -- 2.39.5