Removed all prior 2.6.x headers inplace of 2.6.11, which has so far, worked great for o32. n32 testing is still needed. Included also is a mips appCompat patch to help things work in o32-land. Lastly, include experimental, 'sekret' patch for preliminary mips nptl testing.

Package-Manager: portage-2.0.51.19

8 files changed, 46 insertions, 211 deletions

diff --git a/sys-kernel/mips-headers/ChangeLog b/sys-kernel/mips-headers/ChangeLog
index 905b55ee0d53..951656fe9a91 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.27 2005/02/27 05:55:41 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-headers/ChangeLog,v 1.28 2005/03/24 19:59:32 kumba Exp $
+
+*mips-headers-2.6.11 (24 Mar 2005)
+
+  24 Mar 2005; Joshua Kinard <kumba@gentoo.org>
+  -files/mips-headers-2.6.10-ip27-build64.patch, -mips-headers-2.6.10.ebuild,
+  +mips-headers-2.6.11.ebuild, -mips-headers-2.6.8.1.ebuild:
+  Removed all prior 2.6.x headers inplace of 2.6.11, which has so far, worked
+  great for o32. n32 testing is still needed. Included also is a mips appCompat
+  patch to help things work in o32-land. Lastly, include experimental, 'sekret'
+  patch for preliminary mips nptl testing.
 
 *mips-headers-2.6.10 (27 Feb 2005)
 
diff --git a/sys-kernel/mips-headers/Manifest b/sys-kernel/mips-headers/Manifest
index e9dc6de77b64..da5b06df385e 100644
--- a/sys-kernel/mips-headers/Manifest
+++ b/sys-kernel/mips-headers/Manifest
@@ -1,17 +1,14 @@
-MD5 54596bbee3edab6a35056c973567ee42 ChangeLog 6702
+MD5 08017b88563d5827436ee0ee1003c606 ChangeLog 7207
 MD5 a79e966514d7aa3b003e25a207766f97 metadata.xml 417
-MD5 56fafd7a2ad82297cc1b0ae44cca6d90 mips-headers-2.6.10.ebuild 2960
 MD5 31d4cfc5f4d27ee9e57665016aef3a40 mips-headers-2.4.21-r3.ebuild 1440
 MD5 4be1b356299c51ee7ba3ae024609801e mips-headers-2.4.22-r1.ebuild 1894
 MD5 05ea1e7e3e24ba4e08a79ff51acece85 mips-headers-2.4.23.ebuild 1711
 MD5 9f593352ff44c7b8813da4c0682e556f mips-headers-2.4.28-r1.ebuild 1723
-MD5 dec78ca9379b77caee02a76fd10299e0 mips-headers-2.6.8.1.ebuild 4912
+MD5 f8c3806ff3f4460e0e7c13f41026e8ec mips-headers-2.6.11.ebuild 2632
 MD5 e300a3e148a7dcc38a0e099494fb6cb3 files/bigendian-byteorder-fix.patch 1557
-MD5 8f5959efd5bf8e2a54ccaf533cec3daf files/digest-mips-headers-2.4.28-r1 144
 MD5 76b0e72e1a0025451c3fcf8d00faaf0a files/digest-mips-headers-2.4.21-r3 145
 MD5 98354eb02ecc6b8d0463a68eba698a85 files/digest-mips-headers-2.4.22-r1 144
-MD5 ca897b2df888cab8164711f59903b66a files/digest-mips-headers-2.6.10 161
-MD5 3ec0bd6b14384ef98b64cb997030f3cc files/mipscvs-2.4.22-20030825-makefile-fix.patch 1344
 MD5 b7b1f3cc3d41e54d5a23057bc0c83fb5 files/digest-mips-headers-2.4.23 144
