diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2004-02-01 15:11:05 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2004-02-01 15:11:05 +0000 |
| commit | 9a8046ebf9a398d7f43bdf74c69be0a9e07898d4 (patch) | |
| tree | d513a6c6e434cf52d57b41efdcecae2129989d2b | |
| parent | 9fb327795a36f0c1cc1e8f0dc9c9cf18653ee0d0 (diff) | |
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
| -rw-r--r-- | jpeg/jpeg_6b.oe | 2 | ||||
| -rw-r--r-- | linux-uml/linux-uml-2.4.21/fix-includes.patch | 0 | ||||
| -rw-r--r-- | linux-uml/linux-uml_2.4.21.oe | 33 |
3 files changed, 35 insertions, 0 deletions
diff --git a/jpeg/jpeg_6b.oe b/jpeg/jpeg_6b.oe index abc9900624..e92036f699 100644 --- 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 index 0000000000..e69de29bb2 --- /dev/null +++ b/linux-uml/linux-uml-2.4.21/fix-includes.patch diff --git a/linux-uml/linux-uml_2.4.21.oe b/linux-uml/linux-uml_2.4.21.oe index e69de29bb2..84e170c8b7 100644 --- 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} +} |