Added a patch for 2.6.9 that allows for Linux on Octane (IP30, 'Speedracer'). This...

diff --git a/sys-kernel/mips-sources/ChangeLog b/sys-kernel/mips-sources/ChangeLog
index e953de4aeafee90d93df4b2cf1ded818b1aa9098..49702d4d6512813826933c035f2c0180d68c0760 100644 (file)
--- 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.59 2004/10/29 22:51:00 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.60 2004/11/02 06:42:51 kumba Exp $
+
+*mips-sources-2.6.9-r2 (02 Nov 2004)
+
+  02 Nov 2004; Joshua Kinard <kumba@gentoo.org>
+  mips-sources-2.6.8.1-r1.ebuild, -mips-sources-2.6.9-r1.ebuild,
+  +mips-sources-2.6.9-r2.ebuild:
+  Added a patch for 2.6.9 that allows for Linux on Octane (IP30, 'Speedracer').
+  This also fixes the 2.6.9-r1 bad digests (finally), and cleans 2.6.8.1's 
+  ebuild up a bit.
 
   29 Oct 2004; Joshua Kinard <kumba@gentoo.org> :
   Tweaked the prologue patch in the generic patch tarball.
@@ -10,7 +19,7 @@
   29 Oct 2004; Joshua Kinard <kumba@gentoo.org> +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
+  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.
 

diff --git a/sys-kernel/mips-sources/Manifest b/sys-kernel/mips-sources/Manifest
index 3f19ba27480d4eb7160752e623bfa3b704f8fb5a..8a207ed5a07961452b1ce5d53019574ea6af4e42 100644 (file)
--- a/sys-kernel/mips-sources/Manifest
+++ b/sys-kernel/mips-sources/Manifest
@@ -1,4 +1,4 @@
-MD5 a55f4660a9049ceb5c31ae68bfffdae0 ChangeLog 24270
+MD5 788fb4aaaf403c31d9a91158c12bef00 ChangeLog 24629
 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
@@ -6,8 +6,8 @@ MD5 2bc3fe743615151aee229914be53ee7a mips-sources-2.4.27-r1.ebuild 2508
 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 b49344c257737fab323ea7b8e040820c mips-sources-2.6.9-r1.ebuild 4172
+MD5 af43204cafe2af3476713744bae0fae8 mips-sources-2.6.8.1-r1.ebuild 4391
+MD5 67a1dbc30e4d33c12ea01bba2d508b66 mips-sources-2.6.9-r2.ebuild 5210
 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 a7dc31c1652055f320252220b9804e78 files/digest-mips-sources-2.6.9-r1 385
+MD5 a6fe1f504417c3267908503e7034ae4d files/digest-mips-sources-2.6.9-r2 385

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-r2
similarity index 78%
rename from sys-kernel/mips-sources/files/digest-mips-sources-2.6.9-r1
rename to sys-kernel/mips-sources/files/digest-mips-sources-2.6.9-r2
index 6f7115783d9fbd6a42dbce1006bade572cf179de..acbf3129b386dca0a3a1ca0cb5126f8426817359 100644 (file)
--- 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-r2
@@ -1,5 +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 d9ab3c1f0eb1e1ad51b5fabe8695828b mips-sources-generic_patches-1.2.tar.bz2 14528
+MD5 35e24f596abdeb44468d70a21d266e2a mips-sources-generic_patches-1.3.tar.bz2 52928
 MD5 dc6516ffe9fc9b264fc571874d30af47 cobalt-patches-26xx-1.8.tar.bz2 7414

diff --git a/sys-kernel/mips-sources/mips-sources-2.6.8.1-r1.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.8.1-r1.ebuild
index a692fa16c7e42642bab7fe087fa52067a79861ee..628812984b569839f3d929f145dcf9e6f2452e35 100644 (file)
--- a/sys-kernel/mips-sources/mips-sources-2.6.8.1-r1.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.6.8.1-r1.ebuild
@@ -1,12 +1,11 @@
 # 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.8.1-r1.ebuild,v 1.1 2004/09/29 09:46:15 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.8.1-r1.ebuild,v 1.2 2004/11/02 06:42:51 kumba Exp $
 
 
 # Version Data
 OKV=${PV/_/-}
 CVSDATE="20040822"                     # Date of diff between kernel.org and lmo CVS
-#IP30DATE=""                           # Date of diff for IP30 (Octane) patches - XXX - Not Implemented Yet
 COBALTPATCHVER="1.7"                   # Tarball version for cobalt patches
 SECPATCHVER="1.2"                      # Tarball version for security patches
 GENPATCHVER="1.0"                      # Tarball version for generic patches
@@ -35,7 +34,7 @@ SLOT="${OKV}"
 PROVIDE="virtual/linux-sources"
 KEYWORDS="-*"
 IUSE="cobalt"