-MD5 c233f4098da182e277b2a33ff25d2e38 files/mips-headers-2.6.10-ip27-build64.patch 358
-MD5 6b509f4a052aeb7f0d2f5e13aab68896 files/digest-mips-headers-2.6.8.1 304
+MD5 8f5959efd5bf8e2a54ccaf533cec3daf files/digest-mips-headers-2.4.28-r1 144
+MD5 ee67312a219644fa67ea3e5fe5764ba1 files/digest-mips-headers-2.6.11 305
+MD5 3ec0bd6b14384ef98b64cb997030f3cc files/mipscvs-2.4.22-20030825-makefile-fix.patch 1344
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
deleted file mode 100644
index 0af5ab6a41b9..000000000000
--- a/sys-kernel/mips-headers/files/digest-mips-headers-2.6.10
+++ /dev/null
@@ -1,2 +0,0 @@
-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/digest-mips-headers-2.6.11 b/sys-kernel/mips-headers/files/digest-mips-headers-2.6.11
new file mode 100644
index 000000000000..26f589e6b8b1
--- /dev/null
+++ b/sys-kernel/mips-headers/files/digest-mips-headers-2.6.11
@@ -0,0 +1,4 @@
+MD5 f00fd1b5a80f52baf9d1d83acddfa325 linux-2.6.11.tar.bz2 37075679
+MD5 94e050afee64503745e0c4cf19a61d33 mipscvs-2.6.11-20050314.diff.bz2 269703
+MD5 cbba6ee3f2a72bc7bd4d13044b96506e mips-sources-generic_patches-1.7.tar.bz2 113764
+MD5 9fd3e94eaa3f2083f158ee30b9daaddc mips-headers-patches-1.0.tar.bz2 19463
diff --git a/sys-kernel/mips-headers/files/digest-mips-headers-2.6.8.1 b/sys-kernel/mips-headers/files/digest-mips-headers-2.6.8.1
deleted file mode 100644
index 0106c70f41d8..000000000000
--- a/sys-kernel/mips-headers/files/digest-mips-headers-2.6.8.1
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 9517ca999e822b898fbdc7e72796b1aa linux-2.6.8.1.tar.bz2 35628066
-MD5 9a61fd7455debc01d0c450bb1af10fc7 mipscvs-2.6.8.1-20040822.diff.bz2 486866
-MD5 f271e0617626229c9235149d42c26712 mips-sources-generic_patches-1.0.tar.bz2 32520
-MD5 65881d9d5fd8a16a1efcf54944fa8c27 cobalt-patches-26xx-1.7.tar.bz2 7441
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
deleted file mode 100644
index cf6db44be684..000000000000
--- a/sys-kernel/mips-headers/files/mips-headers-2.6.10-ip27-build64.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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.6.10.ebuild b/sys-kernel/mips-headers/mips-headers-2.6.11.ebuild
index 66b4329b042d..02a7c739c23d 100644
--- a/sys-kernel/mips-headers/mips-headers-2.6.10.ebuild
+++ b/sys-kernel/mips-headers/mips-headers-2.6.11.ebuild
@@ -1,17 +1,19 @@
 # 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.2 2005/03/19 20:38:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-headers/mips-headers-2.6.11.ebuild,v 1.1 2005/03/24 19:59:32 kumba Exp $
 
 # Eclass bits
 ETYPE="headers"
 H_SUPPORTEDARCH="mips"
+UNIPATCH_STRICTORDER="1"
 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
+CVSDATE="20050314"                      # Date of diff between kernel.org and lmo CVS
+GENPATCHVER="1.7"                       # Tarball version for generic patches
+HEAPATCHVER="1.0"
 EXTRAVERSION="-mipscvs-${CVSDATE}"
 
 # INCLUDED:
@@ -21,58 +23,46 @@ EXTRAVERSION="-mipscvs-${CVSDATE}"
 
 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"
+SRC_URI="${KERNEL_URI}
+	mirror://gentoo/mipscvs-${OKV}-${CVSDATE}.diff.bz2
+	mirror://gentoo/mips-sources-generic_patches-${GENPATCHVER}.tar.bz2
+	mirror://gentoo/mips-headers-patches-${HEAPATCHVER}.tar.bz2"
 
 HOMEPAGE="http://www.linux-mips.org/ http://www.kernel.org/ http://www.gentoo.org/"
 SLOT="0"
-[[ ${CTARGET} == ${CHOST} ]] && PROVIDE="virtual/os-headers"
+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
+IUSE="ip30 nptl"
 
 
 UNIPATCH_LIST="
 	${WORKDIR}/mipscvs-${OKV}-${CVSDATE}.diff
