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

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

2004/04/29 10:55:45+02:00 uni-frankfurt.de!mickey
Merge r2d2.tm.informatik.uni-frankfurt.de:/home/projekte/packages
into r2d2.tm.informatik.uni-frankfurt.de:/home/projekte/uml

2004/04/29 10:55:43+02:00 uni-frankfurt.de!mickey
fix linux-uml 2.4.24 packaging and erase the older ones

2004/04/29 00:00:31+02:00 uni-frankfurt.de!mickey
uml-rootfs uses task-bootstrap now

2004/04/28 20:17:02+02:00 uni-frankfurt.de!mickey
linux-uml DEPENDS on virtual/libc

BKrev: 4090c32cnNQKDqEttOsB1qfrTudMcQ

8 files changed, 18 insertions, 66 deletions

diff --git a/linux-uml/linux-uml-2.4.21/defconfig b/linux-uml/linux-uml-2.4.21/defconfig
deleted file mode 100644
index e69de29bb2..0000000000
--- a/linux-uml/linux-uml-2.4.21/defconfig
+++ /dev/null
diff --git a/linux-uml/linux-uml-2.4.21/fix-includes.patch b/linux-uml/linux-uml-2.4.21/fix-includes.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/linux-uml/linux-uml-2.4.21/fix-includes.patch
+++ /dev/null
diff --git a/linux-uml/linux-uml-2.4.23/defconfig b/linux-uml/linux-uml-2.4.23/defconfig
deleted file mode 100644
index e69de29bb2..0000000000
--- a/linux-uml/linux-uml-2.4.23/defconfig
+++ /dev/null
diff --git a/linux-uml/linux-uml-2.4.23/fix-includes.patch b/linux-uml/linux-uml-2.4.23/fix-includes.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/linux-uml/linux-uml-2.4.23/fix-includes.patch
+++ /dev/null
diff --git a/linux-uml/linux-uml_2.4.21.oe b/linux-uml/linux-uml_2.4.21.oe
deleted file mode 100644
index 33e1397a46..0000000000
--- a/linux-uml/linux-uml_2.4.21.oe
+++ /dev/null
@@ -1,30 +0,0 @@
-DESCRIPTION = "User Mode Linux Kernel"
-LICENSE = "GPL"
-
-SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${PV}.tar.bz2 \
-	   http://kernels.usermodelinux.org/patches/uml-patch-${PV}.bz2;patch=1 \
-	   file://${FILESDIR}/fix-includes.patch;patch=1"
-S = "${WORKDIR}/linux-${PV}"
-
-inherit kernel
-
-export OS = "Linux"
-ARCH = "um"
-SUBARCH = "${TARGET_ARCH}"
-KERNEL_IMAGETYPE = "linux"
-
-do_configure_prepend () {
-	install -m 0644 ${FILESDIR}/defconfig .config
-	oe_runmake oldconfig
-}
-
-do_compile() {
-	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
-	oe_runmake dep
-	oe_runmake STAGING_LIBDIR=${STAGING_LIBDIR} ${KERNEL_IMAGETYPE}
-	oe_runmake modules
-}
-
-do_install_append () {
-	install -m 0755 linux ${D}/boot/linux-${PV}
-}
diff --git a/linux-uml/linux-uml_2.4.23.oe b/linux-uml/linux-uml_2.4.23.oe
deleted file mode 100644
index 25e37f3b8f..0000000000
--- a/linux-uml/linux-uml_2.4.23.oe
+++ /dev/null
@@ -1,30 +0,0 @@
-DESCRIPTION = "User Mode Linux Kernel"
-LICENSE = "GPL"
-
-SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${PV}.tar.bz2 \
-           http://mirror.usermodelinux.org/uml/uml-patch-${PV}-1.bz2;patch=1 \
-	   file://${FILESDIR}/fix-includes.patch;patch=1"
-S = "${WORKDIR}/linux-${PV}"
-
-inherit kernel
-
-export OS = "Linux"
-ARCH = "um"
-SUBARCH = "${TARGET_ARCH}"
-KERNEL_IMAGETYPE = "linux"
-
-do_configure_prepend () {
-	install -m 0644 ${FILESDIR}/defconfig .config
-	oe_runmake oldconfig
-}
-
-do_compile() {
-	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
-	oe_runmake dep
-	oe_runmake STAGING_LIBDIR=${STAGING_LIBDIR} ${KERNEL_IMAGETYPE}
-	oe_runmake modules
-}
-
-do_install_append () {
-	install -m 0755 linux ${D}/boot/linux-${PV}
-}
diff --git a/linux-uml/linux-uml_2.4.24.oe b/linux-uml/linux-uml_2.4.24.oe
index b2650a02d3..aa45ad121e 100644
--- a/linux-uml/linux-uml_2.4.24.oe
+++ b/linux-uml/linux-uml_2.4.24.oe
@@ -1,6 +1,7 @@
 DESCRIPTION = "User Mode Linux Kernel"
 LICENSE = "GPL"
 PR = "2"
+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 \
@@ -26,6 +27,12 @@ do_compile() {
 	oe_runmake modules
 }
 
-do_install_append () {
-	install -m 0755 linux ${D}/boot/linux-${PV}
+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/uml-rootfs/uml-rootfs_0.0.1.oe b/uml-rootfs/uml-rootfs_0.0.1.oe
index 8a1d41d2f7..989f5b4d8b 100644
--- a/uml-rootfs/uml-rootfs_0.0.1.oe
+++ b/uml-rootfs/uml-rootfs_0.0.1.oe
@@ -1,7 +1,12 @@
 DESCRIPTION = "A rootfs for User-Mode-Linux"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-RDEPENDS = "readline libncurses5 freetype zlib jpeg libpng12 base-files base-passwd busybox sysvinit initscripts tinylogin modutils"
 
-DEPENDS = " readline ncurses freetype zlib jpeg libpng \
-            base-files base-passwd busybox sysvinit initscripts tinylogin modutils \
-            linux-uml-2.4.24"
+export IMAGE_BASENAME = "uml-image"
+
+OPIE_LIBS = "qte-for-opie qpf-bitstream-vera libqpe-opie libopie2"
+OPIE_BASE = "opie-qcop opie-quicklauncher opie-taskbar"
+
+DEPENDS = "task-bootstrap"
+export IPKG_INSTALL = "${DEPENDS}"
+
+inherit image_ipk