diff options
author | Joshua Kinard <kumba@gentoo.org> | 2004-04-16 09:12:41 +0000 |
---|---|---|
committer | Joshua Kinard <kumba@gentoo.org> | 2004-04-16 09:12:41 +0000 |
commit | 69aee6544cef4d241d75bed15258e2d2df88cb5a (patch) | |
tree | 7d746ee00b736d09c5e03a8e1fff379015413919 /sys-kernel/mips-prepatch-sources | |
parent | Filter out LC_ALL (Manifest recommit) (diff) | |
download | gentoo-2-69aee6544cef4d241d75bed15258e2d2df88cb5a.tar.gz gentoo-2-69aee6544cef4d241d75bed15258e2d2df88cb5a.tar.bz2 gentoo-2-69aee6544cef4d241d75bed15258e2d2df88cb5a.zip |
Removed old ebuilds until new pre/rc's come out.
Diffstat (limited to 'sys-kernel/mips-prepatch-sources')
6 files changed, 6 insertions, 145 deletions
diff --git a/sys-kernel/mips-prepatch-sources/.keep b/sys-kernel/mips-prepatch-sources/.keep new file mode 100644 index 000000000000..e69de29bb2d1 --- /dev/null +++ b/sys-kernel/mips-prepatch-sources/.keep diff --git a/sys-kernel/mips-prepatch-sources/ChangeLog b/sys-kernel/mips-prepatch-sources/ChangeLog index 7105a7715ed2..f9875a30f33b 100644 --- a/sys-kernel/mips-prepatch-sources/ChangeLog +++ b/sys-kernel/mips-prepatch-sources/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-kernel/mips-prepatch-sources # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-prepatch-sources/ChangeLog,v 1.10 2004/04/12 16:36:22 aliz Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-prepatch-sources/ChangeLog,v 1.11 2004/04/16 09:12:40 kumba Exp $ + + 16 Apr 2004; Joshua Kinard <kumba@gentoo.org> .keep, + mips-prepatch-sources-2.4.25_pre6-r1.ebuild, files/do_munmap-fix.patch, + files/mipscvs-2.4.25-pre6-20040209-makefile.patch: + Removed old ebuilds until new pre/rc's come out. 12 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> mips-prepatch-sources-2.4.25_pre6-r1.ebuild: diff --git a/sys-kernel/mips-prepatch-sources/files/digest-mips-prepatch-sources-2.4.25_pre6-r1 b/sys-kernel/mips-prepatch-sources/files/digest-mips-prepatch-sources-2.4.25_pre6-r1 deleted file mode 100644 index b04d6ff75229..000000000000 --- a/sys-kernel/mips-prepatch-sources/files/digest-mips-prepatch-sources-2.4.25_pre6-r1 +++ /dev/null @@ -1,4 +0,0 @@ -MD5 1e055c42921b2396a559d84df4c3d9aa linux-2.4.24.tar.bz2 29837818 -MD5 446ba59d61433604f65b0be98f980849 patch-2.4.25-pre6.bz2 1639920 -MD5 f1c54736fe2ef4e807cb83aca4523520 mipscvs-2.4.25-pre6-20040209.diff.bz2 121803 -MD5 3164a83e10562b34fa250fd9b892b5b2 cobalt-patches-24xx-1.1.tar.bz2 3831 diff --git a/sys-kernel/mips-prepatch-sources/files/do_munmap-fix.patch b/sys-kernel/mips-prepatch-sources/files/do_munmap-fix.patch deleted file mode 100644 index e120b35b7adb..000000000000 --- a/sys-kernel/mips-prepatch-sources/files/do_munmap-fix.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -ur linux-2.4.25-rc3/mm/mremap.c linux-2.4.25-rc4/mm/mremap.c ---- linux-2.4.25-rc3/mm/mremap.c 2004-02-18 13:56:01.000000000 +0000 -+++ linux-2.4.25-rc4/mm/mremap.c 2004-02-18 13:49:08.000000000 +0000 -@@ -258,16 +258,20 @@ - if ((addr <= new_addr) && (addr+old_len) > new_addr) - goto out; - -- do_munmap(current->mm, new_addr, new_len); -+ ret = do_munmap(current->mm, new_addr, new_len); -+ if (ret && new_len) -+ goto out; - } - - /* - * Always allow a shrinking remap: that just unmaps - * the unnecessary pages.. - */ -- ret = addr; - if (old_len >= new_len) { -- do_munmap(current->mm, addr+new_len, old_len - new_len); -+ ret = do_munmap(current->mm, addr+new_len, old_len - new_len); -+ if (ret && old_len != new_len) -+ goto out; -+ ret = addr; - if (!(flags & MREMAP_FIXED) || (new_addr == addr)) - goto out; - } diff --git a/sys-kernel/mips-prepatch-sources/files/mipscvs-2.4.25-pre6-20040209-makefile.patch b/sys-kernel/mips-prepatch-sources/files/mipscvs-2.4.25-pre6-20040209-makefile.patch deleted file mode 100644 index 2a384f599669..000000000000 --- a/sys-kernel/mips-prepatch-sources/files/mipscvs-2.4.25-pre6-20040209-makefile.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- arch/mips64/Makefile.orig 2004-02-05 02:28:01.961823000 -0500 -+++ arch/mips64/Makefile 2004-02-05 02:28:59.251823000 -0500 -@@ -26,6 +26,9 @@ ifdef CONFIG_CROSSCOMPILE - CROSS_COMPILE = $(tool-prefix) - endif - -+check_gcc = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi) -+check_gas = $(shell if $(CC) $(1) -Wa,-Z -c -o /dev/null -xassembler /dev/null > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi) -+ - # - # The ELF GCC uses -G 0 -mabicalls -fpic as default. We don't need PIC - # code in the kernel since it only slows down the whole thing. For the -@@ -49,9 +52,6 @@ GCCFLAGS += -mno-sched-prolog -fno-omit- - endif - endif - --check_gcc = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi) --check_gas = $(shell if $(CC) $(1) -Wa,-Z -c -o /dev/null -xassembler /dev/null > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi) -- - # - # Use: $(call set_gccflags,<cpu0>,<isa0>,<cpu1>,<isa1>) - # -@@ -334,7 +334,7 @@ endif - # convert to ECOFF using elf2ecoff. - # - ifdef CONFIG_BOOT_ELF32 --GCCFLAGS += -Wa,-32 $(call check_gas,-Wa$(comma)-mgp64,) -+GCCFLAGS += -Wa,-mabi=o64 $(call check_gas,-Wa$(comma)-mgp64,) - LINKFLAGS += -T arch/mips64/ld.script.elf32 - endif - # -@@ -402,5 +402,6 @@ archmrproper: - archdep: - if [ ! -f $(TOPDIR)/include/asm-$(ARCH)/offset.h ]; then \ - touch $(TOPDIR)/include/asm-$(ARCH)/offset.h; \ -+ $(MAKE) -C arch/mips/tools clean; \ - fi; - @$(MAKEBOOT) dep diff --git a/sys-kernel/mips-prepatch-sources/mips-prepatch-sources-2.4.25_pre6-r1.ebuild b/sys-kernel/mips-prepatch-sources/mips-prepatch-sources-2.4.25_pre6-r1.ebuild deleted file mode 100644 index 7f436922c9e3..000000000000 --- a/sys-kernel/mips-prepatch-sources/mips-prepatch-sources-2.4.25_pre6-r1.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2004 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-prepatch-sources/mips-prepatch-sources-2.4.25_pre6-r1.ebuild,v 1.2 2004/04/12 16:36:22 aliz Exp $ - - -# Version Data -OKV=${PV/_/-} -CVSDATE="20040209" -EXTRAVERSION="-mipscvs-${CVSDATE}" -KV="${OKV}${EXTRAVERSION}" -COBALTPATCHVER="1.1" -STABLEVERSION="2.4.24" - -# Miscellaneous -S=${WORKDIR}/linux-${OKV}-${CVSDATE} -IUSE="" - -# Eclass Stuff -ETYPE="sources" -inherit kernel eutils - - -# INCLUDED: -# 1) linux stable sources from kernel.org -# 2) patch to latest linux prepatch sources -# 3) linux-mips.org CVS snapshot diff from 09 Feb 2004 -# 4) patch to fix Makefile(s) to pass appropriate CFLAGS -# 5) Patches for Cobalt support - - -DESCRIPTION="Linux-Mips CVS pre-patch sources for MIPS-based machines" -SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${STABLEVERSION}.tar.bz2 - mirror://kernel/linux/kernel/v2.4/testing/patch-${OKV}.bz2 - mirror://gentoo/mipscvs-${OKV}-${CVSDATE}.diff.bz2 - mirror://gentoo/cobalt-patches-24xx-${COBALTPATCHVER}.tar.bz2" -HOMEPAGE="http://www.kernel.org http://www.linux-mips.org/" -SLOT="${OKV}" -PROVIDE="virtual/linux-sources" -KEYWORDS="-* ~mips" - - -src_unpack() { - unpack ${A} - mv ${WORKDIR}/linux-${STABLEVERSION} ${S} - cd ${S} - - # Update the vanilla sources with prepatch diff - einfo ">>> Patching linux-${STABLEVERSION} to linux-${OKV} ..." - epatch ${WORKDIR}/patch-${OKV} - echo -e "" - - # Update the vanilla prepatch sources with linux-mips CVS changes - einfo ">>> Patching linux-${OKV} to linux-${OKV}${EXTRAVERSION} ..." - epatch ${WORKDIR}/mipscvs-${OKV}-${CVSDATE}.diff - echo -e "" - - # Patch arch/mips/Makefile & arch/mips64/Makefile - einfo ">>> Patching Makefile(s) ..." - epatch ${FILESDIR}/mipscvs-${OKV}-${CVSDATE}-makefile.patch - echo -e "" - - # do_munmap fix (Possibly Exploitable) - epatch ${FILESDIR}/do_munmap-fix.patch - - # Cobalt stuff - if [ "${PROFILE_ARCH}" = "cobalt" ]; then - einfo ">>> Patching kernel for Cobalt support ..." - for x in ${WORKDIR}/cobalt-patches-24xx-${COBALTPATCHVER}/*.patch; do - epatch ${x} - done - cp ${WORKDIR}/cobalt-patches-24xx-${COBALTPATCHVER}/cobalt-patches.txt ${S} - fi - - kernel_universal_unpack -} |