Typo fixes in 2.4.21 headers; new ebuild for 2.4.22 headers; see Changelog for details

5 files changed, 142 insertions, 11 deletions

diff --git a/sys-kernel/linux-headers/ChangeLog b/sys-kernel/linux-headers/ChangeLog
index d39116e16d0e..9b6ba245c13b 100644
--- a/sys-kernel/linux-headers/ChangeLog
+++ b/sys-kernel/linux-headers/ChangeLog
@@ -1,12 +1,24 @@
 # ChangeLog for sys-kernel/linux-headers
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.20 2003/09/18 01:09:51 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.21 2003/09/21 05:18:54 kumba Exp $
 
-  17 Sep 2003; Jon Portnoy <avenj@gentoo.org> linux-headers-2.4.21.ebuild :
-  ia64 keywords.
+
+*linux-headers-2.4.22 (21 Sep 2003)
+
+  21 Sep 2003; Joshua Kinard <kumba@gentoo.org> linux-headers-2.4.22.ebuild:
+  Created ebuild for linux-headers-2.4.22; set KEYWORDS to "-*" to mask it 
+  until it is needed. Please note that at this time, net-misc/iputils will 
+  fail to compile if built against 2.4.22 headers.
 
 *linux-headers-2.4.21 (21 Jun 2003)
 
+  21 Sep 2003; Joshua Kinard <kumba@gentoo.org> linux-headers-2.4.21.ebuild:
+  Typo fixes in linux-headers-2.4.21, added blank EXTRAVERSION to prevent
+  kernel.eclass from appending "-linux-r0" to the version string.
+
+  17 Sep 2003; Jon Portnoy <avenj@gentoo.org> linux-headers-2.4.21.ebuild:
+  ia64 keywords.
+
   12 Sep 2003; Joshua Kinard <kumba@gentoo.org> linux-headers-2.4.21.ebuild,
   files/bigendian-byteorder-fix.patch, files/generate-asm-sparc:
   Re-written linux-headers-2.4.21 ebuild; Utilizes kernel.eclass, and includes a
diff --git a/sys-kernel/linux-headers/Manifest b/sys-kernel/linux-headers/Manifest
index 00d60daf8925..1f91af55acc0 100644
--- a/sys-kernel/linux-headers/Manifest
+++ b/sys-kernel/linux-headers/Manifest
@@ -1,4 +1,4 @@
-MD5 8630ae6f633d273feb1ab58f34faba47 ChangeLog 3528
+MD5 a57b7cb9ed2185a0227c7527fd4046f7 ChangeLog 3528
 MD5 fecf80f99d53794fe22c299f8024ec76 linux-headers-2.2.20.ebuild 3937
 MD5 6c4d3a60bee13d7fa01d92ee94fe4a9e linux-headers-2.2.21_pre3.ebuild 4118
 MD5 dafe74dd740f440ecf4e9801cc88b74e linux-headers-2.4.16-r1.ebuild 5102
@@ -12,8 +12,8 @@ MD5 5d21e2e8e69747864329a465bc7c5be5 linux-headers-2.4.18-r2.ebuild 4568
 MD5 cb5101ea2408061e456453df9c06dedf linux-headers-2.4.18.ebuild 3189
 MD5 c802934f6240ddcbc1321e4b7935cdd9 linux-headers-2.4.19-r1.ebuild 4804
 MD5 45657102a76c0f97cc81fc91138d4fae linux-headers-2.4.19.ebuild 4638
-MD5 89bd328ff7b2ef7cb36c62017221f628 linux-headers-2.4.21.ebuild 3206
-MD5 4e2c05f6a4d6538d0248c0b340b6a85b linux-headers-2.4.22.ebuild 3193
+MD5 e696239bc6c56033e0fc80eb933c08ce linux-headers-2.4.21.ebuild 3206
+MD5 cd5bf0847d8f071ae389cf0059f25668 linux-headers-2.4.22.ebuild 3193
 MD5 07aeae7e5036a3ec3e06d29fd68e9cce files/digest-linux-headers-2.2.20 216
 MD5 167e790d7861e0ed3a31577b31a92968 files/digest-linux-headers-2.2.21_pre3 281
 MD5 ac116e74551067f3bd3a2a3c85ba0b0b files/digest-linux-headers-2.4.16 281
diff --git a/sys-kernel/linux-headers/files/digest-linux-headers-2.4.22 b/sys-kernel/linux-headers/files/digest-linux-headers-2.4.22
new file mode 100644
index 000000000000..e22508ef89f6
--- /dev/null
+++ b/sys-kernel/linux-headers/files/digest-linux-headers-2.4.22
@@ -0,0 +1 @@
+MD5 75dc85149b06ac9432106b8941eb9f7b linux-2.4.22.tar.bz2 29528612
diff --git a/sys-kernel/linux-headers/linux-headers-2.4.21.ebuild b/sys-kernel/linux-headers/linux-headers-2.4.21.ebuild
index f96541febff2..16d7e684aecd 100644
--- a/sys-kernel/linux-headers/linux-headers-2.4.21.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-2.4.21.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.4.21.ebuild,v 1.6 2003/09/20 04:18:26 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.4.21.ebuild,v 1.7 2003/09/21 05:18:54 kumba Exp $
 
 
 ETYPE="headers"
 inherit kernel
 OKV=${PV/_/-}
 S=${WORKDIR}/linux-${OKV}
+EXTRAVERSION=""
 
 # What's in this kernel?
 
@@ -22,7 +23,7 @@ SLOT="${OKV}"
 KEYWORDS="-* amd64 ~sparc"
 
 