-	${WORKDIR}/mips-patches/misc-2.6.10-ths-mips-tweaks.patch
+	${WORKDIR}/mips-patches/misc-${PV}-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"
+	${WORKDIR}/mips-patches-h/${P}-ip27-build64.patch
+	${WORKDIR}/mips-patches-h/linux-headers-2.6.0-sysctl_h-compat.patch
+	${WORKDIR}/mips-patches-h/linux-headers-2.6.0-fb.patch
+	${WORKDIR}/mips-patches-h/linux-headers-2.6.8.1-strict-ansi-fix.patch
+	${WORKDIR}/mips-patches-h/linux-headers-${PV}-appCompat.patch
+	${WORKDIR}/mips-patches-h/${P}-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"
+	UNIPATCH_LIST="${UNIPATCH_LIST} ${WORKDIR}/mips-patches/misc-2.6.11-rc4-ip30-octane-support.patch"
+fi
+
+
+# Insanity?
+if use nptl; then
+	UNIPATCH_LIST="${UNIPATCH_LIST} ${WORKDIR}/mips-patches/misc-2.6.12-nptl-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() {
diff --git a/sys-kernel/mips-headers/mips-headers-2.6.8.1.ebuild b/sys-kernel/mips-headers/mips-headers-2.6.8.1.ebuild
deleted file mode 100644
index 9dbdc75a173c..000000000000
--- a/sys-kernel/mips-headers/mips-headers-2.6.8.1.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# 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.8.1.ebuild,v 1.4 2005/02/06 04:48:42 kumba Exp $
-
-
-# Eclass stuff
-ETYPE="headers"
-inherit kernel eutils
-
-# Version Data
-OKV=${PV/_/-}
-CVSDATE="20040822"			# Date of diff between kernel.org and lmo CVS
-COBALTPATCHVER="1.7"			# Tarball version for cobalt patches
-GENPATCHVER="1.0"			# Tarball version for generic patches
-EXTRAVERSION=-mipscvs-${CVSDATE}
-KV="${OKV}${EXTRAVERSION}"
-
-# Miscellaneous stuff
-S=${WORKDIR}/linux-${KV}
-
-# What's in this kernel?
-
-# INCLUDED:
-# 1) linux sources from kernel.org
-# 2) linux-mips.org CVS snapshot diff from 04 Jun 2004
-# 3) Cobalt Patches
-# 4) Generic mips patches
-
-DESCRIPTION="Linux Headers from Linux-Mips CVS, dated ${CVSDATE}"
-SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${OKV}.tar.bz2
-		mirror://gentoo/mipscvs-${OKV}-${CVSDATE}.diff.bz2
-		mirror://gentoo/mips-sources-generic_patches-${GENPATCHVER}.tar.bz2
-		cobalt? ( mirror://gentoo/cobalt-patches-26xx-${COBALTPATCHVER}.tar.bz2 )"
-
-HOMEPAGE="http://www.linux-mips.org/"
-LICENSE="GPL-2"
-SLOT="0"
-PROVIDE="virtual/os-headers"
-KEYWORDS="-* ~mips"
-IUSE="cobalt"
-
-src_unpack() {
-	unpack ${A}
-	mv ${WORKDIR}/linux-${OKV} ${S}
-	cd ${S}
-
-	# We need these patches from linux26-headers, and they're pretty big, so avoid re-adding them to the tree
-	cp ${PORTDIR}/sys-kernel/linux26-headers/files/linux26-headers-2.6.8.1-appCompat.patch ${WORKDIR}
-	cp ${PORTDIR}/sys-kernel/linux26-headers/files/linux26-headers-2.6.8.1-strict-ansi-fix.patch ${WORKDIR}
-
-	# Update the vanilla sources with linux-mips CVS changes
-	epatch ${WORKDIR}/mipscvs-${OKV}-${CVSDATE}.diff
-
-	# 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
-	fi
-
-	# User-space patches for various things
-	epatch ${FILESDIR}/${PN}-2.6.0-sysctl_h-compat.patch
-	epatch ${FILESDIR}/${PN}-2.6.0-fb.patch
-	epatch ${WORKDIR}/linux26-headers-2.6.8.1-appCompat.patch
-	epatch ${WORKDIR}/linux26-headers-2.6.8.1-strict-ansi-fix.patch
-
-	# Generic patches we always include
-	echo -e ""
-	einfo ">>> Generic Patches"
-		# IP22 patches
-		epatch ${WORKDIR}/mips-patches/mipscvs-2.6.8-ip22-fixes-backport.patch
-		epatch ${WORKDIR}/mips-patches/mipscvs-2.6.8-ip22-newport-fixes-backport.patch
-
-		# IP32 Patches
-		epatch ${WORKDIR}/mips-patches/mipscvs-2.6.8-ip32-64b_only-backport.patch
-		epatch ${WORKDIR}/mips-patches/mipscvs-2.6.9-ip32-iluxa_minpatchset_bits.patch
-		epatch ${WORKDIR}/mips-patches/mipscvs-2.6.7-maceisa_rtc_irq-fix.patch
-
-		# Generic
-		epatch ${WORKDIR}/mips-patches/mipscvs-2.6.8-better_mbind-backport.patch
-		epatch ${WORKDIR}/mips-patches/mipscvs-2.6.8-elim-sys_narg_table-backport.patch
-		epatch ${WORKDIR}/mips-patches/mipscvs-2.6.8-statfs-fixes-backport.patch
-	eend
-
-	# Do Stuff
-	kernel_universal_unpack
-}
-
-src_compile() {
-	local my_defconfig hcflags
-
-	# Avoid issues w/ ARCH
-	set_arch_to_kernel
-
-	# Imported from linux26-headers
-	# autoconf.h isnt generated unless it already exists. plus, we have no guarentee that 
-	# any headers are installed on the system...
-	[ -f ${ROOT}/usr/include/linux/autoconf.h ] || touch ${S}/include/linux/autoconf.h
-
-	# CFLAGS for the kernel defconfig
-	hcflags="-Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -I${S}/include/"
-
-	# Set the right defconfig
-	if use cobalt; then
-		my_defconfig="cobalt_defconfig"
-	else
-		# SGI Machine?
-		case "$(uname -i)" in
-			"SGI Indy"|"SGI Indigo2"|"SGI IP22")	my_defconfig="ip22_defconfig" ;;
-			"SGI Origin"|"SGI IP27")		my_defconfig="ip27_defconfig" ;;
-			"SGI Octane"|"SGI IP30")		my_defconfig="ip27_defconfig" ;;
-			"SGI O2"|"SGI IP32")			my_defconfig="ip32_defconfig" ;;
-		esac
-	fi
-
-	# Run defconfig
-	make ${my_defconfig} HOSTCFLAGS="${hcflags}" CC="${CC}" CROSS_COMPILE= CHOST="${CHOST}"
-
-	# "Prepare" certain files
-	make prepare HOSTCFLAGS="${hcflags}" CC="${CC}" CROSS_COMPILE= CHOST="${CHOST}"
-
-	# Back to normal
-	set_arch_to_portage
-}
-
-src_install() {
-	# 2.4 kernels symlink 'asm' to 'asm-${ARCH}' in include/
-	# 2.6 kernels don't, however.  So we fix this here so kernel.eclass can find the include/asm folder
-	ln -sf ${S}/include/asm-${ARCH} ${S}/include/asm
-
-	# Do normal src_install stuff
-	kernel_src_install
-
-	# If this is 2.5 or 2.6 headers, then we need asm-generic too
-	dodir /usr/include/asm-generic
-	cp -ax ${S}/include/asm-generic/* ${D}/usr/include/asm-generic
-}
-
-pkg_postinst() {
-	kernel_pkg_postinst
-
-	einfo "Kernel headers are usually only used when recompiling glibc, as such, following the installation"
-	einfo "of newer headers, it is advised that you re-merge glibc as follows:"
-	einfo "emerge glibc"
-	einfo "Failure to do so will cause glibc to not make use of newer features present in the updated kernel"
-	einfo "headers."
-}