PPC64 fixes, bug #61482.

5 files changed, 216 insertions, 25 deletions

diff --git a/sys-kernel/linux26-headers/ChangeLog b/sys-kernel/linux26-headers/ChangeLog
index 38aa23aeb210..c73985b0dc24 100644
--- a/sys-kernel/linux26-headers/ChangeLog
+++ b/sys-kernel/linux26-headers/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/linux26-headers
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux26-headers/ChangeLog,v 1.30 2004/09/25 18:12:36 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux26-headers/ChangeLog,v 1.31 2004/10/03 14:02:19 plasmaroo Exp $
+
+*linux26-headers-2.6.8.1-r1 (03 Oct 2004)
+
+  03 Oct 2004; <plasmaroo@gentoo.org> +linux26-headers-2.6.8.1-r1.ebuild,
+  files/linux26-headers-2.6.8.1-appCompat.patch:
+  PPC64 fixes, bug #61482.
 
   25 Sep 2004; <plasmaroo@gentoo.org>
   files/linux26-headers-2.6.8.1-appCompat.patch:
diff --git a/sys-kernel/linux26-headers/Manifest b/sys-kernel/linux26-headers/Manifest
index bb6b677652d9..aed87e0f3b80 100644
--- a/sys-kernel/linux26-headers/Manifest
+++ b/sys-kernel/linux26-headers/Manifest
@@ -1,33 +1,25 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 c42755de1dd8cc75f5fe89460483ce48 ChangeLog 7286
-MD5 7276a7c49e7a8536baef611cb99eeb07 linux26-headers-2.6.8.1.ebuild 3893
-MD5 e7df5c99f9a3767cb014d5664ac68f38 linux26-headers-2.6.6-r1.ebuild 4222
-MD5 21dcb669b4e8535f0a04f40ad2c4c9ff metadata.xml 224
+MD5 4bec806782ae1ddfb08be588d7e8e1c7 ChangeLog 7480
 MD5 cf6343e76c3e3fb5519e0690fed8a4e1 linux26-headers-2.6.7-r4.ebuild 4028
+MD5 21dcb669b4e8535f0a04f40ad2c4c9ff metadata.xml 224
 MD5 91179c84e3dc8dadcfdad16cabede343 linux26-headers-2.6.5.ebuild 4188
+MD5 e7df5c99f9a3767cb014d5664ac68f38 linux26-headers-2.6.6-r1.ebuild 4222
+MD5 7276a7c49e7a8536baef611cb99eeb07 linux26-headers-2.6.8.1.ebuild 3893
+MD5 5028a00cee6368ee2ee3ea814e17c20c linux26-headers-2.6.8.1-r1.ebuild 4257
 MD5 18bed04a1b45de515096089cc10913ec files/digest-linux26-headers-2.6.8.1 68
-MD5 a7101fa130023c7aa912f3cac793973b files/linux26-headers-2.6.8.1-appCompat.patch 49456
-MD5 0501d9fb994e3c9721b2a239e92e30c6 files/linux26-headers-2.6.8.1-strict-ansi-fix.patch 4086
-MD5 b737234adedfb6dc585af6bbb40bf2d3 files/digest-linux26-headers-2.6.6-r1 66
+MD5 598136365858338b26557b7587c6725f files/linux26-headers-2.6.3-strict-ansi-fix.patch 4166
 MD5 b3e4e51616a061327b46cbd31132c8c8 files/generate-asm-sparc 1654
-MD5 8a065c0dc3b8fac8747de35f1af75a2c files/linux26-headers-2.6.0-fb.patch 386
+MD5 b737234adedfb6dc585af6bbb40bf2d3 files/digest-linux26-headers-2.6.6-r1 66
 MD5 a73786f0b9dda7e9ebacb91a192384f9 files/linux26-headers-2.6.0-sysctl_h-compat.patch 352
