From a41ac33144876e486202e3433a28a80922bf043c Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Thu, 11 Sep 2003 22:52:39 +0000 Subject: Move kernel header pull into glibc. BKrev: 3f60fcb7KdjeIGOwAGGh4DY1oiWf6Q --- content/glibc-2.3.1.oe | 28 ---------------------------- content/glibc-2.3.2-r0/autoconf.h | 0 content/glibc-2.3.2-r0/version.h | 0 content/glibc-2.3.2.oe | 16 +++++++++++++--- content/kernel-headers-2.4.21-r0/autoconf.h | 0 content/kernel-headers-2.4.21-r0/version.h | 0 content/kernel-headers-2.4.21.oe | 18 ------------------ 7 files changed, 13 insertions(+), 49 deletions(-) delete mode 100644 content/glibc-2.3.1.oe create mode 100644 content/glibc-2.3.2-r0/autoconf.h create mode 100644 content/glibc-2.3.2-r0/version.h delete mode 100644 content/kernel-headers-2.4.21-r0/autoconf.h delete mode 100644 content/kernel-headers-2.4.21-r0/version.h delete mode 100644 content/kernel-headers-2.4.21.oe diff --git a/content/glibc-2.3.1.oe b/content/glibc-2.3.1.oe deleted file mode 100644 index ac9e158879..0000000000 --- a/content/glibc-2.3.1.oe +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION="GNU C Library" -LICENSE="LGPL" -SECTION="libs" -DEPENDS="virtual/kernel-header" -RDEPENDS="" -PRIORITY=required -MAINTAINER="Chris Larson " - -SRC_URI="ftp://ftp.gnu.org/gnu/glibc/${P}.tar.gz ftp://ftp.gnu.org/pub/gnu/glibc/glibc-linuxthreads-${PV}.tar.gz ${DEBIAN_MIRROR}/main/g/glibc/glibc_2.3.1-16.diff.gz;patch=1" -PROVIDES=virtual/libc - -S="${WORKDIR}/${P}" -EXTRA_OECONF="--with-elf --disable-profile --enable-add-ons=linuxthreads --with-elf --enable-shared --with-headers=${STAGING_DIR}/target/include --without-cvs --enable-kernel=2.4.6" -EXTRA_OEMAKE= - -PACKAGES="libc6" - -do_unpack() { - set -e - base_do_unpack $@ - test -d ${S} - mv ${WORKDIR}/linuxthreads{,_db} ${S}/ -} - -do_install() { - set -e - ${MAKE} install_root=${D} install -} diff --git a/content/glibc-2.3.2-r0/autoconf.h b/content/glibc-2.3.2-r0/autoconf.h new file mode 100644 index 0000000000..e69de29bb2 diff --git a/content/glibc-2.3.2-r0/version.h b/content/glibc-2.3.2-r0/version.h new file mode 100644 index 0000000000..e69de29bb2 diff --git a/content/glibc-2.3.2.oe b/content/glibc-2.3.2.oe index c8bee6020e..64f0b88e9a 100644 --- a/content/glibc-2.3.2.oe +++ b/content/glibc-2.3.2.oe @@ -1,12 +1,14 @@ DESCRIPTION="GNU C Library" LICENSE="LGPL" SECTION="libs" -DEPENDS="virtual/kernel-header" +DEPENDS="" RDEPENDS="" PRIORITY=required MAINTAINER="Chris Larson " -SRC_URI="ftp://ftp.gnu.org/gnu/glibc/glibc-2.3.2.tar.gz ftp://ftp.gnu.org/pub/gnu/glibc/glibc-linuxthreads-2.3.2.tar.gz" +SRC_URI="ftp://ftp.gnu.org/gnu/glibc/glibc-2.3.2.tar.gz \ + ftp://ftp.gnu.org/pub/gnu/glibc/glibc-linuxthreads-2.3.2.tar.gz \ + http://www.uclibc.org/downloads/toolchain/kernel-headers-2.4.21.tar.bz2" SRC_URI_append=' file://${FILESDIR}/noinfo.patch;patch=1' SRC_URI_append=' file://${FILESDIR}/10_cvs.patch;patch=1' SRC_URI_append=' file://${FILESDIR}/30_glibc232-base.patch;patch=1;pnum=0' @@ -65,7 +67,7 @@ PROVIDES=virtual/libc S="${WORKDIR}/${P}" builddir="${WORKDIR}/build-${SYS}" -EXTRA_OECONF="--with-elf --disable-profile --enable-add-ons=linuxthreads --with-elf --enable-shared --with-headers=${STAGING_DIR}/target/include --without-cvs --enable-kernel=2.4.6" +EXTRA_OECONF="--with-elf --disable-profile --enable-add-ons=linuxthreads --with-elf --enable-shared --with-headers=${WORKDIR}/linux/include --without-cvs --enable-kernel=2.4.6" EXTRA_OEMAKE= PACKAGES="libc6" @@ -77,6 +79,9 @@ do_unpack() { base_do_unpack $@ test -d ${S} mv ${WORKDIR}/linuxthreads{,_db} ${S}/ +# kernel headers + cp -a ${FILESDIR}/{version,autoconf}.h ${WORKDIR}/linux/include/linux/ + ln -sf asm-${ARCH} ${WORKDIR}/linux/include/asm } do_compile() { @@ -97,9 +102,14 @@ do_stage() { ${STAGING_LIBDIR}/libc.so mv ${STAGING_LIBDIR}/libpthread.so ${STAGING_LIBDIR}/libpthread-old.so cat ${STAGING_LIBDIR}/libpthread-old.so | sed -e's,/lib/,,g' > ${STAGING_LIBDIR}/libpthread.so + cp -a ${WORKDIR}/linux/include/linux ${STAGING_DIR}/target/include/ + cp -a ${WORKDIR}/linux/include/asm-${ARCH} ${STAGING_DIR}/target/include/ + ln -sf asm-${ARCH} ${STAGING_DIR}/target/include/asm } do_install() { set -e oe_runmake -C ${builddir} install_root=${D} install + cp -a ${WORKDIR}/linux/include/linux ${D}/${includedir}/ + cp -a ${WORKDIR}/linux/include/asm-${ARCH} ${D}/${includedir}/asm } diff --git a/content/kernel-headers-2.4.21-r0/autoconf.h b/content/kernel-headers-2.4.21-r0/autoconf.h deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/content/kernel-headers-2.4.21-r0/version.h b/content/kernel-headers-2.4.21-r0/version.h deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/content/kernel-headers-2.4.21.oe b/content/kernel-headers-2.4.21.oe deleted file mode 100644 index 51a48cef6d..0000000000 --- a/content/kernel-headers-2.4.21.oe +++ /dev/null @@ -1,18 +0,0 @@ -DESCRIPTION="Kernel headers need to compile the C-Library" -DEPENDS="" -SECTION="base" -PRIORITY="optional" -MAINTAINER="Chris Larson " -LICENSE="GPL" -SRC_URI="http://www.uclibc.org/downloads/toolchain/${P}.tar.bz2" -PROVIDES=virtual/kernel-header -S="${WORKDIR}/linux" - -do_stage() { - mkdir -p ${STAGING_DIR}/target/include/linux - cp -a include/linux/* ${STAGING_DIR}/target/include/linux/ - cp -a include/asm-${ARCH}/ ${STAGING_DIR}/target/include/ - ln -sf asm-${ARCH} ${STAGING_DIR}/target/include/asm - cp -a ${FILESDIR}/{version,autoconf}.h ${STAGING_DIR}/target/include/linux/ - chmod 644 ${STAGING_DIR}/target/include/linux/{version,autoconf}.h -} -- cgit v1.2.3