Backporting the 2.6.7 TCP header change upstream so that iproute2 compiles fine on amd64.

4 files changed, 168 insertions, 1 deletions

diff --git a/sys-kernel/linux-headers/ChangeLog b/sys-kernel/linux-headers/ChangeLog
index e77f8421ebd3..2ee6458c5910 100644
--- a/sys-kernel/linux-headers/ChangeLog
+++ b/sys-kernel/linux-headers/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-kernel/linux-headers
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.77 2004/06/19 22:48:09 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.78 2004/06/22 17:36:41 plasmaroo Exp $
+
+*linux-headers-2.6.6-r1 (22 Jun 2004)
+
+  22 Jun 2004; <plasmaroo@gentoo.org> +linux-headers-2.6.6-r1.ebuild,
+  +files/linux-headers-2.6.6-tcp_info-DRS-backport.patch:
+  Backporting the 2.6.7 TCP header change upstream so that iproute2 compiles
+  fine on amd64.
 
 *linux-headers-2.6.7 (19 Jun 2004)
 
diff --git a/sys-kernel/linux-headers/files/digest-linux-headers-2.6.6-r1 b/sys-kernel/linux-headers/files/digest-linux-headers-2.6.6-r1
new file mode 100644
index 000000000000..fe3698be5a62
--- /dev/null
+++ b/sys-kernel/linux-headers/files/digest-linux-headers-2.6.6-r1
@@ -0,0 +1 @@
+MD5 5218790bc3db41e77a7422969639a9ad linux-2.6.6.tar.bz2 34896138
diff --git a/sys-kernel/linux-headers/files/linux-headers-2.6.6-tcp_info-DRS-backport.patch b/sys-kernel/linux-headers/files/linux-headers-2.6.6-tcp_info-DRS-backport.patch
new file mode 100644
index 000000000000..de250198d11c
--- /dev/null
+++ b/sys-kernel/linux-headers/files/linux-headers-2.6.6-tcp_info-DRS-backport.patch
@@ -0,0 +1,12 @@
+--- linux-2.6.6/include/linux/tcp.h	2004-06-22 10:14:17 -07:00
++++ linux-2.6.7/include/linux/tcp.h	2004-06-22 10:14:17 -07:00
+@@ -183,6 +183,9 @@
+ 	__u32	tcpi_snd_cwnd;
+ 	__u32	tcpi_advmss;
+ 	__u32	tcpi_reordering;
++
++	__u32	tcpi_rcv_rtt;
++	__u32	tcpi_rcv_space;
+ };
+ 
+ #ifdef __KERNEL__
diff --git a/sys-kernel/linux-headers/linux-headers-2.6.6-r1.ebuild b/sys-kernel/linux-headers/linux-headers-2.6.6-r1.ebuild
new file mode 100644
index 000000000000..69e902f643d7
--- /dev/null
+++ b/sys-kernel/linux-headers/linux-headers-2.6.6-r1.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2004 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.6.6-r1.ebuild,v 1.1 2004/06/22 17:36:41 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="-* arm amd64"
+
+pkg_setup() {
+	# Figure out what architecture we are, and set ARCH appropriately
+	ARCH="$(uname -m)"
+	ARCH="$(echo ${ARCH} | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/)"
+	[ "$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
+	case "${ARCH}" in
+		mips|mips64)
+			eerror "These headers are not appropriate for your architecture."
+			eerror "Please use sys-kernel/${ARCH/64/}-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.6-appCompat.patch
+	epatch ${FILESDIR}/linux-headers-2.6.3-strict-ansi-fix.patch
+	epatch ${FILESDIR}/linux-headers-2.6.0-sysctl_h-compat.patch
+	epatch ${FILESDIR}/linux-headers-2.6.0-fb.patch
+
+	# Needed to compile NPTL on amd64
+	use amd64 && (cd ${S}/include/asm-x86_64/
+	epatch ${FILESDIR}/linux-headers-2.6.4-unistd-nptl-fix.patch)
+
+	# 2.6.7 structure change backport to get iproute2 to compile on
+	# 2.6.6 headers
+
+	epatch ${FILESDIR}/${P}-tcp_info-DRS-backport.patch
+}
+
+src_compile() {
+
+	# Compile the default configuration
+	MY_ARCH=${ARCH}
+	unset ${ARCH}
+	make defconfig
+	ARCH=${MY_ARCH}
+
+	# If this is sparc, then generate asm_offsets.h
+	if [ -n "`use sparc`" ]; then
+		make ARCH=${ARCH} dep || die "Failed to run 'make dep'"
+	fi
+
+}
+
+src_install() {
+	# XXX Bug in Kernel.eclass requires this fix for now.
+	# XXX Remove when kernel.eclass is fixed.
+	# XXX 2.4 kernels symlink 'asm' to 'asm-${ARCH}' in include/
+	# XXX 2.6 kernels don't, however.  So we fix this here so kernel.eclass can find the include/asm folder
+	if [ "`KV_to_int ${OKV}`" -ge "`KV_to_int 2.6.0`" ]; then
+		ln -sf ${S}/include/asm-${ARCH} ${S}/include/asm
+	fi
+
+	# 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."
+}