summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlin Năstac <mrness@gentoo.org>2004-12-31 11:13:12 +0000
committerAlin Năstac <mrness@gentoo.org>2004-12-31 11:13:12 +0000
commit5b52f3cd2c9252639d0f2acbce4f1c73e6f18ba4 (patch)
tree8c150694ebaced80fd817aa9dc34952ec5c9d035
parentAdded ~ppc64 to KEYWORDS (Manifest recommit) (diff)
downloadgentoo-2-5b52f3cd2c9252639d0f2acbce4f1c73e6f18ba4.tar.gz
gentoo-2-5b52f3cd2c9252639d0f2acbce4f1c73e6f18ba4.tar.bz2
gentoo-2-5b52f3cd2c9252639d0f2acbce4f1c73e6f18ba4.zip
fix fcpcmcia on 2.6.10 (#75904)
-rw-r--r--net-dialup/fritzcapi/ChangeLog7
-rw-r--r--net-dialup/fritzcapi/files/fritzcapi-2.6.26.7-fix-for-2.6.10.patch12
-rw-r--r--net-dialup/fritzcapi/fritzcapi-2.6.26.7-r3.ebuild11
3 files changed, 28 insertions, 2 deletions
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 <mrness@gentoo.org>
+ +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 <mrness@gentoo.org> fritzcapi-2.6.26.7-r3.ebuild:
Replace kernel-mod inherit with linux-mod, thanks to Stefan Schweizer
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