diff options
| author |   Stefan Schweizer <genstef@gentoo.org> | 2007-08-29 18:45:40 +0000 |
|---|---|---|
| committer | Stefan Schweizer <genstef@gentoo.org> | 2007-08-29 18:45:40 +0000 |
| commit | 6dbed75b4d73ff52e2d81891bba04f64ed6b2829 (patch) | |
| tree | ed40a1d49af661cd62ac32ead473d42c3e65602d /net-dialup | |
| parent | Removing kaiowas from metadata due to his retirement (see #61930 for reference). (diff) | |
| download | gentoo-2-6dbed75b4d73ff52e2d81891bba04f64ed6b2829.tar.gz gentoo-2-6dbed75b4d73ff52e2d81891bba04f64ed6b2829.tar.bz2 gentoo-2-6dbed75b4d73ff52e2d81891bba04f64ed6b2829.zip | |
Add amd64 patch for 2.6.22 for fcpci only thanks to <apost1@gmx.de>, bug 190152 and 184903
(Portage version: 2.1.3.7)
Diffstat (limited to 'net-dialup')
| -rw-r--r-- | net-dialup/fritzcapi/ChangeLog | 9 | ||||
| -rw-r--r-- | net-dialup/fritzcapi/files/2.6.43-linux-2.6.22-pci_module_init.patch | 12 | ||||
| -rw-r--r-- | net-dialup/fritzcapi/fritzcapi-2.6.43.ebuild | 5 |
3 files changed, 23 insertions, 3 deletions
diff --git a/net-dialup/fritzcapi/ChangeLog b/net-dialup/fritzcapi/ChangeLog index 1043cc2edeec..ee7df6092c13 100644 --- a/net-dialup/fritzcapi/ChangeLog +++ b/net-dialup/fritzcapi/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-dialup/fritzcapi # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/fritzcapi/ChangeLog,v 1.33 2007/07/23 19:45:10 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/fritzcapi/ChangeLog,v 1.34 2007/08/29 18:45:40 genstef Exp $ + +*fritzcapi-2.6.43.ebuild (29 Aug 2007) + + 29 Aug 2007; Stefan Schweizer <genstef@gentoo.org> + +files/2.6.43-linux-2.6.22-pci_module_init.patch, fritzcapi-2.6.43.ebuild: + Add amd64 patch for 2.6.22 for fcpci only thanks to <apost1@gmx.de>, bug + 190152 and 184903 23 Jul 2007; Stefan Schweizer <genstef@gentoo.org> fritzcapi-2.6.43.ebuild: diff --git a/net-dialup/fritzcapi/files/2.6.43-linux-2.6.22-pci_module_init.patch b/net-dialup/fritzcapi/files/2.6.43-linux-2.6.22-pci_module_init.patch new file mode 100644 index 000000000000..6624e327ec9f --- /dev/null +++ b/net-dialup/fritzcapi/files/2.6.43-linux-2.6.22-pci_module_init.patch @@ -0,0 +1,12 @@ +diff -ur usr.orig/src/kernel-modules/fritzcapi/fritz.pci/src/main.c usr/src/kernel-modules/fritzcapi/fritz.pci/src/main.c +--- usr.orig/src/kernel-modules/fritzcapi/fritz.pci/src/main.c 2007-08-25 09:54:42.000000000 +0200 ++++ usr/src/kernel-modules/fritzcapi/fritz.pci/src/main.c 2007-08-25 09:55:02.000000000 +0200 +@@ -364,7 +364,7 @@ + #endif + + #if defined (__fcpci__) +- if (0 == (err = pci_module_init (&fcpci_driver))) { ++ if (0 == (err = pci_register_driver (&fcpci_driver))) { + LOG("PCI driver registered.\n"); + register_capi_driver (&fritz_capi_driver); + LOG("CAPI driver registered.\n"); diff --git a/net-dialup/fritzcapi/fritzcapi-2.6.43.ebuild b/net-dialup/fritzcapi/fritzcapi-2.6.43.ebuild index 56739ef542c3..85831423322e 100644 --- a/net-dialup/fritzcapi/fritzcapi-2.6.43.ebuild +++ b/net-dialup/fritzcapi/fritzcapi-2.6.43.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/fritzcapi/fritzcapi-2.6.43.ebuild,v 1.15 2007/07/23 19:45:10 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/fritzcapi/fritzcapi-2.6.43.ebuild,v 1.16 2007/08/29 18:45:40 genstef Exp $ inherit linux-mod rpm eutils @@ -98,7 +98,6 @@ pkg_setup() { src_unpack() { rpm_unpack "${DISTDIR}/${A}" || die "failed to unpack ${A} file" - use x86 && epatch ${FILESDIR}/fritzcapi-2.6.22.patch cd "${S}" mkdir -p "${WORKDIR}/var/lib/fritz" ln fritz.*/lib/*-lib.o "${WORKDIR}/var/lib/fritz" @@ -116,10 +115,12 @@ src_unpack() { epatch ${FILESDIR}/2.6.43-linux-2.6.19-irq_handler.patch kernel_is ge 2 6 17 && epatch ${FILESDIR}/2.6.43-fcpcmcia.patch kernel_is ge 2 6 20 && epatch ${FILESDIR}/fritzcapi-2.6.20.patch + kernel_is ge 2 6 22 && epatch ${FILESDIR}/fritzcapi-2.6.22.patch else epatch ${FILESDIR}/2.6.43-linux-2.6.19-irq_handler.amd64.patch kernel_is ge 2 6 17 && epatch ${FILESDIR}/2.6.43-fcpcmcia.amd64.patch kernel_is ge 2 6 20 && epatch ${FILESDIR}/fritzcapi-2.6.20.amd64.patch + kernel_is ge 2 6 22 && epatch ${FILESDIR}/2.6.43-linux-2.6.22-pci_module_init.patch fi find -name \*.[hc] -print0 | xargs -0 sed -i ' s:#include <linux/config\.h>:#include <linux/autoconf.h>:; |