Fix compilation for linux-2.6.19, bug #156842

(Portage version: 2.1.2_rc2-r5)

3 files changed, 72 insertions, 1 deletions

diff --git a/net-fs/openafs-kernel/ChangeLog b/net-fs/openafs-kernel/ChangeLog
index d6b1caf27938..e92a737835c5 100644
--- a/net-fs/openafs-kernel/ChangeLog
+++ b/net-fs/openafs-kernel/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-fs/openafs-kernel
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/ChangeLog,v 1.45 2006/12/22 14:57:18 stefaan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/ChangeLog,v 1.46 2006/12/23 09:22:17 stefaan Exp $
+
+*openafs-kernel-1.4.2-r2 (23 Dec 2006)
+
+  23 Dec 2006; Stefaan De Roeck <stefaan@gentoo.org>
+  +openafs-kernel-1.4.2-r2.ebuild:
+  Fix compilation for linux-2.6.19, bug #156842
 
 *openafs-kernel-1.4.3_pre20061220 (22 Dec 2006)
 
diff --git a/net-fs/openafs-kernel/files/digest-openafs-kernel-1.4.2-r2 b/net-fs/openafs-kernel/files/digest-openafs-kernel-1.4.2-r2
new file mode 100644
index 000000000000..c79ae8607b82
--- /dev/null
+++ b/net-fs/openafs-kernel/files/digest-openafs-kernel-1.4.2-r2
@@ -0,0 +1,6 @@
+MD5 1fbf87303775036696ee0ce176d7160b openafs-1.4.2-src.tar.bz2 12437458
+RMD160 821a7064008d26050cdb1715bf04a19aac598578 openafs-1.4.2-src.tar.bz2 12437458
+SHA256 6a83b393a680c2dbbb186c1adc1acdcfb95f8e2db892ba6e66fe524c6d9b9814 openafs-1.4.2-src.tar.bz2 12437458
+MD5 6f298d8eb669b91b43b50ff8bd8dc5ef openafs-gentoo-0.9.tar.bz2 17015
+RMD160 07b90f9093677c6e043412c42dfa8096628fe6de openafs-gentoo-0.9.tar.bz2 17015
+SHA256 3f08b6f76b860efe522affccdfc393ea12b2255a3fe476d8d3f12b5f88233f26 openafs-gentoo-0.9.tar.bz2 17015
diff --git a/net-fs/openafs-kernel/openafs-kernel-1.4.2-r2.ebuild b/net-fs/openafs-kernel/openafs-kernel-1.4.2-r2.ebuild
new file mode 100644
index 000000000000..3bd0bb3c0927
--- /dev/null
+++ b/net-fs/openafs-kernel/openafs-kernel-1.4.2-r2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/openafs-kernel-1.4.2-r2.ebuild,v 1.1 2006/12/23 09:22:17 stefaan Exp $
+
+inherit eutils linux-mod versionator toolchain-funcs
+
+PATCHVER=0.9
+MY_PN=${PN/-kernel}
+MY_P=${MY_PN}-${PV}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="The OpenAFS distributed file system kernel module"
+HOMEPAGE="http://www.openafs.org/"
+SRC_URI="http://openafs.org/dl/${MY_PN}/${PV}/${MY_P}-src.tar.bz2
+	mirror://gentoo/${MY_PN}-gentoo-${PATCHVER}.tar.bz2"
+
+LICENSE="IPL-1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+PATCHDIR=${WORKDIR}/gentoo/patches/$(get_version_component_range 1-2)
+
+CONFIG_CHECK="!DEBUG_RODATA"
+DEBUG_RODATA_ERROR="OpenAFS is incompatible with linux' CONFIG_DEBUG_RODATA option"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}; cd ${S}
+
+	EPATCH_SUFFIX="patch" epatch ${PATCHDIR}
+
+	# fix unresolved symbol on amd64 (bug #149274)
+	epatch ${FILESDIR}/tasklist_lock.patch
+
+	# fix compilation for >=linux-2.6.19 (bug #156842)
+	sed -i "s@#include <linux/config.h>@#include <linux/version.h>\n#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)\n#include <linux/config.h>\n#endif@" $(find -name \*.h) $(find -name \*.c)
+
+	./regen.sh || die "Failed: regenerating configure script"
+}
+
+src_compile() {
+	ARCH="$(tc-arch-kernel)" econf --with-linux-kernel-headers=${KV_DIR} || die "Failed: econf"
+
+	ARCH="$(tc-arch-kernel)" emake -j1 only_libafs || die "Failed: emake"
+}
+
+src_install() {
+	MOD_SRCDIR=$(expr ${S}/src/libafs/MODLOAD-*)
+	[ -f ${MOD_SRCDIR}/openafs.${KV_OBJ} ] \
+			|| die "Couldn't find compiled kernel module"
+
+	MODULE_NAMES='openafs(fs/openafs:$MOD_SRCDIR)'
+
+	linux-mod_src_install
+}
+