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

into allanon.vanille.de:/usr/local/projects/oe-packages

2004/05/18 22:57:22+02:00 vanille.de!mickeyl
upgrade linux-uml to 2.4.26-1 and apply a patch to repair the hopelessly broken hostfs

BKrev: 40aa78bcqTf6wLQxXoNMR9Onhx8wMQ

diff --git a/linux-uml/linux-uml-2.4.25/aio_abi.h b/linux-uml/linux-uml-2.4.26/aio_abi.h
similarity index 100%
rename from linux-uml/linux-uml-2.4.25/aio_abi.h
rename to linux-uml/linux-uml-2.4.26/aio_abi.h

diff --git a/linux-uml/linux-uml-2.4.25/defconfig b/linux-uml/linux-uml-2.4.26/defconfig
similarity index 100%
rename from linux-uml/linux-uml-2.4.25/defconfig
rename to linux-uml/linux-uml-2.4.26/defconfig

diff --git a/linux-uml/linux-uml-2.4.25/fix-arg-max.patch b/linux-uml/linux-uml-2.4.26/fix-arg-max.patch
similarity index 100%
rename from linux-uml/linux-uml-2.4.25/fix-arg-max.patch
rename to linux-uml/linux-uml-2.4.26/fix-arg-max.patch

diff --git a/linux-uml/linux-uml-2.4.25/fix-includes.patch b/linux-uml/linux-uml-2.4.26/fix-includes.patch
similarity index 100%
rename from linux-uml/linux-uml-2.4.25/fix-includes.patch
rename to linux-uml/linux-uml-2.4.26/fix-includes.patch

diff --git a/linux-uml/linux-uml-2.4.26/unbreak-hostfs.patch b/linux-uml/linux-uml-2.4.26/unbreak-hostfs.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/linux-uml/linux-uml_2.4.25.oe b/linux-uml/linux-uml_2.4.25.oe
deleted file mode 100644 (file)
index 2843e23..0000000
--- a/linux-uml/linux-uml_2.4.25.oe
+++ /dev/null
@@ -1,43 +0,0 @@
-DESCRIPTION = "User Mode Linux Kernel"
-LICENSE = "GPL"
-PR = "1"
-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-arg-max.patch;patch=1"
-S = "${WORKDIR}/linux-${PV}"
-
-inherit kernel
-
-COMPATIBLE_HOST = 'i.86.*-linux'
-
-export OS = "Linux"
-ARCH = "um"
-SUBARCH = "${TARGET_ARCH}"
-KERNEL_IMAGETYPE = "linux"
-
-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() {
-       unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
-       oe_runmake dep
-       oe_runmake STAGING_LIBDIR=${STAGING_LIBDIR} ${KERNEL_IMAGETYPE}
-       oe_runmake modules
-}
-
-do_install() {
-        unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
-        oe_runmake DEPMOD=echo INSTALL_MOD_PATH="${D}" modules_install
-        install -d ${D}/boot
-        install -m 0755 linux ${D}/boot/linux-${PV}
-        install -m 0644 System.map ${D}/boot/System.map-${PV}
-        install -m 0644 .config ${D}/boot/config-${PV}
-}
-

diff --git a/linux-uml/linux-uml_2.4.26.oe b/linux-uml/linux-uml_2.4.26.oe
new file mode 100644 (file)
index 0000000..e69de29