From 3505c248e492bcbde2356b23baba1442fa9f987d Mon Sep 17 00:00:00 2001 From: Stefaan De Roeck Date: Wed, 19 Sep 2007 16:31:19 +0000 Subject: Fix for ppc64 (bug #191216) (Portage version: 2.1.3.9) --- net-fs/openafs-kernel/ChangeLog | 8 ++- .../files/digest-openafs-kernel-1.4.4_p20070724-r1 | 9 ++++ net-fs/openafs-kernel/files/openafs-ppc64.patch | 29 +++++++++++ .../openafs-kernel-1.4.4_p20070724-r1.ebuild | 60 ++++++++++++++++++++++ 4 files changed, 105 insertions(+), 1 deletion(-) create mode 100644 net-fs/openafs-kernel/files/digest-openafs-kernel-1.4.4_p20070724-r1 create mode 100644 net-fs/openafs-kernel/files/openafs-ppc64.patch create mode 100644 net-fs/openafs-kernel/openafs-kernel-1.4.4_p20070724-r1.ebuild (limited to 'net-fs') 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 + +files/openafs-ppc64.patch, +openafs-kernel-1.4.4_p20070724-r1.ebuild: + Fix for ppc64 (bug #191216) 13 Sep 2007; Markus Meier openafs-kernel-1.4.4_p20070724.ebuild: 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 +} -- cgit v1.2.3-65-gdbad