summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlin Năstac <mrness@gentoo.org>2008-02-13 15:27:13 +0000
committerAlin Năstac <mrness@gentoo.org>2008-02-13 15:27:13 +0000
commite4256580dba9aed878360b32ebbae26e1a6f7634 (patch)
treeb4b003ee4b33dd846acd8dad57e3671ff0552577 /net-dialup
parentstable ppc64, bug 209630 (diff)
downloadgentoo-2-e4256580dba9aed878360b32ebbae26e1a6f7634.tar.gz
gentoo-2-e4256580dba9aed878360b32ebbae26e1a6f7634.tar.bz2
gentoo-2-e4256580dba9aed878360b32ebbae26e1a6f7634.zip
Fix compilation issues on kernel 2.6.24 (#209472).
(Portage version: 2.1.3.19)
Diffstat (limited to 'net-dialup')
-rw-r--r--net-dialup/ltmodem/ChangeLog6
-rw-r--r--net-dialup/ltmodem/files/ltmodem-2.6.9-kernel-2.6.24.patch15
-rw-r--r--net-dialup/ltmodem/ltmodem-2.6.9.ebuild12
3 files changed, 29 insertions, 4 deletions
diff --git a/net-dialup/ltmodem/ChangeLog b/net-dialup/ltmodem/ChangeLog
index 64c8402e7331..baa5d25face8 100644
--- a/net-dialup/ltmodem/ChangeLog
+++ b/net-dialup/ltmodem/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-dialup/ltmodem
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ltmodem/ChangeLog,v 1.38 2008/01/03 13:41:48 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ltmodem/ChangeLog,v 1.39 2008/02/13 15:27:13 mrness Exp $
+
+ 13 Feb 2008; Alin Năstac <mrness@gentoo.org>
+ +files/ltmodem-2.6.9-kernel-2.6.24.patch, ltmodem-2.6.9.ebuild:
+ Fix compilation issues on kernel 2.6.24 (#209472).
03 Jan 2008; Alin Năstac <mrness@gentoo.org>
-files/ltmodem-2.6-alk-8-kernel-changes.patch, -files/ltmodem_devfs,
diff --git a/net-dialup/ltmodem/files/ltmodem-2.6.9-kernel-2.6.24.patch b/net-dialup/ltmodem/files/ltmodem-2.6.9-kernel-2.6.24.patch
new file mode 100644
index 000000000000..b2d8f111a882
--- /dev/null
+++ b/net-dialup/ltmodem/files/ltmodem-2.6.9-kernel-2.6.24.patch
@@ -0,0 +1,15 @@
+diff -Nru ltmodem-2.6-alk-9.orig/serial.c ltmodem-2.6-alk-9/serial.c
+--- ltmodem-2.6-alk-9.orig/serial.c 2007-09-06 04:56:25.000000000 +0300
++++ ltmodem-2.6-alk-9/serial.c 2008-02-13 17:21:44.000000000 +0200
+@@ -826,7 +826,11 @@
+ *lt_modem_ops.virtual_isr_ptr = lt_virtual_rs_interrupt;
+
+ /* lets try to grap dsp interrupt here */
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
+ ret = request_irq(lt_modem_res.Irq, VMODEM_Hw_Int_Proc, SA_INTERRUPT | SA_SHIRQ,
++#else
++ ret = request_irq(lt_modem_res.Irq, VMODEM_Hw_Int_Proc, IRQF_DISABLED | IRQF_SHARED,
++#endif
+ ltserialstring, &lt_modem_res.BaseAddress);
+ if (ret<0)
+ goto out_port;
diff --git a/net-dialup/ltmodem/ltmodem-2.6.9.ebuild b/net-dialup/ltmodem/ltmodem-2.6.9.ebuild
index 430468f60cf9..74011b90690a 100644
--- a/net-dialup/ltmodem/ltmodem-2.6.9.ebuild
+++ b/net-dialup/ltmodem/ltmodem-2.6.9.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ltmodem/ltmodem-2.6.9.ebuild,v 1.2 2007/12/28 11:13:40 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ltmodem/ltmodem-2.6.9.ebuild,v 1.3 2008/02/13 15:27:13 mrness Exp $
-inherit linux-mod
+inherit linux-mod eutils
MY_ALK_VER="${PV%.*}-alk-${PV##*.}"
@@ -42,6 +42,12 @@ pkg_setup() {
BUILD_PARAMS="KERNEL_DIR='${KV_DIR}'"
}
+src_unpack() {
+ unpack ${A}
+
+ epatch "${FILESDIR}"/${P}-kernel-2.6.24.patch
+}
+
src_install() {
# Add configuration for udev
insinto /etc/udev/rules.d/; newins "${FILESDIR}/ltmodem_udev" 55-ltmodem.rules