From: Stefaan De Roeck Date: Sat, 23 Dec 2006 09:22:17 +0000 (+0000) Subject: Fix compilation for linux-2.6.19, bug #156842 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=47eaa90ef98ba4d6df410a8826c77bd893dff051;p=gentoo.git Fix compilation for linux-2.6.19, bug #156842 Package-Manager: portage-2.1.2_rc2-r5 --- 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 + +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/Manifest b/net-fs/openafs-kernel/Manifest index 00b96df5e226..6ccb8c038f5b 100644 --- a/net-fs/openafs-kernel/Manifest +++ b/net-fs/openafs-kernel/Manifest @@ -34,6 +34,10 @@ EBUILD openafs-kernel-1.4.2-r1.ebuild 1528 RMD160 06998dd991253ecb7917dcc841a35d MD5 bcdddf8e4ed2eb9b211c97e96d1fc33d openafs-kernel-1.4.2-r1.ebuild 1528 RMD160 06998dd991253ecb7917dcc841a35dc3ea121a5a openafs-kernel-1.4.2-r1.ebuild 1528 SHA256 8d9d425d39c8a5c623cdd56471a47e4911e0481cb8c6c7a76ba9a68aa7431510 openafs-kernel-1.4.2-r1.ebuild 1528 +EBUILD openafs-kernel-1.4.2-r2.ebuild 1776 RMD160 fd1799c4e214445b645d1899cdb8bdf205c59f43 SHA1 be4eb8594c47a4f6e4a1b64209b415c4b77e7a56 SHA256 deb2ae14d0b3e943a494f15799463eb86f6ba2c6b89328d6ad2974d6f6404021 +MD5 6406f3b2ce1837d44befc78818e3362b openafs-kernel-1.4.2-r2.ebuild 1776 +RMD160 fd1799c4e214445b645d1899cdb8bdf205c59f43 openafs-kernel-1.4.2-r2.ebuild 1776 +SHA256 deb2ae14d0b3e943a494f15799463eb86f6ba2c6b89328d6ad2974d6f6404021 openafs-kernel-1.4.2-r2.ebuild 1776 EBUILD openafs-kernel-1.4.2.ebuild 1442 RMD160 2bbea1ebab8336076f94b86fb31655087ccf9c4f SHA1 237ffe37192a24f8f752226a68275fbcd8746075 SHA256 976a099364d8e8579c2ec2230b79c03081e81c0b5a9fa704f78b93c06483c777 MD5 36adfb79c25d8e5d4f7e321692dc615d openafs-kernel-1.4.2.ebuild 1442 RMD160 2bbea1ebab8336076f94b86fb31655087ccf9c4f openafs-kernel-1.4.2.ebuild 1442 @@ -46,10 +50,10 @@ EBUILD openafs-kernel-1.5.12.ebuild 1563 RMD160 9af9c2dacf9cec8c4ecfd06e05af3562 MD5 4195eb2791df811376530bf8600099a5 openafs-kernel-1.5.12.ebuild 1563 RMD160 9af9c2dacf9cec8c4ecfd06e05af3562d9d13a58 openafs-kernel-1.5.12.ebuild 1563 SHA256 cda42ad95314c7176c47db09537130da5d7f10251fcfd3030874e675a0e445c6 openafs-kernel-1.5.12.ebuild 1563 -MISC ChangeLog 7071 RMD160 bee7f2537a1c0afd79004071a98bff641709da4e SHA1 fb376174b0f66ae508519a292615b4acdecb7fb9 SHA256 b84eed061b6bec3664740aaab568468dc95615af9ccfa47da3a3467f0f0e76e4 -MD5 7304e44ff9bd17bdaf5e7b1d4a0adef2 ChangeLog 7071 -RMD160 bee7f2537a1c0afd79004071a98bff641709da4e ChangeLog 7071 -SHA256 b84eed061b6bec3664740aaab568468dc95615af9ccfa47da3a3467f0f0e76e4 ChangeLog 7071 +MISC ChangeLog 7248 RMD160 8c358926ee482a78e289db0407986161109435bf SHA1 e2564e119a98e1ed072941c98d484bdd26ca6a9c SHA256 ea4d4e2ab672b9d5c11254e522e48b8d3076c3d42d76aa9c9f02a1456fc4d4de +MD5 8e5a00a41eb69b5f6c3acd154c4462b5 ChangeLog 7248 +RMD160 8c358926ee482a78e289db0407986161109435bf ChangeLog 7248 +SHA256 ea4d4e2ab672b9d5c11254e522e48b8d3076c3d42d76aa9c9f02a1456fc4d4de ChangeLog 7248 MISC metadata.xml 254 RMD160 1bef8b94265bf2b400fb6235b3e43b504b8d2b71 SHA1 a4ad632b650953fa9c9f203a9c55f58ddba37705 SHA256 90d7dcb6aede67bf64f610984a31fc03573512de9e241db42acb32601373db62 MD5 833551f00cc2163ac7f9eb367ee9caa8 metadata.xml 254 RMD160 1bef8b94265bf2b400fb6235b3e43b504b8d2b71 metadata.xml 254 @@ -69,6 +73,9 @@ SHA256 1ba9739f441ac7e2ca70cc234d3e6a3cbf4d708e7880c9db09c91a76c02fe153 files/di MD5 b4871d6ce5bfc85db97cc7e51a5f305e files/digest-openafs-kernel-1.4.2-r1 518 RMD160 a2037719fb17a8cf90de022030dd1844a2d5ab90 files/digest-openafs-kernel-1.4.2-r1 518 SHA256 1ba9739f441ac7e2ca70cc234d3e6a3cbf4d708e7880c9db09c91a76c02fe153 files/digest-openafs-kernel-1.4.2-r1 518 +MD5 b4871d6ce5bfc85db97cc7e51a5f305e files/digest-openafs-kernel-1.4.2-r2 518 +RMD160 a2037719fb17a8cf90de022030dd1844a2d5ab90 files/digest-openafs-kernel-1.4.2-r2 518 +SHA256 1ba9739f441ac7e2ca70cc234d3e6a3cbf4d708e7880c9db09c91a76c02fe153 files/digest-openafs-kernel-1.4.2-r2 518 MD5 556110a91002596ec5b9ce2816ea1913 files/digest-openafs-kernel-1.4.3_pre20061220 557 RMD160 d1f3a00cd7c13124e3ac577b7ac165ada7835ada files/digest-openafs-kernel-1.4.3_pre20061220 557 SHA256 127ef4989847058167b986e4685d2900695b78b218f818d3dc35609cb52cc4e1 files/digest-openafs-kernel-1.4.3_pre20061220 557 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 @#include \n#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)\n#include \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 +} +