2.4.28 broke stuff, like procps on Octane & IP28. Will investigate, but masking for now. Made 2.4.23 unstable, and added a 2.6.10 ebuild based on kernel-2.eclass. Disturbingly enough, glibc will build against 2.6.10 on o32. This requires experimentation.

(Portage version: 2.0.51.16)

7 files changed, 129 insertions, 8 deletions

diff --git a/sys-kernel/mips-headers/ChangeLog b/sys-kernel/mips-headers/ChangeLog
index 2677ea6a93b1..905b55ee0d53 100644
--- a/sys-kernel/mips-headers/ChangeLog
+++ b/sys-kernel/mips-headers/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-kernel/mips-headers
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-headers/ChangeLog,v 1.26 2005/02/24 19:42:09 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-headers/ChangeLog,v 1.27 2005/02/27 05:55:41 kumba Exp $
+
+*mips-headers-2.6.10 (27 Feb 2005)
+
+  27 Feb 2005; Joshua Kinard <kumba@gentoo.org>
+  +files/mips-headers-2.6.10-ip27-build64.patch, mips-headers-2.4.23.ebuild,
+  mips-headers-2.4.28-r1.ebuild, +mips-headers-2.6.10.ebuild:
+  2.4.28 broke stuff, like procps on Octane & IP28. Will investigate, but
+  masking for now. Made 2.4.23 unstable, and added a 2.6.10 ebuild based on
+  kernel-2.eclass. Disturbingly enough, glibc will build against 2.6.10 on o32.
+  This requires experimentation.
 
 *mips-headers-2.4.28-r1 (24 Feb 2005)
 
diff --git a/sys-kernel/mips-headers/Manifest b/sys-kernel/mips-headers/Manifest
index 929455943f33..66bab377e2da 100644
--- a/sys-kernel/mips-headers/Manifest
+++ b/sys-kernel/mips-headers/Manifest
@@ -1,9 +1,10 @@
-MD5 c87744609f8c461d2158ffcfc10e3c1d ChangeLog 6215
+MD5 e886a6e64f4befefb07da8a8679761bc ChangeLog 6702
 MD5 a79e966514d7aa3b003e25a207766f97 metadata.xml 417
-MD5 ead368fc5c82fe26b90e5fa8d4d32bf0 mips-headers-2.4.28-r1.ebuild 1729
+MD5 ee21a628808587804fa998f5a93ce503 mips-headers-2.4.28-r1.ebuild 1723
+MD5 4d07351d0b7561a9bb77eb67fa2ece46 mips-headers-2.6.10.ebuild 2934
 MD5 31d4cfc5f4d27ee9e57665016aef3a40 mips-headers-2.4.21-r3.ebuild 1440
 MD5 4be1b356299c51ee7ba3ae024609801e mips-headers-2.4.22-r1.ebuild 1894
-MD5 550ce0a0c1075703ca803f3917bb21e6 mips-headers-2.4.23.ebuild 1705
+MD5 195a32bdb76adac196ffaff0917946f7 mips-headers-2.4.23.ebuild 1711
 MD5 dec78ca9379b77caee02a76fd10299e0 mips-headers-2.6.8.1.ebuild 4912
 MD5 e300a3e148a7dcc38a0e099494fb6cb3 files/bigendian-byteorder-fix.patch 1557
 MD5 3ec0bd6b14384ef98b64cb997030f3cc files/mipscvs-2.4.22-20030825-makefile-fix.patch 1344
@@ -12,3 +13,5 @@ MD5 98354eb02ecc6b8d0463a68eba698a85 files/digest-mips-headers-2.4.22-r1 144
 MD5 b7b1f3cc3d41e54d5a23057bc0c83fb5 files/digest-mips-headers-2.4.23 144
 MD5 8f5959efd5bf8e2a54ccaf533cec3daf files/digest-mips-headers-2.4.28-r1 144
 MD5 6b509f4a052aeb7f0d2f5e13aab68896 files/digest-mips-headers-2.6.8.1 304
