diff options
author | Daniel Robbins <drobbins@gentoo.org> | 2001-12-24 17:45:41 +0000 |
---|---|---|
committer | Daniel Robbins <drobbins@gentoo.org> | 2001-12-24 17:45:41 +0000 |
commit | ac07a688833326869470ee929a32d998b0640b34 (patch) | |
tree | 391933bccd5ba95b5cd0bbee56abed824246d697 /sys-kernel/linux-sources | |
parent | fix for cases where a new kdelibs is installed (diff) | |
download | historical-ac07a688833326869470ee929a32d998b0640b34.tar.gz historical-ac07a688833326869470ee929a32d998b0640b34.tar.bz2 historical-ac07a688833326869470ee929a32d998b0640b34.zip |
A new linux-sources ebuild with a patch to make it work with binutils-2.11.92.0.12.3.
This problem has been fixed in 2.4.17 and above.
Diffstat (limited to 'sys-kernel/linux-sources')
-rw-r--r-- | sys-kernel/linux-sources/files/digest-linux-sources-2.4.16-r2 | 5 | ||||
-rw-r--r-- | sys-kernel/linux-sources/files/linux-2.4.16-binutils.patch | 10 | ||||
-rw-r--r-- | sys-kernel/linux-sources/linux-sources-2.4.13.ebuild | 285 | ||||
-rw-r--r-- | sys-kernel/linux-sources/linux-sources-2.4.16-r2.ebuild (renamed from sys-kernel/linux-sources/linux-sources-2.4.16-r1.ebuild) | 7 |
4 files changed, 20 insertions, 287 deletions
diff --git a/sys-kernel/linux-sources/files/digest-linux-sources-2.4.16-r2 b/sys-kernel/linux-sources/files/digest-linux-sources-2.4.16-r2 new file mode 100644 index 000000000000..f60c2a253510 --- /dev/null +++ b/sys-kernel/linux-sources/files/digest-linux-sources-2.4.16-r2 @@ -0,0 +1,5 @@ +MD5 ab42d7130b7f25b61368dd908eb43ae2 2.4.16-low-latency.patch.gz 16384 +MD5 1b787f980061af46db1ccf3d7a616e28 XFS-20011214.patch.bz2 864256 +MD5 d22bb71a161e8e0a6813beb8c92f1b57 acpi-20011120.diff.gz 139264 +MD5 d3a363dc4f0731b57d1ed90a3eadf150 linux-2.4.16.tar.bz2 23748608 +MD5 3f06fa56bb56029823198eeb566c25db preempt-kernel-rml-2.4.16-1.patch 49152 diff --git a/sys-kernel/linux-sources/files/linux-2.4.16-binutils.patch b/sys-kernel/linux-sources/files/linux-2.4.16-binutils.patch new file mode 100644 index 000000000000..6df732bc04d1 --- /dev/null +++ b/sys-kernel/linux-sources/files/linux-2.4.16-binutils.patch @@ -0,0 +1,10 @@ +--- linux/arch/i386/vmlinux.lds Mon Dec 24 10:38:51 2001 ++++ linux-fixed/arch/i386/vmlinux.lds Mon Dec 24 10:39:02 2001 +@@ -71,7 +71,6 @@ + + /* Sections to be discarded */ + /DISCARD/ : { +- *(.text.exit) + *(.data.exit) + *(.exitcall.exit) + } diff --git a/sys-kernel/linux-sources/linux-sources-2.4.13.ebuild b/sys-kernel/linux-sources/linux-sources-2.4.13.ebuild deleted file mode 100644 index 7ecf99a704a8..000000000000 --- a/sys-kernel/linux-sources/linux-sources-2.4.13.ebuild +++ /dev/null @@ -1,285 +0,0 @@ -# Copyright 1999-2001 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Maintainer: System Team <system@gentoo.org> -# Author: Daniel Robbins <drobbins@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-sources/linux-sources-2.4.13.ebuild,v 1.4 2001/11/25 18:36:25 drobbins Exp $ - -#OKV=original kernel version, KV=patched kernel version. They can be the same. - -#we use this next variable to avoid duplicating stuff on cvs -GFILESDIR=${PORTDIR}/sys-kernel/linux-sources/files -OKV=${PV} -KV=${OKV} -S=${WORKDIR}/linux-${KV} -S2=${WORKDIR}/linux-${KV}-extras -if [ $PN = "linux-extras" ] -then - KS=${ROOT}usr/src/linux-${KV} - KS2=${ROOT}usr/src/linux-${KV}-extras -else - KS=${S} - KS2=${S2} -fi - -# Kernel Features Enabled USE Variable Status -# -# Reiserfs Y - Production-ready -# JFS N jfs Testing-only (commented out for now) -# LVM Y lvm Production-ready -# ext3 Y ext3 Production-ready -# MOSIX N mosix Testing only, probably quite stable -# XFS N xfs will probably need to be placed in a separate kernel -# PCMCIA-CS N pcmcia Need to move this to its own ebuild -# lm-sensors N lm_sensors Need to move this to its own ebuild - -# Patch Versions -ACPIV=20011109 -LVMV=1.0.1-rc4 -EXT3V=0.9.15 -LOWLV=2.4.15-pre5 -PREEV="${KV}-1" -MOSV=1.5.2 -EXT3P="ext3-2.4-${EXT3V}-`echo ${KV} |sed -e 's:\.::g' -e 's:-::'`" - -[ "${PN}" = "linux" ] && DESCRIPTION="Linux kernel version ${KV}, including modules, binary tools, libraries and includes" -[ "${PN}" = "linux-sources" ] && DESCRIPTION="Linux kernel version ${KV} - full sources" -[ "${PN}" = "linux-extras" ] && DESCRIPTION="Linux kernel support tools and libraries" - -# We use build in /usr/src/linux in case of linux-extras -# so we need no sources -[ ! "${PN}" = "linux-extras" ] && SRC_URI="http://www.de.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2 -ftp://ftp.sistina.com/pub/LVM/1.0/lvm_${LVMV}.tar.gz -http://www.mosix.cs.huji.ac.il/ftps/MOSIX-${MOSV}.tar.gz" - -#http://developer.intel.com/technology/iapc/acpi/downloads/acpi-${ACPIV}.diff.gz" -#http://www.kernel.org/pub/linux/kernel/people/rml/preempt-kernel/2.4/preempt-kernel-rml-2.4.15-pre4-1.patch -#http://www.zip.com.au/~akpm/linux/${LOWLV}-low-latency.patch.gz - -[ "$PN" != "linux-extras" ] && PROVIDE="virtual/kernel" - -HOMEPAGE="http://www.kernel.org/ - http://www.namesys.com - http://www.sistina.com/lvm/ - http://developer.intel.com/technology/iapc/acpi/" - -DEPEND=">=sys-apps/modutils-2.4.2 sys-devel/perl" -#these deps are messed up; fix 'em and add ncurses (required my mosix compile, menuconfig) -if [ $PN = "linux" ] -then -# RDEPEND="mosix? ( ~sys-apps/mosix-user-${MOSV} ) >=sys-apps/e2fsprogs-1.22 >=sys-apps/util-linux-2.11f >=sys-apps/reiserfs-utils-3.6.25-r1" - RDEPEND=">=sys-apps/e2fsprogs-1.22 >=sys-apps/util-linux-2.11f >=sys-apps/reiserfs-utils-3.6.25-r1" -elif [ $PN = "linux-sources" ] -then - if [ "`use build`" ] - then - DEPEND="" - RDEPEND="" - else - #ncurses is required for "make menuconfig" - RDEPEND=">=sys-libs/ncurses-5.2" - fi -elif [ $PN = "linux-extras" ] -then - #linux-extras/headers requires a rev of the current kernel sources to be installed - RDEPEND="~sys-kernel/linux-sources-${PV}" -elif [ $PN = "linux-headers" ] -then - DEPEND="" - RDEPEND="" -fi - -[ -z "$LINUX_HOSTCFLAGS" ] && LINUX_HOSTCFLAGS="-Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -I${KS}/include" - -patchorama() { - local x - for x in ${*} - do - [ -d "$x" ] && continue - echo ">>> Applying ${x}..." - if [ "${x##*.}" = "bz2" ] - then - cat $x | bzip2 -d | patch -p1 -l - elif [ "${x##*.}" = "gz" ] - then - cat $x | gzip -d | patch -p1 -l - else - patch -p1 -l < $x - fi - done -} - - -src_unpack() { - - [ "$PN" = "linux-extras" ] && return - mkdir ${S2} - - cd ${WORKDIR} - unpack linux-${OKV}.tar.bz2 - mv linux linux-${KV} || die - dodir /usr/src/linux-${KV}-extras - cd ${KS2} - tar -xz --no-same-owner -f ${DISTDIR}/MOSIX-${MOSV}.tar.gz MOSIX-${MOSV}/patches.${OKV} - cd ${S} - patchorama ${KS2}/MOSIX-${MOSV}/patches.${OKV} - echo "Preparing for compilation..." - - #sometimes we have icky kernel symbols; this seems to get rid of them - make mrproper || die - - #linux-sources needs to be fully configured, too. Not just linux - #this is the configuration for the default kernel - cp ${S}/arch/i386/defconfig .config || die - yes "" | make oldconfig - echo "Ignore any errors from the yes command above." - - #fix silly permissions in tarball - cd ${WORKDIR} - chown -R 0.0 * - chmod -R a+r-w+X,u+w * - - # Gentoo Linux uses /boot, so fix 'make install' to work properly - #seems they cant make up their mind if it should be a space or tab - cd ${S} - mv Makefile Makefile.orig - sed -e 's/#export\tINSTALL_PATH/export\tINSTALL_PATH/' \ - Makefile.orig >Makefile || die # test, remove me if Makefile ok - rm Makefile.orig -} - -src_compile() { - - if [ "${PN}" = "linux-headers" ] - then - cd ${KS} - make include/linux/autoconf.h include/linux/version.h || die - elif [ "${PN}" = "linux-sources" ] - then - echo - else - if [ $PN = "linux" ] - then - cd ${KS} - make symlinks || die - make HOSTCFLAGS="${LINUX_HOSTCFLAGS}" dep || die - make HOSTCFLAGS="${LINUX_HOSTCFLAGS}" LEX="flex -l" bzImage || die - make HOSTCFLAGS="${LINUX_HOSTCFLAGS}" LEX="flex -l" modules || die - fi - #LVM tools are included in the linux and linux-extras pakcages - # cd ${KS2}/LVM/${LVMV} - # - # # This is needed for linux-extras - # if [ -f "Makefile" ] - # then - # make clean || die - # fi - # # I had to hack this in so that LVM will look in the current linux - # # source directory instead of /usr/src/linux for stuff - pete - # CFLAGS="${CFLAGS} -I${KS}/include" ./configure --prefix=/ --mandir=/usr/share/man --with-kernel_dir="${KS}" || die - # make || die - fi -} - -src_install() { - - if [ "${PN}" = "linux" ] || [ "${PN}" = "linux-extras" ] - then - # dodir /usr/lib - - # cd ${KS2}/LVM/${LVMV}/tools - # CFLAGS="${CFLAGS} -I${KS}/include" make install -e prefix=${D} mandir=${D}/usr/share/man sbindir=${D}/sbin libdir=${D}/lib || die - #no need for a static library in /lib - # mv ${D}/lib/*.a ${D}/usr/lib - - if [ "${PN}" = "linux" ] - then - dodir /usr/src/linux-${KV} - cd ${D}/usr/src - #grab includes and documentation only - echo ">>> Copying includes and documentation..." - cp -ax ${S}/include ${D}/usr/src/linux-${KV} - cp -ax ${S}/Documentation ${D}/usr/src/linux-${KV} - - #grab compiled kernel - dodir /boot/boot - insinto /boot/boot - cd ${S} - doins arch/i386/boot/bzImage - - #grab modules - # Do we have a bug in modutils ? - # Meanwhile we use this quick fix (achim) - - install -d ${D}/lib/modules/`uname -r` - make INSTALL_MOD_PATH=${D} modules_install || die - - cd ${S} - depmod -b ${D} -F ${S}/System.map ${KV} - #rm -rf ${D}/lib/modules/`uname -r` - #fix symlink - cd ${D}/lib/modules/${KV} - rm build - ln -sf /usr/src/linux-${KV} build - fi - - cd ${KS2}/cloop-${CLOOPV} - insinto /lib/modules/${KV}/kernel/drivers/block - doins cloop.o - into /usr - dobin create_compressed_fs extract_compressed_fs - - elif [ "$PN" = "linux-sources" ] - then - dodir /usr/src - cd ${S} - echo ">>> Copying sources..." - cp -ax ${WORKDIR}/* ${D}/usr/src - elif [ "$PN" = "linux-headers" ] - then - dodir /usr/include/linux - cp -ax ${KS}/include/linux/* ${D}/usr/include/linux - dodir /usr/include/asm - cp -ax ${KS}/include/asm-i386/* ${D}/usr/include/asm - fi - if [ -d ${D}/usr/src/linux-${KV} ] - then - #don't overwrite existing .config if present - cd ${D}/usr/src/linux-${KV} - if [ -e .config ] - then - cp -a .config .config.eg - fi - fi -} - -pkg_preinst() { - - if [ "$PN" = "linux-headers" ] - then - if [ -L ${ROOT}usr/include/linux ] - then - rm ${ROOT}usr/include/linux - fi - if [ -L ${ROOT}usr/include/asm ] - then - rm ${ROOT}usr/include/asm - fi - fi -} - -pkg_postinst() { - - if [ "$PN" = "linux-extras" ] || [ "$PN" = "linux-headers" ] - then - return - fi - rm -f ${ROOT}/usr/src/linux - ln -sf linux-${KV} ${ROOT}/usr/src/linux - - #copy over our .config if one isn't already present - cd ${ROOT}/usr/src/linux-${KV} - if [ "${PN}" = "linux-sources" ] && [ -e .config.eg ] && [ ! -e .config ] - then - cp -a .config.eg .config - fi -} diff --git a/sys-kernel/linux-sources/linux-sources-2.4.16-r1.ebuild b/sys-kernel/linux-sources/linux-sources-2.4.16-r2.ebuild index 12c3d1d21c17..e9e82de87683 100644 --- a/sys-kernel/linux-sources/linux-sources-2.4.16-r1.ebuild +++ b/sys-kernel/linux-sources/linux-sources-2.4.16-r2.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2001 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later # Maintainer: Daniel Robbins <drobbins@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-sources/linux-sources-2.4.16-r1.ebuild,v 1.5 2001/12/23 03:47:57 drobbins Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-sources/linux-sources-2.4.16-r2.ebuild,v 1.1 2001/12/24 17:45:41 drobbins Exp $ #OKV=original kernel version, KV=patched kernel version. They can be the same. @@ -76,7 +76,10 @@ src_unpack() { tar -xz --no-same-owner -f ${DISTDIR}/MOSIX-${MOSV}.tar.gz MOSIX-${MOSV}/patches.${OKV} fi cd ${S} - patchorama $PATCHES + # the linux-2.4.16-binutils.patch fixes a compile problem in the kernel (uses binutils incorrectly). + # This triggers an error when binutils 2.11.92.0.12.3 is installed. This particular problem is fixed + # in kernel 2.4.17. + patchorama ${FILESDIR}/linux-2.4.16-binutils.patch $PATCHES echo "Fixing up a single reject..." #This is a reject related to both low latency and XFS's kdb modifying the same enum. No biggie. cp ${GFILESDIR}/sysctl.h ${S}/include/linux |