From: Alin Năstac Date: Fri, 31 Dec 2004 11:13:12 +0000 (+0000) Subject: fix fcpcmcia on 2.6.10 (#75904) X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=14d1f89c105aed024d680d71372f3288a4fafe9d;p=gentoo.git fix fcpcmcia on 2.6.10 (#75904) --- diff --git a/net-dialup/fritzcapi/ChangeLog b/net-dialup/fritzcapi/ChangeLog index 3b15cbaa491b..3a4c3a494292 100644 --- a/net-dialup/fritzcapi/ChangeLog +++ b/net-dialup/fritzcapi/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-dialup/fritzcapi # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/fritzcapi/ChangeLog,v 1.6 2004/12/22 23:22:27 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/fritzcapi/ChangeLog,v 1.7 2004/12/31 11:13:12 mrness Exp $ + + 31 Dec 2004; Alin Nastac + +files/fritzcapi-2.6.26.7-fix-for-2.6.10.patch, + fritzcapi-2.6.26.7-r3.ebuild: + Fix broken build of fcpcmcia module on kernel versions >= 2.6.10 (#75904). 23 Dec 2004; Alin Nastac fritzcapi-2.6.26.7-r3.ebuild: Replace kernel-mod inherit with linux-mod, thanks to Stefan Schweizer diff --git a/net-dialup/fritzcapi/Manifest b/net-dialup/fritzcapi/Manifest index 88a2baf3218d..332ef9dc2e30 100644 --- a/net-dialup/fritzcapi/Manifest +++ b/net-dialup/fritzcapi/Manifest @@ -1,14 +1,15 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +MD5 e449f1436fe10d3324a59384bb011e45 fritzcapi-2.6.26.7-r3.ebuild 4410 +MD5 d502a3dfb1807e69c9c712cfa747c131 ChangeLog 1615 MD5 1263c46695d96ea0f5d40540b938c13c metadata.xml 301 -MD5 164cfd3d27739f7e020fb1874971602e ChangeLog 1408 -MD5 43adc139a4874452261bfbab49947c3a fritzcapi-2.6.26.7-r3.ebuild 4285 +MD5 9944aebce0f4b12843c5312ac4ba90b5 files/fritzcapi-2.6.26.7-fix-for-2.6.10.patch 473 MD5 4e97476cdc108508618f39f2aab8c70c files/digest-fritzcapi-2.6.26.7-r3 151 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.6 (GNU/Linux) -iD8DBQFBygG9jtv59x0+BrURAowjAJ49UVSw8gcU2spXYFH2clq68LpicACgzt1J -ix4WJUetZ4PsWm3vDwwgBhI= -=ACxE +iD8DBQFB1TRSjtv59x0+BrURApgzAKDl1A09Hu9gWPIYNnVWFFF/OghzTgCguSCZ +t+3cPfI2pjfFPu6SYAZYL4Q= +=5qlA -----END PGP SIGNATURE----- diff --git a/net-dialup/fritzcapi/files/fritzcapi-2.6.26.7-fix-for-2.6.10.patch b/net-dialup/fritzcapi/files/fritzcapi-2.6.26.7-fix-for-2.6.10.patch new file mode 100644 index 000000000000..40dd7cb840e4 --- /dev/null +++ b/net-dialup/fritzcapi/files/fritzcapi-2.6.26.7-fix-for-2.6.10.patch @@ -0,0 +1,12 @@ +diff -Nru fritz.pcmcia.old/src/fcpcmcia_cs.c fritz.pcmcia/src/fcpcmcia_cs.c +--- fritz.pcmcia.old/src/fcpcmcia_cs.c 2004-03-10 13:01:03.000000000 +0200 ++++ fritz.pcmcia/src/fcpcmcia_cs.c 2004-12-31 12:51:57.480716688 +0200 +@@ -118,7 +118,7 @@ + static int irq_list_count = -1; + static int irq_list[10]; + +-module_param_array (irq_list, int, irq_list_count, 0); ++module_param_array (irq_list, int, &irq_list_count, 0); + + MODULE_PARM_DESC (irq_list, "List of IRQ numbers"); + diff --git a/net-dialup/fritzcapi/fritzcapi-2.6.26.7-r3.ebuild b/net-dialup/fritzcapi/fritzcapi-2.6.26.7-r3.ebuild index 7b12eafc3c71..af2dc79c2bc7 100644 --- a/net-dialup/fritzcapi/fritzcapi-2.6.26.7-r3.ebuild +++ b/net-dialup/fritzcapi/fritzcapi-2.6.26.7-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/fritzcapi/fritzcapi-2.6.26.7-r3.ebuild,v 1.2 2004/12/22 23:22:27 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/fritzcapi/fritzcapi-2.6.26.7-r3.ebuild,v 1.3 2004/12/31 11:13:12 mrness Exp $ inherit linux-mod rpm eutils @@ -87,6 +87,15 @@ pkg_setup() { einfo "Selected cards: ${FRITZCAPI_BUILD_CARDS}" } +src_unpack() { + rpm_src_unpack + + cd ${S} + if kernel_is ge 2 6 10; then + epatch ${FILESDIR}/${P}-fix-for-2.6.10.patch + fi +} + src_install() { linux-mod_src_install