+MD5 c233f4098da182e277b2a33ff25d2e38 files/mips-headers-2.6.10-ip27-build64.patch 358
+MD5 ca897b2df888cab8164711f59903b66a files/digest-mips-headers-2.6.10 161
diff --git a/sys-kernel/mips-headers/files/digest-mips-headers-2.6.10 b/sys-kernel/mips-headers/files/digest-mips-headers-2.6.10
new file mode 100644
index 000000000000..0af5ab6a41b9
--- /dev/null
+++ b/sys-kernel/mips-headers/files/digest-mips-headers-2.6.10
@@ -0,0 +1,2 @@
+MD5 bfa5c9bb9e1b95327baae53a9a6c2d35 mipscvs-2.6.10-20050115.diff.bz2 351205
+MD5 e5e5f30d56f362c070cb3d52b41ce0aa mips-sources-generic_patches-1.6.tar.bz2 98327
diff --git a/sys-kernel/mips-headers/files/mips-headers-2.6.10-ip27-build64.patch b/sys-kernel/mips-headers/files/mips-headers-2.6.10-ip27-build64.patch
new file mode 100644
index 000000000000..cf6db44be684
--- /dev/null
+++ b/sys-kernel/mips-headers/files/mips-headers-2.6.10-ip27-build64.patch
@@ -0,0 +1,11 @@
+--- arch/mips/configs/ip27_defconfig.orig	2005-02-26 21:37:41.460200984 -0500
++++ arch/mips/configs/ip27_defconfig	2005-02-26 21:37:53.545363760 -0500
+@@ -148,7 +148,7 @@ CONFIG_MMU=y
+ #
+ CONFIG_BINFMT_ELF=y
+ # CONFIG_BINFMT_MISC is not set
+-# CONFIG_BUILD_ELF64 is not set
++CONFIG_BUILD_ELF64=y
+ CONFIG_MIPS32_COMPAT=y
+ CONFIG_COMPAT=y
+ CONFIG_MIPS32_O32=y
diff --git a/sys-kernel/mips-headers/mips-headers-2.4.23.ebuild b/sys-kernel/mips-headers/mips-headers-2.4.23.ebuild
index fbe86a6eb255..0a76c1f4fdea 100644
--- a/sys-kernel/mips-headers/mips-headers-2.4.23.ebuild
+++ b/sys-kernel/mips-headers/mips-headers-2.4.23.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-headers/mips-headers-2.4.23.ebuild,v 1.5 2005/02/06 04:48:42 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-headers/mips-headers-2.4.23.ebuild,v 1.6 2005/02/27 05:55:41 kumba Exp $
 
 ETYPE="headers"
 inherit kernel
@@ -24,7 +24,7 @@ SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
 HOMEPAGE="http://www.linux-mips.org/"
 SLOT="0"
 PROVIDE="virtual/os-headers"
