diff options
author | Tim Yamin <plasmaroo@gentoo.org> | 2004-09-11 09:38:40 +0000 |
---|---|---|
committer | Tim Yamin <plasmaroo@gentoo.org> | 2004-09-11 09:38:40 +0000 |
commit | 02db40ad46d6500c68dd6575b6597e99b0ceb5a7 (patch) | |
tree | 537ce226f55a4df12f202e81be12b090fecf55e4 /sys-kernel | |
parent | revision bumped due to installation layout change that occured a while ago. K... (diff) | |
download | gentoo-2-02db40ad46d6500c68dd6575b6597e99b0ceb5a7.tar.gz gentoo-2-02db40ad46d6500c68dd6575b6597e99b0ceb5a7.tar.bz2 gentoo-2-02db40ad46d6500c68dd6575b6597e99b0ceb5a7.zip |
Removing redundant revisions.
Diffstat (limited to 'sys-kernel')
5 files changed, 5 insertions, 266 deletions
diff --git a/sys-kernel/linux26-headers/ChangeLog b/sys-kernel/linux26-headers/ChangeLog index d31707dfac7e..cf6e4499463d 100644 --- a/sys-kernel/linux26-headers/ChangeLog +++ b/sys-kernel/linux26-headers/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-kernel/linux26-headers # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux26-headers/ChangeLog,v 1.25 2004/09/03 18:54:23 pvdabeel Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux26-headers/ChangeLog,v 1.26 2004/09/11 09:38:40 plasmaroo Exp $ + + 11 Sep 2004; <plasmaroo@gentoo.org> -linux26-headers-2.6.6.ebuild, + -linux26-headers-2.6.7-r3.ebuild: + Removing redundant revisions. 03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> linux26-headers-2.6.6-r1.ebuild, linux26-headers-2.6.6.ebuild, diff --git a/sys-kernel/linux26-headers/files/digest-linux26-headers-2.6.6 b/sys-kernel/linux26-headers/files/digest-linux26-headers-2.6.6 deleted file mode 100644 index fe3698be5a62..000000000000 --- a/sys-kernel/linux26-headers/files/digest-linux26-headers-2.6.6 +++ /dev/null @@ -1 +0,0 @@ -MD5 5218790bc3db41e77a7422969639a9ad linux-2.6.6.tar.bz2 34896138 diff --git a/sys-kernel/linux26-headers/files/digest-linux26-headers-2.6.7-r3 b/sys-kernel/linux26-headers/files/digest-linux26-headers-2.6.7-r3 deleted file mode 100644 index fbf6945c9a39..000000000000 --- a/sys-kernel/linux26-headers/files/digest-linux26-headers-2.6.7-r3 +++ /dev/null @@ -1 +0,0 @@ -MD5 a74671ea68b0e3c609e8785ed8497c14 linux-2.6.7.tar.bz2 35092228 diff --git a/sys-kernel/linux26-headers/linux26-headers-2.6.6.ebuild b/sys-kernel/linux26-headers/linux26-headers-2.6.6.ebuild deleted file mode 100644 index 818517555c22..000000000000 --- a/sys-kernel/linux26-headers/linux26-headers-2.6.6.ebuild +++ /dev/null @@ -1,135 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux26-headers/linux26-headers-2.6.6.ebuild,v 1.5 2004/09/03 18:54:23 pvdabeel Exp $ - -ETYPE="headers" -inherit kernel eutils - -OKV="${PV/_/-}" -KV="${OKV}" -S=${WORKDIR}/linux-${OKV} -EXTRAVERSION="" - -# What's in this kernel? - -# INCLUDED: -# 1) linux sources from kernel.org - -DESCRIPTION="Linux ${OKV} headers from kernel.org" -SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${OKV}.tar.bz2" -HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/" -LICENSE="GPL-2" -SLOT="0" -PROVIDE="virtual/kernel virtual/os-headers" -KEYWORDS="-* arm amd64 ~ppc" -IUSE="" - -DEPEND="!virtual/os-headers" - -pkg_setup() { - # Figure out what architecture we are, and set ARCH appropriately - ARCH="$(uname -m)" - ARCH="$(echo ${ARCH} | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/)" - [ "$ARCH" == "sparc" -a "$PROFILE_ARCH" == "sparc64" ] && ARCH=sparc64 - - # Archs which have their own separate header packages, add a check here - # and redirect the user to them - case "${ARCH}" in - mips|mips64) - eerror "These headers are not appropriate for your architecture." - eerror "Please use sys-kernel/${ARCH/64/}-headers instead." - die - ;; - esac -} - -src_unpack() { - - unpack ${A} - cd ${S} - - # Do Stuff - kernel_universal_unpack - - # User-space patches for various things - epatch ${FILESDIR}/${PN}-2.6.6-appCompat.patch - epatch ${FILESDIR}/${PN}-2.6.3-strict-ansi-fix.patch - epatch ${FILESDIR}/${PN}-2.6.0-sysctl_h-compat.patch - epatch ${FILESDIR}/${PN}-2.6.0-fb.patch - - # Needed to compile NPTL on amd64 - if use amd64; then - cd ${S}/include/asm-x86_64/ - epatch ${FILESDIR}/${PN}-2.6.4-unistd-nptl-fix.patch - fi -} - -src_compile() { - # autoconf.h isnt generated unless it already exists. plus, we have - # no gurentee that any headers are installed on the system... - [ -f ${ROOT}/usr/include/linux/autoconf.h ] || \ - touch ${S}/include/linux/autoconf.h - # if there arent any installed headers, then there also isnt an asm - # symlink in /usr/include/, and make defconfig will fail. - ln -sf ${S}/include/asm-${ARCH} ${S}/include/asm - make defconfig HOSTCFLAGS="-Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -I${S}/include/" -} - -src_install() { - # Do normal src_install stuff - kernel_src_install - - # If this is sparc, then we need to place asm_offsets.h in the proper location(s) - if [ "${PROFILE_ARCH}" = "sparc64" ]; then - - # We don't need /usr/include/asm, generate-asm-sparc will take care of this - rm -Rf ${D}/usr/include/asm - - # We do need empty directories, though... - dodir /usr/include/asm - dodir /usr/include/asm-sparc - dodir /usr/include/asm-sparc64 - - # Copy asm-sparc and asm-sparc64 - cp -ax ${S}/include/asm-sparc/* ${D}/usr/include/asm-sparc - cp -ax ${S}/include/asm-sparc64/* ${D}/usr/include/asm-sparc64 - - # Check if generate-asm-sparc exists - if [ -a "${FILESDIR}/generate-asm-sparc" ]; then - - # Copy generate-asm-sparc into the sandox - cp ${FILESDIR}/generate-asm-sparc ${WORKDIR}/generate-asm-sparc - - # Just in case generate-asm-sparc isn't executable, make it so - if [ ! -x "${WORKDIR}/generate-asm-sparc" ]; then - chmod +x ${WORKDIR}/generate-asm-sparc - fi - - # Generate /usr/include/asm for sparc systems - ${WORKDIR}/generate-asm-sparc ${D}/usr/include - else - eerror "${FILESDIR}/generate-asm-sparc doesn't exist!" - die - fi - fi - - # If this is 2.5 or 2.6 headers, then we need asm-generic too - if [ "`KV_to_int ${OKV}`" -ge "`KV_to_int 2.6.0`" ]; then - dodir /usr/include/asm-generic - cp -ax ${S}/include/asm-generic/* ${D}/usr/include/asm-generic - fi -} - -pkg_preinst() { - kernel_pkg_preinst -} - -pkg_postinst() { - kernel_pkg_postinst - - einfo "Kernel headers are usually only used when recompiling glibc, as such, following the installation" - einfo "of newer headers, it is advised that you re-merge glibc as follows:" - einfo "emerge glibc" - einfo "Failure to do so will cause glibc to not make use of newer features present in the updated kernel" - einfo "headers." -} diff --git a/sys-kernel/linux26-headers/linux26-headers-2.6.7-r3.ebuild b/sys-kernel/linux26-headers/linux26-headers-2.6.7-r3.ebuild deleted file mode 100644 index 045ddc573cd5..000000000000 --- a/sys-kernel/linux26-headers/linux26-headers-2.6.7-r3.ebuild +++ /dev/null @@ -1,128 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux26-headers/linux26-headers-2.6.7-r3.ebuild,v 1.6 2004/07/23 09:26:28 lv Exp $ - -ETYPE="headers" -inherit kernel eutils - -OKV="${PV/_/-}" -KV="${OKV}" -S=${WORKDIR}/linux-${OKV} -EXTRAVERSION="" - -# What's in this kernel? - -# INCLUDED: -# 1) linux sources from kernel.org - -DESCRIPTION="Linux ${OKV} headers from kernel.org" -SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${OKV}.tar.bz2" -HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/" -LICENSE="GPL-2" -SLOT="0" -PROVIDE="virtual/kernel virtual/os-headers" -KEYWORDS="-* ~x86 ~ppc ~arm ~hppa ~amd64" -IUSE="" - -DEPEND="!virtual/os-headers" - -pkg_setup() { - # Archs which have their own separate header packages, add a check here - # and redirect the user to them - case "${ARCH}" in - mips) - eerror "These headers are not appropriate for your architecture." - eerror "Please use sys-kernel/mips-headers instead." - die - ;; - esac -} - -src_unpack() { - - unpack ${A} - cd ${S} - - # Do Stuff - kernel_universal_unpack - - # User-space patches for various things - epatch ${FILESDIR}/${PN}-2.6.3-strict-ansi-fix.patch - epatch ${FILESDIR}/${PN}-2.6.0-sysctl_h-compat.patch - epatch ${FILESDIR}/${PN}-2.6.0-fb.patch - epatch ${FILESDIR}/${PN}-2.6.7-generic-arm-prepare.patch - epatch ${FILESDIR}/${PN}-2.6.7-appCompat.patch -} - -src_compile() { - # autoconf.h isnt generated unless it already exists. plus, we have - # no gurentee that any headers are installed on the system... - [ -f ${ROOT}/usr/include/linux/autoconf.h ] || \ - touch ${S}/include/linux/autoconf.h - # if there arent any installed headers, then there also isnt an asm - # symlink in /usr/include/, and make defconfig will fail. - set_arch_to_kernel - ln -sf ${S}/include/asm-${ARCH} ${S}/include/asm - make defconfig HOSTCFLAGS="-Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -I${S}/include/" || die "defconfig failed" - make prepare HOSTCFLAGS="-Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -I${S}/include/" || die "prepare failed" - set_arch_to_portage -} - -src_install() { - # Do normal src_install stuff - kernel_src_install - - # If this is sparc, then we need to place asm_offsets.h in the proper location(s) - if [ "${PROFILE_ARCH}" = "sparc64" ]; then - - # We don't need /usr/include/asm, generate-asm-sparc will take care of this - rm -Rf ${D}/usr/include/asm - - # We do need empty directories, though... - dodir /usr/include/asm - dodir /usr/include/asm-sparc - dodir /usr/include/asm-sparc64 - - # Copy asm-sparc and asm-sparc64 - cp -ax ${S}/include/asm-sparc/* ${D}/usr/include/asm-sparc - cp -ax ${S}/include/asm-sparc64/* ${D}/usr/include/asm-sparc64 - - # Check if generate-asm-sparc exists - if [ -a "${FILESDIR}/generate-asm-sparc" ]; then - - # Copy generate-asm-sparc into the sandox - cp ${FILESDIR}/generate-asm-sparc ${WORKDIR}/generate-asm-sparc - - # Just in case generate-asm-sparc isn't executable, make it so - if [ ! -x "${WORKDIR}/generate-asm-sparc" ]; then - chmod +x ${WORKDIR}/generate-asm-sparc - fi - - # Generate /usr/include/asm for sparc systems - ${WORKDIR}/generate-asm-sparc ${D}/usr/include - else - eerror "${FILESDIR}/generate-asm-sparc doesn't exist!" - die - fi - fi - - # If this is 2.5 or 2.6 headers, then we need asm-generic too - if [ "`KV_to_int ${OKV}`" -ge "`KV_to_int 2.6.0`" ]; then - dodir /usr/include/asm-generic - cp -ax ${S}/include/asm-generic/* ${D}/usr/include/asm-generic - fi -} - -pkg_preinst() { - kernel_pkg_preinst -} - -pkg_postinst() { - kernel_pkg_postinst - - einfo "Kernel headers are usually only used when recompiling glibc, as such, following the installation" - einfo "of newer headers, it is advised that you re-merge glibc as follows:" - einfo "emerge glibc" - einfo "Failure to do so will cause glibc to not make use of newer features present in the updated kernel" - einfo "headers." -} |