Added ebuild for 2.6.8.1 headers that includes some statfs fixes needed for n32 testing.

4 files changed, 163 insertions, 2 deletions

diff --git a/sys-kernel/mips-headers/ChangeLog b/sys-kernel/mips-headers/ChangeLog
index fb356e6ce400..bf190fc68bae 100644
--- a/sys-kernel/mips-headers/ChangeLog
+++ b/sys-kernel/mips-headers/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/mips-headers
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-headers/ChangeLog,v 1.21 2004/08/30 22:59:20 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-headers/ChangeLog,v 1.22 2004/10/01 23:12:31 kumba Exp $
+
+*mips-headers-2.6.8.1 (01 Oct 2004)
+
+  01 Oct 2004; Joshua Kinard <kumba@gentoo.org> +mips-headers-2.6.8.1.ebuild:
+  Added ebuild for 2.6.8.1 headers that includes some statfs fixes needed for
+  n32 testing.
 
 *mips-headers-2.6.6-r1 (30 Aug 2004)
 
diff --git a/sys-kernel/mips-headers/Manifest b/sys-kernel/mips-headers/Manifest
index cb9581235454..4208c56c64ab 100644
--- a/sys-kernel/mips-headers/Manifest
+++ b/sys-kernel/mips-headers/Manifest
@@ -1,4 +1,4 @@
-MD5 f3507b3f8fa7efcf6b7cbefb35b79cd3 ChangeLog 4882
+MD5 8f469384523c9b1c9dc9c9035b71d19e ChangeLog 5091
 MD5 a79e966514d7aa3b003e25a207766f97 metadata.xml 417
 MD5 bf75617f93eb72af2eadd739b7081093 mips-headers-2.4.21-r1.ebuild 1358
 MD5 10102cf5e4f84e50e4ee08f691607937 mips-headers-2.4.21-r2.ebuild 1260
@@ -7,6 +7,7 @@ MD5 9cab0c6fa541f55bca68b82dc516b1c1 mips-headers-2.4.22-r1.ebuild 1915
 MD5 155e3f184046841bd9d49c9986ec52c1 mips-headers-2.4.23.ebuild 1717
 MD5 cbe74c305e6226ff772c4d92cba7046a mips-headers-2.4.25.ebuild 1717
 MD5 c2c93c8e48a0000556f7199c02f47578 mips-headers-2.6.6-r1.ebuild 3674
+MD5 a87bb28ce3e1873fd9679322724a651b mips-headers-2.6.8.1.ebuild 4912
 MD5 e300a3e148a7dcc38a0e099494fb6cb3 files/bigendian-byteorder-fix.patch 1557
 MD5 747353be86040c7e4c49b553f3467b7c files/digest-mips-headers-2.4.21-r1 160
 MD5 76b0e72e1a0025451c3fcf8d00faaf0a files/digest-mips-headers-2.4.21-r2 145
@@ -22,3 +23,4 @@ MD5 cb8280b584baf48a15e342e96099eeb9 files/mips-headers-2.6.6-appCompat.patch 26
 MD5 a9f74b71da391afa8399922824c8fc72 files/mips-headers-2.6.6-spaces_h-kernel.patch 498
 MD5 054c3c8e9c8804a13c79d01ec52793ed files/mips-patches-gcc-makefile-fix.patch 915
 MD5 3ec0bd6b14384ef98b64cb997030f3cc files/mipscvs-2.4.22-20030825-makefile-fix.patch 1344
+MD5 d3f8009328eba4f676b5c2bfe66fba4b files/digest-mips-headers-2.6.8.1 304
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
new file mode 100644
index 000000000000..d64eefa7fe76
--- /dev/null
+++ b/sys-kernel/mips-headers/files/digest-mips-headers-2.6.8.1
@@ -0,0 +1,4 @@
+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 62fa5bbee1bcb8b93e41a73abede8132 cobalt-patches-26xx-1.4.tar.bz2 7596
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
new file mode 100644
index 000000000000..f82cf1439c1f
--- /dev/null
+++ b/sys-kernel/mips-headers/mips-headers-2.6.8.1.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2004 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.1 2004/10/01 23:12:31 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.4"			# 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."
+}