-#IUSE="cobalt ip30 ip27"
+#IUSE="cobalt ip27"
 
 DESCRIPTION="Linux-Mips CVS sources for MIPS-based machines, dated ${CVSDATE}"
 SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${OKV}.tar.bz2
@@ -43,7 +42,6 @@ SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${OKV}.tar.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() {
@@ -60,13 +58,6 @@ pkg_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 ""
@@ -131,12 +122,6 @@ src_unpack() {
        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 ""

diff --git a/sys-kernel/mips-sources/mips-sources-2.6.9-r1.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.9-r2.ebuild
similarity index 67%
rename from sys-kernel/mips-sources/mips-sources-2.6.9-r1.ebuild
rename to sys-kernel/mips-sources/mips-sources-2.6.9-r2.ebuild
index 58d9905bd2124b25bacb1b12d8cf1dfa4e4850f7..754e3dc82916dcbb6802ccc8cc0bf1f7a6ebe190 100644 (file)
--- a/sys-kernel/mips-sources/mips-sources-2.6.9-r1.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.6.9-r2.ebuild
@@ -1,15 +1,14 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.9-r2.ebuild,v 1.1 2004/11/02 06:42:51 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
+GENPATCHVER="1.3"                      # Tarball version for generic patches
 EXTRAVERSION="-mipscvs-${CVSDATE}"
 KV="${OKV}${EXTRAVERSION}"
 
@@ -26,15 +25,15 @@ inherit kernel eutils
 # 2) linux-mips.org CVS snapshot diff from 14 Aug 2004
 # 3) Generic Fixes
 # 4) Security fixes
-# 5) Patches for Cobalt support
-
+# 5) Patches for Cobalt support (http://www.colonel-panic.org/cobalt-mips/)
+# 6) Patch for IP30 Octane Support (http://helios.et.put.poznan.pl/~sskowron/ip30/)
 
 HOMEPAGE="http://www.linux-mips.org/"
 SLOT="${OKV}"
 PROVIDE="virtual/linux-sources"
 KEYWORDS="-*"
-IUSE="cobalt livecd"
-#IUSE="cobalt ip30 ip27"
+IUSE="cobalt ip30 livecd"
+#IUSE="cobalt ip30 ip27 livecd"
 
 DESCRIPTION="Linux-Mips CVS sources for MIPS-based machines, dated ${CVSDATE}"
 SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${OKV}.tar.bz2
@@ -42,7 +41,6 @@ SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${OKV}.tar.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() {
@@ -59,12 +57,25 @@ pkg_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 IP30 (Octane) - XXX - Not Implemented
+       if use ip30; then
+               echo -e ""
+               einfo "Octane Support is EXPERIMENTAL!  Note the use of caps and the word"
+               einfo "EXPERIMENTAL.  That said, while current tests of Octane support"
+               einfo "generally have worked well, there are some known drawbacks, including"
+               einfo "lack of an X driver (Octane only works in console framebuffer for"
+               einfo "now, but this will likely change).  Also, and this is important,"
+               einfo "but you can ONLY use ONE scsi disk in the Octane.  Use of a second or"
+               einfo "more disks will oops the kernel.  It is hoped the move to the qla1280"
+               einfo "scsi driver will resolve this bug, but that is in the future.  For now,"
+               einfo "the qlogicisp driver is the only thing available, and thus limits us to"
+               einfo "one scsi disk."
+               echo -e ""
+               einfo "Also, Octane can only be netbooted.  There is no support for disk-booting"
+               einfo "as of yet.  Disk-booting will require a 64bit Arcboot or an entirely new"
+               einfo "bootloader, and both are non-existant at this point in time."
+               echo -e ""
+       fi
 
 #      # See if we're using IP27 (Origin) - XXX - Not Implemented
 #      if use ip27; then
@@ -96,18 +107,22 @@ src_unpack() {
        eend
 
 
+       # IP30 (Octane) Patch
+       if use ip30; then
+               echo -e ""
+               einfo ">>> Patching kernel for SGI Octane (IP30) support ..."
+               epatch ${WORKDIR}/mips-patches/misc-2.6.9-ip30-octane-support.patch
+               mv ${WORKDIR}/linux-${OKV}-${CVSDATE} ${WORKDIR}/linux-${OKV}-${CVSDATE}.ip30
+               S="${S}.ip30"
+       fi
+
+
        # 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 ""
@@ -116,17 +131,16 @@ src_unpack() {
                        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
+#      # Security Fixes
+#      echo -e ""
+#      ebegin ">>> Applying Security Fixes"
+#      eend
+
 
 #      # IP27 (Origin) Hacks - XXX - Not Implemented
 #      if use ip27; then