-MD5 598136365858338b26557b7587c6725f files/linux26-headers-2.6.3-strict-ansi-fix.patch 4166
+MD5 0501d9fb994e3c9721b2a239e92e30c6 files/linux26-headers-2.6.8.1-strict-ansi-fix.patch 4086
+MD5 d78e0d94873de4518bca401d5688401c files/linux26-headers-2.6.7-prefetch.patch 528
+MD5 6dd79a655f006aebb7206203f3654976 files/linux26-headers-2.6.7-generic-arm-prepare.patch 978
 MD5 aa9ba92e8479bdb5f69b03b5c72be866 files/linux26-headers-2.6.4-unistd-nptl-fix.patch 362
+MD5 18bed04a1b45de515096089cc10913ec files/digest-linux26-headers-2.6.8.1-r1 68
+MD5 8a065c0dc3b8fac8747de35f1af75a2c files/linux26-headers-2.6.0-fb.patch 386
 MD5 8fbc202526e4c1b1672c5274bbff4e5f files/linux26-headers-2.6.6-appCompat.patch 26689
-MD5 830c6d1dcb1b22b9095e6f16f3ebdf85 files/linux26-headers-2.6.6-tcp_info-DRS-backport.patch 288
-MD5 7c487aa645f5d88e86c3252ab44ef5ae files/linux26-headers-2.6.7-appCompat.patch 42608
+MD5 ec3d195f7d40d599802d5c0c5ad8f502 files/linux26-headers-2.6.4-appCompat.patch 17240
+MD5 2417a15b89a123a4dbf2bc857406f6bb files/linux26-headers-2.6.8.1-appCompat.patch 51588
 MD5 b405a908c2cc1e6ed3e25f030c41f4c4 files/digest-linux26-headers-2.6.7-r4 66
-MD5 6dd79a655f006aebb7206203f3654976 files/linux26-headers-2.6.7-generic-arm-prepare.patch 978
-MD5 d78e0d94873de4518bca401d5688401c files/linux26-headers-2.6.7-prefetch.patch 528
+MD5 830c6d1dcb1b22b9095e6f16f3ebdf85 files/linux26-headers-2.6.6-tcp_info-DRS-backport.patch 288
 MD5 a8c4e44a323fbde21b9de3940e2ca5ef files/digest-linux26-headers-2.6.5 66
-MD5 ec3d195f7d40d599802d5c0c5ad8f502 files/linux26-headers-2.6.4-appCompat.patch 17240
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBWP62HTu7gpaalycRAj0iAKDfyujVvyaq5I/UwIN1/r7FYtRHqgCgqRT/
-mgk2tNq4inG1uMfkTcIuDy0=
-=dD5F
------END PGP SIGNATURE-----
+MD5 7c487aa645f5d88e86c3252ab44ef5ae files/linux26-headers-2.6.7-appCompat.patch 42608
diff --git a/sys-kernel/linux26-headers/files/digest-linux26-headers-2.6.8.1-r1 b/sys-kernel/linux26-headers/files/digest-linux26-headers-2.6.8.1-r1
new file mode 100644
index 000000000000..8935a7e1a19e
--- /dev/null
+++ b/sys-kernel/linux26-headers/files/digest-linux26-headers-2.6.8.1-r1
@@ -0,0 +1 @@
+MD5 9517ca999e822b898fbdc7e72796b1aa linux-2.6.8.1.tar.bz2 35628066
diff --git a/sys-kernel/linux26-headers/files/linux26-headers-2.6.8.1-appCompat.patch b/sys-kernel/linux26-headers/files/linux26-headers-2.6.8.1-appCompat.patch
index 15884e9454b1..4b768cf94c48 100644
--- a/sys-kernel/linux26-headers/files/linux26-headers-2.6.8.1-appCompat.patch
+++ b/sys-kernel/linux26-headers/files/linux26-headers-2.6.8.1-appCompat.patch
@@ -1583,3 +1583,53 @@ diff -ur linux-2.6.8.1/include/asm-ppc/unaligned.h linux-2.6.8.1-gentoo/include/
  
  #endif
 -#endif /* __KERNEL__ */
