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

into allanon.vanille.de:/usr/local/projects/uml

2004/02/01 16:10:47+01:00 vanille.de!mickey
BUGFIX: linux-uml builds now and links against the proper libc

BKrev: 401d1709BG2WWEA3emxhOYVgtTAPAw

diff --git a/jpeg/jpeg_6b.oe b/jpeg/jpeg_6b.oe
index abc9900..e92036f 100644 (file)
--- a/jpeg/jpeg_6b.oe
+++ b/jpeg/jpeg_6b.oe
@@ -14,6 +14,8 @@ EXTRA_OECONF="--enable-static --enable-shared"
 
 CFLAGS_append = " -D_REENTRANT"
 
+CC = ${CC}
+
 do_stage() {
        install -m 644 -D jconfig.h ${STAGING_DIR}/target/include/jconfig.h
        install -m 644 -D jpeglib.h ${STAGING_DIR}/target/include/jpeglib.h

diff --git a/linux-uml/linux-uml-2.4.21/fix-includes.patch b/linux-uml/linux-uml-2.4.21/fix-includes.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/linux-uml/linux-uml_2.4.21.oe b/linux-uml/linux-uml_2.4.21.oe
index e69de29..84e170c 100644 (file)
--- a/linux-uml/linux-uml_2.4.21.oe
+++ b/linux-uml/linux-uml_2.4.21.oe
@@ -0,0 +1,33 @@
+DESCRIPTION=User Mode Linux Kernel
+PN=linux-uml
+PV=2.4.21
+LICENSE=GPL
+KV=2.4.21
+
+SRC_URI = ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \
+         http://kernels.usermodelinux.org/patches/uml-patch-${KV}.bz2;patch=1 \
+         file://${FILESDIR}/fix-includes.patch;patch=1
+S=${WORKDIR}/linux-${KV}
+
+inherit kernel
+TARGET_ARCH_i686=i386
+ARCH=um
+SUBARCH=${TARGET_ARCH}
+TARGET_OS_linux=Linux
+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}
+}