-# Figure out what architecture we are, and set KERNEL_ARCH appropriately
+# Figure out what architecture we are, and set ARCH appropriately
 ARCH="${ARCH:-`uname -m`}"
 ARCH=`echo $ARCH | sed -e s/[i].86/i386/ -e s/x86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/ -e s/amd64/x86_64/`
 [ "$ARCH" == "sparc" -a "$PROFILE_ARCH" == "sparc64" ] && ARCH=sparc64
@@ -43,7 +44,8 @@ src_unpack() {
 	cd ${S}
 
 	# Big Endian architectures need this patch in order to build certain programs properly
-	# Right now, this fix only affects sparc.  hppa and ppc will need to edit this later.
+	# Right now, this fix only affects sparc.  Other big-endian archs will need to edit this if they need it.
+	# Issue will be fixed in 2.4.23+ kernel series (issue has been fixed in 2.6.0).
 	# Closes Bug #26062
 	if [ -n "`use sparc`" ]; then
 		epatch ${FILESDIR}/bigendian-byteorder-fix.patch
@@ -58,7 +60,7 @@ src_compile() {
 	# Do normal src_compile stuff
 	kernel_src_compile
 
-	# If this is sparc, then geneate asm_offsets.h
+	# If this is sparc, then generate asm_offsets.h
 	if [ -n "`use sparc`" ]; then
 		make dep ARCH=sparc || die "Failed to run 'make dep'"
 	fi
@@ -83,7 +85,7 @@ src_install() {
 		cp -ax ${S}/include/asm-sparc/* ${D}/usr/include/asm-sparc
 
 		# If this is sparc64, then we need asm-sparc64 stuff too
-		if [ "$PROFILE_ARCH" = "sparc64" ]; then
+		if [ "${PROFILE_ARCH}" = "sparc64" ]; then
 			dodir /usr/include/asm-sparc64
 			cp -ax ${S}/include/asm-sparc64/* ${D}/usr/include/asm-sparc64
 		fi
diff --git a/sys-kernel/linux-headers/linux-headers-2.4.22.ebuild b/sys-kernel/linux-headers/linux-headers-2.4.22.ebuild
new file mode 100644
index 000000000000..a105705d50b0
--- /dev/null
+++ b/sys-kernel/linux-headers/linux-headers-2.4.22.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.4.22.ebuild,v 1.1 2003/09/21 05:18:54 kumba Exp $
+
+
+ETYPE="headers"
+inherit kernel
+OKV=${PV/_/-}
+S=${WORKDIR}/linux-${OKV}
+EXTRAVERSION=""
+
+# What's in this kernel?
+
+# INCLUDED:
+# 1) linux sources from kernel.org
+# 2) patch for big-endian machines to fix header issue (currently sparc only)
+
+DESCRIPTION="Linux ${OKV} headers from kernel.org"
+SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2"
+HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/"
+LICENSE="GPL-2"
+SLOT="${OKV}"
+KEYWORDS="-*"
+
+
+# Figure out what architecture we are, and set ARCH appropriately
+ARCH="${ARCH:-`uname -m`}"
+ARCH=`echo $ARCH | sed -e s/[i].86/i386/ -e s/x86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/ -e s/amd64/x86_64/`
+[ "$ARCH" == "sparc" -a "$PROFILE_ARCH" == "sparc64" ] && ARCH=sparc64
+
+
+# Archs which have their own separate header packages, add a check here
+# and redirect the user to them
+if [ "${ARCH}" = "mips" ] || [ "${ARCH}" = "mips64" ]; then
+	eerror "These headers are not appropriate for your architecture."
+	eerror "Please use sys-kernel/${ARCH/64/}-headers instead."
+	die
+fi
+
+
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Big Endian architectures need this patch in order to build certain programs properly
+	# Right now, this fix only affects sparc.  Other big-endian archs will need to edit this if they need it.
+	# Issue will be fixed in 2.4.23+ kernel series (issue has been fixed in 2.6.0).
+	# Closes Bug #26062
+	if [ -n "`use sparc`" ]; then
+		epatch ${FILESDIR}/bigendian-byteorder-fix.patch
+	fi
+
+	# Do Stuff
+	kernel_universal_unpack
+}
+
+src_compile() {
+
+	# Do normal src_compile stuff
+	kernel_src_compile
+
+	# If this is sparc, then generate asm_offsets.h
+	if [ -n "`use sparc`" ]; then
+		make dep ARCH=sparc || die "Failed to run 'make dep'"
+	fi
+}
+
+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 [ -n "`use sparc`" ]; 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
+
+		# Copy asm-sparc
+		cp -ax ${S}/include/asm-sparc/* ${D}/usr/include/asm-sparc
+
+		# If this is sparc64, then we need asm-sparc64 stuff too
+		if [ "${PROFILE_ARCH}" = "sparc64" ]; then
+			dodir /usr/include/asm-sparc64
+			cp -ax ${S}/include/asm-sparc64/* ${D}/usr/include/asm-sparc64
+		fi
+
+		# Check if generate-asm-sparc exists
+		if [ -a "${FILESDIR}/generate-asm-sparc" ]; then
+
+			# Just incase generate-asm-sparc isn't executable, make it so
+			if [ ! -x "${FILESDIR}/generate-asm-sparc" ]; then
+				chmod +x ${FILESDIR}/generate-asm-sparc
+			fi
+
+			# Generate /usr/include/asm for sparc systems
+			${FILESDIR}/generate-asm-sparc ${D}/usr/include
+		else
+			eerror "${FILESDIR}/generate-asm-sparc doesn't exist!"
+			die
+		fi
+	fi
+}
+
+pkg_preinst() {
+	kernel_pkg_preinst
+}
+
+pkg_postinst() {
+	kernel_pkg_postinst
+}