+diff -ur linux-2.6.8.1/include/asm-ppc64/processor.h linux-2.6.8.1-gentoo/include/asm-ppc64/processor.h
+--- linux-2.6.8.1/include/asm-ppc64/processor.h	2004-09-28 16:56:15.966475184 +0100
++++ linux-2.6.8.1-gentoo/include/asm-ppc64/processor.h	2004-09-28 16:54:55.359729000 +0100
+@@ -547,9 +547,9 @@
+ 	unsigned long	saved_softe;	/* Ditto for Soft Enable/Disable */
+ #ifdef CONFIG_ALTIVEC
+ 	/* Complete AltiVec register set */
+-	vector128	vr[32] __attribute((aligned(16)));
++	__vector128	vr[32] __attribute((aligned(16)));
+ 	/* AltiVec status */
+-	vector128	vscr __attribute((aligned(16)));
++	__vector128	vscr __attribute((aligned(16)));
+ 	unsigned long	vrsave;
+ 	int		used_vr;	/* set if process has used altivec */
+ #endif /* CONFIG_ALTIVEC */
+diff -ur linux-2.6.8.1/include/asm-ppc64/spinlock.h linux-2.6.8.1-gentoo/include/asm-ppc64/spinlock.h
+--- linux-2.6.8.1/include/asm-ppc64/spinlock.h	2004-09-28 16:56:15.948477920 +0100
++++ linux-2.6.8.1-gentoo/include/asm-ppc64/spinlock.h	2004-09-28 16:55:30.463392000 +0100
+@@ -20,9 +20,10 @@
+ 	volatile unsigned int lock;
+ } spinlock_t;
+ 
+-#ifdef __KERNEL__
+ #define SPIN_LOCK_UNLOCKED	(spinlock_t) { 0 }
+ 
++#ifdef __KERNEL__
++
+ #define spin_is_locked(x)	((x)->lock != 0)
+ #define spin_lock_init(x)	do { *(x) = SPIN_LOCK_UNLOCKED; } while(0)
+ 
+diff -ur linux-2.6.8.1/include/asm-ppc64/page.h linux-2.6.8.1-gentoo/include/asm-ppc64/page.h
+--- linux-2.6.8.1/include/asm-ppc64/page.h	2004-07-10 01:47:34.000000000 +0100
++++ linux-2.6.8.1-gentoo/include/asm-ppc64/page.h	2004-10-03 14:09:31.434460808 +0100
+@@ -90,6 +91,8 @@
+ /* to align the pointer to the (next) page boundary */
+ #define PAGE_ALIGN(addr)	_ALIGN(addr, PAGE_SIZE)
+ 
++typedef struct { unsigned long pte; } pte_t;
++
+ #ifdef __KERNEL__
+ #ifndef __ASSEMBLY__
+ #include <asm/naca.h>
+@@ -128,7 +131,6 @@
+  * These are used to make use of C type-checking.  
+  * Entries in the pte table are 64b, while entries in the pgd & pmd are 32b.
+  */
+-typedef struct { unsigned long pte; } pte_t;
+ typedef struct { unsigned int  pmd; } pmd_t;
+ typedef struct { unsigned int  pgd; } pgd_t;
+ typedef struct { unsigned long pgprot; } pgprot_t;
diff --git a/sys-kernel/linux26-headers/linux26-headers-2.6.8.1-r1.ebuild b/sys-kernel/linux26-headers/linux26-headers-2.6.8.1-r1.ebuild
new file mode 100644
index 000000000000..849269a721e7
--- /dev/null
+++ b/sys-kernel/linux26-headers/linux26-headers-2.6.8.1-r1.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux26-headers/linux26-headers-2.6.8.1-r1.ebuild,v 1.1 2004/10/03 14:02:19 plasmaroo Exp $
+
+ETYPE="headers"
+inherit kernel eutils
+
+OKV="${PV/_/-}"
+KV="${OKV}"
+S=${WORKDIR}/linux-${OKV}
+EXTRAVERSION=""
+
+# What's in this kernel?
+
+# INCLUDED:
+# 1) linux sources from kernel.org
+
+DESCRIPTION="Linux ${OKV} headers from kernel.org"
+SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${OKV}.tar.bz2"
+HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/"
+LICENSE="GPL-2"
+SLOT="0"
+PROVIDE="virtual/kernel virtual/os-headers"
+KEYWORDS="-* ~ppc64"
+IUSE=""
+
+DEPEND="!virtual/os-headers"
+
+headers___fix() {
+	sed -i	-e "s/\([ "$'\t'"]\)u8\([ "$'\t'"]\)/\1__u8\2/g;" \
+		-e "s/\([ "$'\t'"]\)u16\([ "$'\t'"]\)/\1__u16\2/g;" \
+		-e "s/\([ "$'\t'"]\)u32\([ "$'\t'"]\)/\1__u32\2/g;" \
+		-e "s/\([ "$'\t'"]\)u64\([ "$'\t'"]\)/\1__u64\2/g;" $@
+}
+
+pkg_setup() {
+	# Archs which have their own separate header packages, add a check here
+	# and redirect the user to them
+	case "${ARCH}" in
+		mips)
+			eerror "These headers are not appropriate for your architecture."
+			eerror "Please use sys-kernel/mips-headers instead."
+			die
+		;;
+	esac
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Do Stuff
+	kernel_universal_unpack
+
+	# 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 ${FILESDIR}/${PN}-2.6.7-generic-arm-prepare.patch
+	epatch ${FILESDIR}/${P}-strict-ansi-fix.patch
+	epatch ${FILESDIR}/${P}-appCompat.patch
+
+	# Fixes
+	case "${ARCH}" in
+		*)
+			headers___fix ${S}/include/asm-ppc64/*
+			headers___fix ${S}/include/asm-ppc64/iSeries/*
+		;;
+	esac
+}
+
+src_compile() {
+	# autoconf.h isnt generated unless it already exists. plus, we have
+	# no gurentee that any headers are installed on the system...
+	[ -f ${ROOT}/usr/include/linux/autoconf.h ] || \
+		touch ${S}/include/linux/autoconf.h
+	# if there arent any installed headers, then there also isnt an asm
+	# symlink in /usr/include/, and make defconfig will fail.
+	set_arch_to_kernel
+	ln -sf ${S}/include/asm-${ARCH} ${S}/include/asm
+	make defconfig HOSTCFLAGS="-Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -I${S}/include/" || die "defconfig failed"
+	make prepare HOSTCFLAGS="-Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -I${S}/include/" || die "prepare failed"
+	set_arch_to_portage
+}
+
+src_install() {
+	# Do normal src_install stuff
+	kernel_src_install
+
+	# If this is sparc, then we need to place asm_offsets.h in the proper location(s)
+	if [ "${PROFILE_ARCH}" = "sparc64" ]; then
+
+		# We don't need /usr/include/asm, generate-asm-sparc will take care of this
+		rm -Rf ${D}/usr/include/asm
+
+		# We do need empty directories, though...
+		dodir /usr/include/asm
+		dodir /usr/include/asm-sparc
+		dodir /usr/include/asm-sparc64
+
+		# Copy asm-sparc and asm-sparc64
+		cp -ax ${S}/include/asm-sparc/* ${D}/usr/include/asm-sparc
+		cp -ax ${S}/include/asm-sparc64/* ${D}/usr/include/asm-sparc64
+
+		# Check if generate-asm-sparc exists
+		if [ -a "${FILESDIR}/generate-asm-sparc" ]; then
+
+			# Copy generate-asm-sparc into the sandox
+			cp ${FILESDIR}/generate-asm-sparc ${WORKDIR}/generate-asm-sparc
+
+			# Just in case generate-asm-sparc isn't executable, make it so
+			if [ ! -x "${WORKDIR}/generate-asm-sparc" ]; then
+				chmod +x ${WORKDIR}/generate-asm-sparc
+			fi
+
+			# Generate /usr/include/asm for sparc systems
+			${WORKDIR}/generate-asm-sparc ${D}/usr/include
+		else
+			eerror "${FILESDIR}/generate-asm-sparc doesn't exist!"
+			die
+		fi
+	fi
+
+	# If this is 2.5 or 2.6 headers, then we need asm-generic too
+	if [ "`KV_to_int ${OKV}`" -ge "`KV_to_int 2.6.0`" ]; then
+		dodir /usr/include/asm-generic
+		cp -ax ${S}/include/asm-generic/* ${D}/usr/include/asm-generic
+	fi
+}
+
+pkg_preinst() {
+	kernel_pkg_preinst
+}
+
+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."
+}