From 5a24779e004d2934b82a82d3e81d929bcc7d5f73 Mon Sep 17 00:00:00 2001 From: Joshua Kinard Date: Fri, 29 Oct 2004 13:55:22 +0000 Subject: Added revised 2.6.9 ebuild with better patches. One fixes the prologue code issue again for gcc-3.4.x, another patch (for livecd testing only adds in CDROM partition support (this is extremely experimental), and a gbefb typo fix. --- sys-kernel/mips-sources/ChangeLog | 11 +- sys-kernel/mips-sources/Manifest | 6 +- .../mips-sources/files/digest-mips-sources-2.6.9 | 5 - .../files/digest-mips-sources-2.6.9-r1 | 5 + .../mips-sources/mips-sources-2.6.9-r1.ebuild | 139 +++++++++++++++++++++ sys-kernel/mips-sources/mips-sources-2.6.9.ebuild | 132 ------------------- 6 files changed, 157 insertions(+), 141 deletions(-) delete mode 100644 sys-kernel/mips-sources/files/digest-mips-sources-2.6.9 create mode 100644 sys-kernel/mips-sources/files/digest-mips-sources-2.6.9-r1 create mode 100644 sys-kernel/mips-sources/mips-sources-2.6.9-r1.ebuild delete mode 100644 sys-kernel/mips-sources/mips-sources-2.6.9.ebuild (limited to 'sys-kernel/mips-sources') diff --git a/sys-kernel/mips-sources/ChangeLog b/sys-kernel/mips-sources/ChangeLog index 1c7d12407251..a76da69ad254 100644 --- a/sys-kernel/mips-sources/ChangeLog +++ b/sys-kernel/mips-sources/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for sys-kernel/mips-sources # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.57 2004/10/23 13:07:27 kumba Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.58 2004/10/29 13:55:22 kumba Exp $ + +*mips-sources-2.6.9-r1 (29 Oct 2004) + + 29 Oct 2004; Joshua Kinard +mips-sources-2.6.9-r1.ebuild, + -mips-sources-2.6.9.ebuild: + Added revised 2.6.9 ebuild with better patches. One fixes the prologue code + issue again for gcc-3.4.x, another patch (for livecd testing only adds in + CDROM partition support (this is extremely experimental), and a gbefb typo + fix. 23 Oct 2004; Joshua Kinard : Digest fix diff --git a/sys-kernel/mips-sources/Manifest b/sys-kernel/mips-sources/Manifest index 8b1d3c299241..af36ec109eba 100644 --- a/sys-kernel/mips-sources/Manifest +++ b/sys-kernel/mips-sources/Manifest @@ -1,4 +1,4 @@ -MD5 869b7a796f2799e72abd8c8a9d19ba0e ChangeLog 23774 +MD5 45c48912ad7628e80ea91846e15c725b ChangeLog 24160 MD5 ad25a2a0b6ade60c13ad8040f3c319c6 metadata.xml 378 MD5 893517a6e0ac0aacc24a86edd1b1a30a mips-sources-2.4.25-r9.ebuild 3541 MD5 934e335d3e0c5b3db9d0eedb85939a08 mips-sources-2.4.26-r9.ebuild 2826 @@ -7,7 +7,7 @@ MD5 71f1e5f2f6af33e5864642f03005e865 mips-sources-2.6.4-r9.ebuild 4193 MD5 a7cea5c94f6572ad21d374d6cc1bc1f7 mips-sources-2.6.6-r9.ebuild 3827 MD5 9fc3ac7b1ea25e3080ea3dc04e3bc28e mips-sources-2.6.7-r7.ebuild 4006 MD5 0dd4c5d1e1e58c26c073d8ecbdbf14f2 mips-sources-2.6.8.1-r1.ebuild 4864 -MD5 09b82aaf3bba22638bbc20b3a23b2a54 mips-sources-2.6.9.ebuild 3942 +MD5 28aa75c0e235449b784b1de1f33d29e8 mips-sources-2.6.9-r1.ebuild 4169 MD5 78fa861fb27977a77c40bb56fe1a9ae4 files/digest-mips-sources-2.4.25-r9 386 MD5 59a7ea73fd0d417be02d033a892f80a7 files/digest-mips-sources-2.4.26-r9 387 MD5 189b09f9cd21ff2c298279c2a91be8f4 files/digest-mips-sources-2.4.27-r1 387 @@ -15,4 +15,4 @@ MD5 9702a71d858fa96d68bf98b60777b6ff files/digest-mips-sources-2.6.4-r9 468 MD5 504a5c390970d4da0c25c1eefa6a3958 files/digest-mips-sources-2.6.6-r9 468 MD5 ec15aeb9b5f17b470c6080185ccf7dba files/digest-mips-sources-2.6.7-r7 468 MD5 666046b65f46134e19982a15ea560454 files/digest-mips-sources-2.6.8.1-r1 389 -MD5 296e2ec204e526142f3d626e7bedb097 files/digest-mips-sources-2.6.9 385 +MD5 b7138e183ab91405dfb41f27e5d0a4a9 files/digest-mips-sources-2.6.9-r1 385 diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.9 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.9 deleted file mode 100644 index 92f4ba5d7619..000000000000 --- a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.9 +++ /dev/null @@ -1,5 +0,0 @@ -MD5 e921200f074ca97184e150ef5a4af825 linux-2.6.9.tar.bz2 36261440 -MD5 75e061644607a5e1d17f90e17f77af50 mipscvs-2.6.9-20041021.diff.bz2 350451 -MD5 520976e1fe8af95227005bfeceb4becf mips-sources-security_patches-1.2.tar.bz2 59859 -MD5 80ae7850c4c0366f92fe132e1000439d mips-sources-generic_patches-1.1.tar.bz2 14515 -MD5 dc6516ffe9fc9b264fc571874d30af47 cobalt-patches-26xx-1.8.tar.bz2 7414 diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.9-r1 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.9-r1 new file mode 100644 index 000000000000..9d9b5536ce3b --- /dev/null +++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.9-r1 @@ -0,0 +1,5 @@ +MD5 e921200f074ca97184e150ef5a4af825 linux-2.6.9.tar.bz2 36261440 +MD5 352cc4ab108e67f3e0db4e5f3dc5cb07 mipscvs-2.6.9-20041022.diff.bz2 352768 +MD5 7f039a1527b4dd2710326343290f6982 mips-sources-security_patches-1.3.tar.bz2 60344 +MD5 62b8e912bc4cdc2b691a8e23f7b31f95 mips-sources-generic_patches-1.2.tar.bz2 14392 +MD5 dc6516ffe9fc9b264fc571874d30af47 cobalt-patches-26xx-1.8.tar.bz2 7414 diff --git a/sys-kernel/mips-sources/mips-sources-2.6.9-r1.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.9-r1.ebuild new file mode 100644 index 000000000000..58d9905bd212 --- /dev/null +++ b/sys-kernel/mips-sources/mips-sources-2.6.9-r1.ebuild @@ -0,0 +1,139 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.9-r1.ebuild,v 1.1 2004/10/29 13:55:22 kumba Exp $ + + +# Version Data +OKV=${PV/_/-} +CVSDATE="20041022" # Date of diff between kernel.org and lmo CVS +#IP30DATE="" # Date of diff for IP30 (Octane) patches - XXX - Not Implemented Yet +COBALTPATCHVER="1.8" # Tarball version for cobalt patches +SECPATCHVER="1.3" # Tarball version for security patches +GENPATCHVER="1.2" # Tarball version for generic patches +EXTRAVERSION="-mipscvs-${CVSDATE}" +KV="${OKV}${EXTRAVERSION}" + +# Miscellaneous stuff +S=${WORKDIR}/linux-${OKV}-${CVSDATE} + +# Eclass stuff +ETYPE="sources" +inherit kernel eutils + + +# INCLUDED: +# 1) linux sources from kernel.org +# 2) linux-mips.org CVS snapshot diff from 14 Aug 2004 +# 3) Generic Fixes +# 4) Security fixes +# 5) Patches for Cobalt support + + +HOMEPAGE="http://www.linux-mips.org/" +SLOT="${OKV}" +PROVIDE="virtual/linux-sources" +KEYWORDS="-*" +IUSE="cobalt livecd" +#IUSE="cobalt ip30 ip27" + +DESCRIPTION="Linux-Mips CVS sources for MIPS-based machines, dated ${CVSDATE}" +SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${OKV}.tar.bz2 + mirror://gentoo/mipscvs-${OKV}-${CVSDATE}.diff.bz2 + mirror://gentoo/${PN}-security_patches-${SECPATCHVER}.tar.bz2 + mirror://gentoo/${PN}-generic_patches-${GENPATCHVER}.tar.bz2 + cobalt? ( mirror://gentoo/cobalt-patches-26xx-${COBALTPATCHVER}.tar.bz2 )" +# ip30? ( mirror://gentoo/ip30-patches-${IP30DATE}.tar.bz2 ) # IP30 Patches - XXX - Not Implemented +# ip27? ( mirror://lmoftp/blah.tar.bz2 ) # IP27 Patches - XXX - Not Implemented + +pkg_setup() { + # See if we're on a cobalt system (must use the cobalt-mips profile) + if use cobalt; then + echo -e "" + einfo "Please keep in mind that the 2.6 kernel will NOT boot on Cobalt" + einfo "systems that are still using the old Cobalt bootloader. In" + einfo "order to boot a 2.6 kernel on Cobalt systems, you must be using" + einfo "Peter Horton's new bootloader, which does not have the kernel" + einfo "size limitation that the older bootloader has. If you want" + einfo "to use the newer bootloader, make sure you have sys-boot/colo" + einfo "installed and setup." + echo -e "" + fi + +# # See if we're using IP30 (Octane) - XXX - Not Implemented +# if use ip30; then +# echo -e "" +# einfo "" +# echo -e "" +# fi + +# # See if we're using IP27 (Origin) - XXX - Not Implemented +# if use ip27; then +# echo -e "" +# einfo "" +# echo -e "" +# fi +} + +src_unpack() { + unpack ${A} + mv ${WORKDIR}/linux-${OKV} ${WORKDIR}/linux-${OKV}-${CVSDATE} + cd ${S} + + # Update the vanilla sources with linux-mips CVS changes + epatch ${WORKDIR}/mipscvs-${OKV}-${CVSDATE}.diff + + # Generic patches we always include + echo -e "" + einfo ">>> Generic Patches" + # IP32 Patches + epatch ${WORKDIR}/mips-patches/misc-2.6-ip32-onion2-gbefb-fixes-old.patch + epatch ${WORKDIR}/mips-patches/misc-2.6.9-ths-ip32-misc.patch + epatch ${WORKDIR}/mips-patches/misc-2.6-ip32-tweak-makefile.patch + epatch ${WORKDIR}/mips-patches/misc-2.6-gbefb-compile-fix.patch + + # Generic + epatch ${WORKDIR}/mips-patches/misc-2.6-fix-prologue-error.patch + eend + + + # Patches used in building LiveCDs /* EXPERIMENTAL */ + if use livecd; then + epatch ${WORKDIR}/mips-patches/misc-2.6-livecd-partitioned-cdroms.patch + fi + + +# # Security Fixes +# echo -e "" +# ebegin ">>> Applying Security Fixes" +# eend + + + # Cobalt Patches + if use cobalt; then + echo -e "" + einfo ">>> Patching kernel for Cobalt support ..." + for x in ${WORKDIR}/cobalt-patches-26xx-${COBALTPATCHVER}/*.patch; do + epatch ${x} + done + cp ${WORKDIR}/cobalt-patches-26xx-${COBALTPATCHVER}/cobalt-patches.txt ${S} + cd ${WORKDIR} + mv ${WORKDIR}/linux-${OKV}-${CVSDATE} ${WORKDIR}/linux-${OKV}-${CVSDATE}.cobalt + S="${S}.cobalt" + fi + + +# # IP30 (Octane) Patch - XXX - Not Implemented +# if use ip30; then +# echo -e "" +# einfo ">>> Patching kernel for SGI Octane (IP30) support ..." +# fi + +# # IP27 (Origin) Hacks - XXX - Not Implemented +# if use ip27; then +# echo -e "" +# einfo ">>> Patching kernel for SGI Origin (IP27) support ..." +# fi + + + kernel_universal_unpack +} diff --git a/sys-kernel/mips-sources/mips-sources-2.6.9.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.9.ebuild deleted file mode 100644 index b689b442dff6..000000000000 --- a/sys-kernel/mips-sources/mips-sources-2.6.9.ebuild +++ /dev/null @@ -1,132 +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/mips-sources/mips-sources-2.6.9.ebuild,v 1.1 2004/10/21 22:42:11 kumba Exp $ - - -# Version Data -OKV=${PV/_/-} -CVSDATE="20041021" # Date of diff between kernel.org and lmo CVS -#IP30DATE="" # Date of diff for IP30 (Octane) patches - XXX - Not Implemented Yet -COBALTPATCHVER="1.8" # Tarball version for cobalt patches -SECPATCHVER="1.2" # Tarball version for security patches -GENPATCHVER="1.1" # Tarball version for generic patches -EXTRAVERSION="-mipscvs-${CVSDATE}" -KV="${OKV}${EXTRAVERSION}" - -# Miscellaneous stuff -S=${WORKDIR}/linux-${OKV}-${CVSDATE} - -# Eclass stuff -ETYPE="sources" -inherit kernel eutils - - -# INCLUDED: -# 1) linux sources from kernel.org -# 2) linux-mips.org CVS snapshot diff from 14 Aug 2004 -# 3) Generic Fixes -# 4) Security fixes -# 5) Patches for Cobalt support - - -HOMEPAGE="http://www.linux-mips.org/" -SLOT="${OKV}" -PROVIDE="virtual/linux-sources" -KEYWORDS="-*" -IUSE="cobalt" -#IUSE="cobalt ip30 ip27" - -DESCRIPTION="Linux-Mips CVS sources for MIPS-based machines, dated ${CVSDATE}" -SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${OKV}.tar.bz2 - mirror://gentoo/mipscvs-${OKV}-${CVSDATE}.diff.bz2 - mirror://gentoo/${PN}-security_patches-${SECPATCHVER}.tar.bz2 - mirror://gentoo/${PN}-generic_patches-${GENPATCHVER}.tar.bz2 - cobalt? ( mirror://gentoo/cobalt-patches-26xx-${COBALTPATCHVER}.tar.bz2 )" -# ip30? ( mirror://gentoo/ip30-patches-${IP30DATE}.tar.bz2 ) # IP30 Patches - XXX - Not Implemented -# ip27? ( mirror://lmoftp/blah.tar.bz2 ) # IP27 Patches - XXX - Not Implemented - -pkg_setup() { - # See if we're on a cobalt system (must use the cobalt-mips profile) - if use cobalt; then - echo -e "" - einfo "Please keep in mind that the 2.6 kernel will NOT boot on Cobalt" - einfo "systems that are still using the old Cobalt bootloader. In" - einfo "order to boot a 2.6 kernel on Cobalt systems, you must be using" - einfo "Peter Horton's new bootloader, which does not have the kernel" - einfo "size limitation that the older bootloader has. If you want" - einfo "to use the newer bootloader, make sure you have sys-boot/colo" - einfo "installed and setup." - echo -e "" - fi - -# # See if we're using IP30 (Octane) - XXX - Not Implemented -# if use ip30; then -# echo -e "" -# einfo "" -# echo -e "" -# fi - -# # See if we're using IP27 (Origin) - XXX - Not Implemented -# if use ip27; then -# echo -e "" -# einfo "" -# echo -e "" -# fi -} - -src_unpack() { - unpack ${A} - mv ${WORKDIR}/linux-${OKV} ${WORKDIR}/linux-${OKV}-${CVSDATE} - cd ${S} - - # Update the vanilla sources with linux-mips CVS changes - epatch ${WORKDIR}/mipscvs-${OKV}-${CVSDATE}.diff - - # Generic patches we always include - echo -e "" - einfo ">>> Generic Patches" - # IP32 Patches - epatch ${WORKDIR}/mips-patches/misc-2.6-ip32-onion2-gbefb-fixes-old.patch - epatch ${WORKDIR}/mips-patches/misc-2.6.9-ths-ip32-misc.patch - - # Generic - epatch ${WORKDIR}/mips-patches/misc-2.6-force_mouse_detection.patch - epatch ${WORKDIR}/mips-patches/misc-2.6-fix-prologue-error.patch - eend - - -# # Security Fixes -# echo -e "" -# ebegin ">>> Applying Security Fixes" -# eend - - - # Cobalt Patches - if use cobalt; then - echo -e "" - einfo ">>> Patching kernel for Cobalt support ..." - for x in ${WORKDIR}/cobalt-patches-26xx-${COBALTPATCHVER}/*.patch; do - epatch ${x} - done - cp ${WORKDIR}/cobalt-patches-26xx-${COBALTPATCHVER}/cobalt-patches.txt ${S} - cd ${WORKDIR} - mv ${WORKDIR}/linux-${OKV}-${CVSDATE} ${WORKDIR}/linux-${OKV}-${CVSDATE}.cobalt - S="${S}.cobalt" - fi - - -# # IP30 (Octane) Patch - XXX - Not Implemented -# if use ip30; then -# echo -e "" -# einfo ">>> Patching kernel for SGI Octane (IP30) support ..." -# fi - -# # IP27 (Origin) Hacks - XXX - Not Implemented -# if use ip27; then -# echo -e "" -# einfo ">>> Patching kernel for SGI Origin (IP27) support ..." -# fi - - - kernel_universal_unpack -} -- cgit v1.2.3-65-gdbad