Fix for ppc64 (bug #191216)

Package-Manager: portage-2.1.3.9

5 files changed, 120 insertions, 15 deletions

diff --git a/net-fs/openafs-kernel/ChangeLog b/net-fs/openafs-kernel/ChangeLog
index ac2382db62bc..7c5ba1c1834f 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/ChangeLog,v 1.72 2007/09/13 20:09:49 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/ChangeLog,v 1.73 2007/09/19 16:31:18 stefaan Exp $
+
+*openafs-kernel-1.4.4_p20070724-r1 (19 Sep 2007)
+
+  19 Sep 2007; Stefaan De Roeck <stefaan@gentoo.org>
+  +files/openafs-ppc64.patch, +openafs-kernel-1.4.4_p20070724-r1.ebuild:
+  Fix for ppc64 (bug #191216)
 
   13 Sep 2007; Markus Meier <maekke@gentoo.org>
   openafs-kernel-1.4.4_p20070724.ebuild:
diff --git a/net-fs/openafs-kernel/Manifest b/net-fs/openafs-kernel/Manifest
index d7396462f053..10f4a2119144 100644
--- a/net-fs/openafs-kernel/Manifest
+++ b/net-fs/openafs-kernel/Manifest
@@ -1,6 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX openafs-ppc64.patch 1070 RMD160 d9ba745792a62d4dc5bdb63e4c5b7025ee97b3d8 SHA1 da72cd463d784707f3488697f2f3ce0f6d4e6b97 SHA256 259d0e883abb46f0f2098b385763815bd4bec5b86b11861f128ae2a6e074e109
+MD5 bcbb6768512967194645626b441b6027 files/openafs-ppc64.patch 1070
+RMD160 d9ba745792a62d4dc5bdb63e4c5b7025ee97b3d8 files/openafs-ppc64.patch 1070
+SHA256 259d0e883abb46f0f2098b385763815bd4bec5b86b11861f128ae2a6e074e109 files/openafs-ppc64.patch 1070
 AUX tasklist_lock.patch 1330 RMD160 349e0f140b52b76aec4b7ddec58ba1d27f22dd18 SHA1 f568adfbbfe0121dfa46f3a9cb18a4722a297403 SHA256 ed2300a9f9a5baefd4a84dc81e1a7c4e2e19f2c5f9aada73989a95285ed72a89
 MD5 cc82a85a267672eb495404a080ccbdae files/tasklist_lock.patch 1330
 RMD160 349e0f140b52b76aec4b7ddec58ba1d27f22dd18 files/tasklist_lock.patch 1330
@@ -46,6 +47,10 @@ EBUILD openafs-kernel-1.4.4.ebuild 1472 RMD160 0236076f0307b0e42680fea54a0221c03
 MD5 1df0299d1edaee1eeb99c258f9afd5d3 openafs-kernel-1.4.4.ebuild 1472
 RMD160 0236076f0307b0e42680fea54a0221c0334dbaba openafs-kernel-1.4.4.ebuild 1472
 SHA256 8f60320f06689e1decd5abc23c9cc9bae9ba80a3e4c47d7ff739d029cb7f21e7 openafs-kernel-1.4.4.ebuild 1472
+EBUILD openafs-kernel-1.4.4_p20070724-r1.ebuild 1744 RMD160 05ac3367342a910335d1b7c59b3bad164b655cfd SHA1 1d30b8d8507797342fca328e3fb48aabb1fd3140 SHA256 655b109d671fc8b8b980e35427338a78c87b8744fd15e0a7509be1c96a23ea3b
+MD5 2fa26d7a2d6468fba4c358077a4ed726 openafs-kernel-1.4.4_p20070724-r1.ebuild 1744
+RMD160 05ac3367342a910335d1b7c59b3bad164b655cfd openafs-kernel-1.4.4_p20070724-r1.ebuild 1744
+SHA256 655b109d671fc8b8b980e35427338a78c87b8744fd15e0a7509be1c96a23ea3b openafs-kernel-1.4.4_p20070724-r1.ebuild 1744
 EBUILD openafs-kernel-1.4.4_p20070724.ebuild 1707 RMD160 f7fe4401c8de9ebe2d9ca80a96aeea4bb0cbb4ed SHA1 ae9e7c0e2868c367090f2d33c74d1c5a60a59636 SHA256 60ccd6fbc3dd362d84d8ade588084ee49587e1e7e48666ee11c179c2df5ff334
 MD5 4ee51575f8bbfffeadecbb1976d7db5f openafs-kernel-1.4.4_p20070724.ebuild 1707
 RMD160 f7fe4401c8de9ebe2d9ca80a96aeea4bb0cbb4ed openafs-kernel-1.4.4_p20070724.ebuild 1707
@@ -54,10 +59,10 @@ EBUILD openafs-kernel-1.5.19.ebuild 1509 RMD160 c3d61d83dc4bedb5aaf737190754487c
 MD5 b93c39148bd46ee4e605225c1040b7af openafs-kernel-1.5.19.ebuild 1509
 RMD160 c3d61d83dc4bedb5aaf737190754487cea4543a0 openafs-kernel-1.5.19.ebuild 1509
 SHA256 d63496f8936d9c879d23e59f6965027cf6134dd9907ae4308f2218cce49e4414 openafs-kernel-1.5.19.ebuild 1509
-MISC ChangeLog 11399 RMD160 380be2e4c2d029796642d5dd0b92dcb838c3d82d SHA1 26890e3d58a6911a645deaaec430f288c5013ec2 SHA256 378bdb1fe6f0c9cde568c3008f81c74e086d3c79fe6f3456e95fdbb3114a91b1
-MD5 f96af141833bc2b73bd81794d19badec ChangeLog 11399
-RMD160 380be2e4c2d029796642d5dd0b92dcb838c3d82d ChangeLog 11399
-SHA256 378bdb1fe6f0c9cde568c3008f81c74e086d3c79fe6f3456e95fdbb3114a91b1 ChangeLog 11399
+MISC ChangeLog 11607 RMD160 63eb558de801ea2f758f768fb130dda29ec5e65a SHA1 0750aea679862ee5ecc3ad4c4ca84c5cc3a3a2a4 SHA256 948a8172562aeb9cfa598456f9b6f9756112cdd67812d96212f7269edfb4172c
+MD5 3c3cacc0be161b3cebea42c0044d7b79 ChangeLog 11607
+RMD160 63eb558de801ea2f758f768fb130dda29ec5e65a ChangeLog 11607
+SHA256 948a8172562aeb9cfa598456f9b6f9756112cdd67812d96212f7269edfb4172c ChangeLog 11607
 MISC metadata.xml 254 RMD160 1bef8b94265bf2b400fb6235b3e43b504b8d2b71 SHA1 a4ad632b650953fa9c9f203a9c55f58ddba37705 SHA256 90d7dcb6aede67bf64f610984a31fc03573512de9e241db42acb32601373db62
 MD5 833551f00cc2163ac7f9eb367ee9caa8 metadata.xml 254
 RMD160 1bef8b94265bf2b400fb6235b3e43b504b8d2b71 metadata.xml 254
@@ -83,13 +88,9 @@ SHA256 a78036f44416ec44d791c926891ab1d9ab7228da214b0bf18c5f71c01841548f files/di
 MD5 3edb542a9dcbb7d3d4b95280720a7ec3 files/digest-openafs-kernel-1.4.4_p20070724 804
 RMD160 68e2586985ad94ec05fd97b4a1602bf6c4585004 files/digest-openafs-kernel-1.4.4_p20070724 804
 SHA256 c5a0baf2fa53493434dffe9213ce93bb3b92b4af61250f28cf1f8c739d872d3d files/digest-openafs-kernel-1.4.4_p20070724 804
+MD5 3edb542a9dcbb7d3d4b95280720a7ec3 files/digest-openafs-kernel-1.4.4_p20070724-r1 804
+RMD160 68e2586985ad94ec05fd97b4a1602bf6c4585004 files/digest-openafs-kernel-1.4.4_p20070724-r1 804
+SHA256 c5a0baf2fa53493434dffe9213ce93bb3b92b4af61250f28cf1f8c739d872d3d files/digest-openafs-kernel-1.4.4_p20070724-r1 804
 MD5 9519d5974bb9b2d08dbdd5c7c468512d files/digest-openafs-kernel-1.5.19 524
 RMD160 763eba455d7f38850672791a3a3095d7cf5fe6b9 files/digest-openafs-kernel-1.5.19 524
 SHA256 20f00aba0b0cf036b60abe3a0302fcdeb21a23df1e4df48e30619e3049752040 files/digest-openafs-kernel-1.5.19 524
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFG6ZkpkKaRLQcq0GIRAmbbAJ4vMSmkrsGp3g7efw3atJo2dd4egwCcC4Ak
-3c3m5/UchCHRNw8kcOiTVOI=
-=ynKG
------END PGP SIGNATURE-----
diff --git a/net-fs/openafs-kernel/files/digest-openafs-kernel-1.4.4_p20070724-r1 b/net-fs/openafs-kernel/files/digest-openafs-kernel-1.4.4_p20070724-r1
new file mode 100644
index 000000000000..45171d220de7
--- /dev/null
+++ b/net-fs/openafs-kernel/files/digest-openafs-kernel-1.4.4_p20070724-r1
@@ -0,0 +1,9 @@
+MD5 09e5fd0d92579373687391b6f0579614 openafs-1.4.4-cvs20070724.patch.bz2 86943
+RMD160 26daf5867f89691ba2cf6f578a729cae8894c646 openafs-1.4.4-cvs20070724.patch.bz2 86943
+SHA256 2fffc29f58db15f46eb7b1695744f7982ccb836b84f7964308de893d4345b724 openafs-1.4.4-cvs20070724.patch.bz2 86943
+MD5 59cd499c6bf337b1f2215f83a7404794 openafs-1.4.4-src.tar.bz2 12500224
+RMD160 712907afc74ced010996dd43f785b341ac24da46 openafs-1.4.4-src.tar.bz2 12500224
+SHA256 a417c4d5eab6cf68c6082b6bd93d7ca70410635794308b731269b246ba80f7e4 openafs-1.4.4-src.tar.bz2 12500224
+MD5 9c7119b44628c1f0a7b251e096e94d16 openafs-gentoo-0.13.tar.bz2 16814
+RMD160 98bd851081bcdccec87b50139e7bd9e52663c12b openafs-gentoo-0.13.tar.bz2 16814
+SHA256 a39c0c9656a82e586bff7bd9543d8ccd175991777d68c7fe47de1c724cbe19f2 openafs-gentoo-0.13.tar.bz2 16814
diff --git a/net-fs/openafs-kernel/files/openafs-ppc64.patch b/net-fs/openafs-kernel/files/openafs-ppc64.patch
new file mode 100644
index 000000000000..ae444e52a90f
--- /dev/null
+++ b/net-fs/openafs-kernel/files/openafs-ppc64.patch
@@ -0,0 +1,29 @@
+--- src/afs/afs_call.c.old	2007-09-09 14:38:44.000000000 +0400
++++ src/afs/afs_call.c	2007-09-09 14:50:18.460222354 +0400
+@@ -1340,7 +1340,11 @@ copyin_iparam(caddr_t cmarg, struct ipar
+     if (current->thread.flags & THREAD_IA32)
+ 
+ #elif defined(AFS_PPC64_LINUX26_ENV)
+-    if (current->thread_info->flags & _TIF_32BIT) 
++#if defined(STRUCT_TASK_STRUCT_HAS_THREAD_INFO)
++    if (current->thread_info->flags & _TIF_32BIT)
++#else
++    if (current_thread_info()->flags & _TIF_32BIT)
++#endif
+ #elif defined(AFS_PPC64_LINUX20_ENV)
+     if (current->thread.flags & PPC_FLAG_32BIT) 
+ 
+--- src/afs/afs_pioctl.c.bak	2007-09-18 01:12:03.000000000 -0400
++++ src/afs/afs_pioctl.c	2007-09-18 01:12:40.000000000 -0400
+@@ -284,7 +284,11 @@
+     if (current->thread.flags & THREAD_IA32)
+ 
+ #elif defined(AFS_PPC64_LINUX26_ENV)
++#if defined(STRUCT_TASK_STRUCT_HAS_THREAD_INFO)
+     if (current->thread_info->flags & _TIF_32BIT)
++#else
++    if (current_thread_info()->flags & _TIF_32BIT)
++#endif
+ #elif defined(AFS_PPC64_LINUX20_ENV)
+     if (current->thread.flags & PPC_FLAG_32BIT)
+ 
diff --git a/net-fs/openafs-kernel/openafs-kernel-1.4.4_p20070724-r1.ebuild b/net-fs/openafs-kernel/openafs-kernel-1.4.4_p20070724-r1.ebuild
new file mode 100644
index 000000000000..933148fbefe9
--- /dev/null
+++ b/net-fs/openafs-kernel/openafs-kernel-1.4.4_p20070724-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2007 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.4_p20070724-r1.ebuild,v 1.1 2007/09/19 16:31:18 stefaan Exp $
+
+inherit eutils linux-mod versionator toolchain-funcs
+
+PATCHVER=0.13
+MY_PN=${PN/-kernel}
+MY_PV_DATE=${PV#*_p}
+MY_PV=${PV%_p*}
+MY_P=${MY_PN}-${MY_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
+	mirror://gentoo/${MY_PN}-${MY_PV}-cvs${MY_PV_DATE}.patch.bz2"
+
+LICENSE="IBM openafs-krb5 openafs-krb5-a APSL-2 sun-rpc"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~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 ${MY_P}-src.tar.bz2
+	unpack ${MY_PN}-gentoo-${PATCHVER}.tar.bz2
+	cd ${S}
+
+	EPATCH_SUFFIX="patch" epatch ${PATCHDIR}
+	epatch ${DISTDIR}/${MY_P}-cvs${MY_PV_DATE}.patch.bz2
+
+	epatch ${FILESDIR}/openafs-ppc64.patch
+
+	./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}/libafs.${KV_OBJ} ] \
+			|| die "Couldn't find compiled kernel module"
+
+	MODULE_NAMES='libafs(fs/openafs:$MOD_SRCDIR)'
+
+	linux-mod_src_install
+}