Merge bk://openembedded@openembedded.bkbits.net/packages

into r2d2.tm.informatik.uni-frankfurt.de:/home/projekte/packages

2004/05/12 23:42:16+02:00 uni-frankfurt.de!mickeyl
Merge bk://openembedded@openembedded.bkbits.net/packages
into gandalf.tm.informatik.uni-frankfurt.de:/usr/local/projects/packages

2004/05/12 23:42:05+02:00 uni-frankfurt.de!mickeyl
upgrade linux-uml to 2.4.24-3

2004/05/12 23:24:20+02:00 uni-frankfurt.de!mickeyl
install the 'packages' script and add more metadata

BKrev: 40a29a97y8pnWxbdk4CwvjKSSEtZtw

diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index d2fd11d..7123e9d 100644 (file)
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -20,6 +20,7 @@ mickey@allanon.vanille.de
 mickey@merlin.vanille.de
 mickey@r2d2.tm.informatik.uni-frankfurt.de
 mickeyl@gandalf.tm.informatik.uni-frankfurt.de
+mickeyl@r2d2.tm.informatik.uni-frankfurt.de
 p.osiczko@tetrapyloctomy.org
 pablo@kosmos.(none)
 pb_@gandalf.tm.informatik.uni-frankfurt.de

diff --git a/initscripts/initscripts_1.0.oe b/initscripts/initscripts_1.0.oe
index 9463be9..bc8c241 100644 (file)
--- a/initscripts/initscripts_1.0.oe
+++ b/initscripts/initscripts_1.0.oe
@@ -1,7 +1,10 @@
 DESCRIPTION = "SysV init scripts"
 MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
+SECTION = "base"
+PRIORITY = "required"
 DEPENDS = "makedevs"
 RDEPENDS = "makedevs"
+
 SRC_URI = "file://${FILESDIR}/halt \
           file://${FILESDIR}/ramdisk \
           file://${FILESDIR}/umountfs \
@@ -24,6 +27,7 @@ SRC_URI = "file://${FILESDIR}/halt \
           file://${FILESDIR}/simpad/banner \
           file://${FILESDIR}/single \
           file://${FILESDIR}/sendsigs \
+          file://${FILESDIR}/packages \
           file://${FILESDIR}/urandom \
           file://${FILESDIR}/rmnologin \
           file://${FILESDIR}/extractfs \
@@ -53,6 +57,7 @@ do_install () {
        install -m 0755    ${FILESDIR}/hostname.sh      ${D}/etc/init.d
        install -m 0755    ${FILESDIR}/mountall.sh      ${D}/etc/init.d
        install -m 0755    ${FILESDIR}/mountnfs.sh      ${D}/etc/init.d
+       install -m 0755    ${FILESDIR}/packages         ${D}/etc/init.d
        install -m 0755    ${FILESDIR}/reboot           ${D}/etc/init.d
        install -m 0755    ${FILESDIR}/rmnologin        ${D}/etc/init.d
        install -m 0755    ${FILESDIR}/sendsigs         ${D}/etc/init.d

diff --git a/linux-uml/linux-uml-2.4.24/aio_abi.h b/linux-uml/linux-uml-2.4.24/aio_abi.h
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/linux-uml/linux-uml_2.4.24.oe b/linux-uml/linux-uml_2.4.24.oe
index aa45ad1..c859115 100644 (file)
--- a/linux-uml/linux-uml_2.4.24.oe
+++ b/linux-uml/linux-uml_2.4.24.oe
@@ -1,11 +1,12 @@
 DESCRIPTION = "User Mode Linux Kernel"
 LICENSE = "GPL"
-PR = "2"
+PR = "3"
 DEPENDS = "virtual/libc"
 
 SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${PV}.tar.bz2 \
            http://mirror.usermodelinux.org/uml/uml-patch-${PV}-${PR}.bz2;patch=1 \
-          file://${FILESDIR}/fix-includes.patch;patch=1"
+          file://${FILESDIR}/fix-includes.patch;patch=1 \
+          file://${FILESDIR}/fix-arg-max.patch;patch=1"
 S = "${WORKDIR}/linux-${PV}"
 
 inherit kernel
@@ -15,9 +16,11 @@ ARCH = "um"
 SUBARCH = "${TARGET_ARCH}"
 KERNEL_IMAGETYPE = "linux"
 
-do_configure_prepend () {
+do_configure() {
        install -m 0644 ${FILESDIR}/defconfig .config
        oe_runmake oldconfig
+       install -d arch/um/include/linux/
+       install -m 0644 ${FILESDIR}/aio_abi.h arch/um/include/linux/
 }
 
 do_compile() {