-KEYWORDS="-*"
+KEYWORDS="-* ~mips"
 IUSE=""
 
 src_unpack() {
diff --git a/sys-kernel/mips-headers/mips-headers-2.4.28-r1.ebuild b/sys-kernel/mips-headers/mips-headers-2.4.28-r1.ebuild
index 4501f3221963..b59826388ff4 100644
--- a/sys-kernel/mips-headers/mips-headers-2.4.28-r1.ebuild
+++ b/sys-kernel/mips-headers/mips-headers-2.4.28-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-headers/mips-headers-2.4.28-r1.ebuild,v 1.1 2005/02/24 19:42:09 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-headers/mips-headers-2.4.28-r1.ebuild,v 1.2 2005/02/27 05:55:41 kumba Exp $
 
 ETYPE="headers"
 inherit kernel eutils
@@ -24,7 +24,7 @@ SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
 HOMEPAGE="http://www.linux-mips.org/"
 SLOT="0"
 PROVIDE="virtual/os-headers"
-KEYWORDS="-* ~mips"
+KEYWORDS="-*"
 IUSE=""
 
 src_unpack() {
diff --git a/sys-kernel/mips-headers/mips-headers-2.6.10.ebuild b/sys-kernel/mips-headers/mips-headers-2.6.10.ebuild
new file mode 100644
index 000000000000..f4558208f79c
--- /dev/null
+++ b/sys-kernel/mips-headers/mips-headers-2.6.10.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-headers/mips-headers-2.6.10.ebuild,v 1.1 2005/02/27 05:55:41 kumba Exp $
+
+# Eclass bits
+ETYPE="headers"
+H_SUPPORTEDARCH="mips"
+inherit kernel-2
+detect_version
+
+# Version Data
+OKV=${PV/_/-}
+CVSDATE="20050115"                      # Date of diff between kernel.org and lmo CVS
+GENPATCHVER="1.6"                       # Tarball version for generic patches
+EXTRAVERSION="-mipscvs-${CVSDATE}"
+
+# INCLUDED:
+# 1) linux sources from kernel.org
+# 2) linux-mips.org CVS snapshot diff from 15 Jan 2005
+# 4) Generic mips patches
+
+DESCRIPTION="Linux Headers from Linux-Mips CVS, dated ${CVSDATE}"
+##SRC_URImirror://kernel/linux/kernel/v2.6/linux-${OKV}.tar.bz2
+SRC_URI="mirror://gentoo/mipscvs-${OKV}-${CVSDATE}.diff.bz2
+	mirror://gentoo/mips-sources-generic_patches-${GENPATCHVER}.tar.bz2"
+
+HOMEPAGE="http://www.linux-mips.org/ http://www.kernel.org/ http://www.gentoo.org/"
+SLOT="0"
+PROVIDE="virtual/os-headers"
+KEYWORDS="-* ~mips"
+IUSE="cobalt ip30"
+
+
+# We reference patches from linux-headers, so copy from there
+LHN="linux-headers"			# Name
+LHV="${PV}"				# Version
+LHC="sys-kernel"			# Category
+LHP="${PORTDIR}/${LHC}/${LHN}/files"	# Path
+
+
+UNIPATCH_LIST="
+	${WORKDIR}/mipscvs-${OKV}-${CVSDATE}.diff
+	${WORKDIR}/mips-patches/misc-2.6.10-ths-mips-tweaks.patch
+	${WORKDIR}/mips-patches/misc-2.6-mips-iomap-functions.patch
+	${FILESDIR}/${P}-ip27-build64.patch
+	${LHP}/${LHN}-2.6.0-sysctl_h-compat.patch
+	${LHP}/${LHN}-2.6.0-fb.patch
+	${LHP}/${LHN}-2.6.8.1-strict-ansi-fix.patch
+	${LHP}/${LHN}-${LHV}-appCompat.patch"
+
+# Cobalt support? (includes additonal headers)
+if use cobalt; then
+	UNIPATCH_LIST="${UNIPATCH_LIST} ${WORKDIR}/mips-patches/misc-2.6.9-cobalt-support.patch"
+fi
+
+# IP30 (Octane) support? (includes additonal headers)
+if use ip30; then
+	UNIPATCH_LIST="${UNIPATCH_LIST} ${WORKDIR}/mips-patches/misc-2.6.10-rc2-ip30-octane-support.patch"
+fi
+
+src_unpack() {
+	unpack ${A}
+	tc-arch-kernel
+	kernel-2_src_unpack
+
+#	# Fixes ... all the mv magic is to keep sed from dumping 
+#	# ugly warnings about how it can't work on a directory.
+#	cd ${S}/include
+#	mv asm-ia64/sn asm-ppc64/iSeries .
+#	headers___fix asm-ia64/*
+#	mv sn asm-ia64/
+#	headers___fix asm-ppc64/*
+#	mv iSeries asm-ppc64/
+#	headers___fix asm-ppc64/iSeries/*
+#	headers___fix linux/{ethtool,jiffies}.h
+}
+
+src_compile() {
+	# Set the right defconfig
+	K_DEFCONFIG=""
+	if use cobalt; then
+		K_DEFCONFIG="cobalt_defconfig"
+	else
+		# SGI Machine?
+		case "$(uname -i)" in
+			"SGI Indy"|"SGI Indigo2"|"SGI IP22")    K_DEFCONFIG="ip22_defconfig" ;;
+			"SGI Origin"|"SGI IP27")                K_DEFCONFIG="ip27_defconfig" ;;
+			"SGI Octane"|"SGI IP30")                K_DEFCONFIG="ip27_defconfig" ;;
+			"SGI O2"|"SGI IP32")                    K_DEFCONFIG="ip32_defconfig" ;;
+		esac
+	fi
+
+	# Compile
+	kernel-2_src_compile
+}