Adapt kernel modules to the changes occured in 2.6.16 (#149143). Avoid pre-stripped binaries QA warning.

(Portage version: 2.1.1)

4 files changed, 227 insertions, 2 deletions

diff --git a/net-dialup/bewan-adsl/ChangeLog b/net-dialup/bewan-adsl/ChangeLog
index a10d01b59127..e7acf61510d4 100644
--- a/net-dialup/bewan-adsl/ChangeLog
+++ b/net-dialup/bewan-adsl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dialup/bewan-adsl
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/bewan-adsl/ChangeLog,v 1.10 2006/08/15 18:02:28 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/bewan-adsl/ChangeLog,v 1.11 2006/09/26 21:17:12 mrness Exp $
+
+  26 Sep 2006; Alin Nastac <mrness@gentoo.org>
+  +files/bewan-adsl-0.9.3-kernel-2.6.16.patch,
+  +files/bewan-adsl-0.9.3-no-strip.patch, bewan-adsl-0.9.3-r1.ebuild:
+  Adapt kernel modules to the changes occured in 2.6.16 (#149143). Avoid
+  pre-stripped binaries QA warning.
 
   15 Aug 2006; Alin Nastac <mrness@gentoo.org> bewan-adsl-0.9.3-r1.ebuild:
   Remove abused doc USE flag. Add 3 local USE flags which enables workarounds
diff --git a/net-dialup/bewan-adsl/bewan-adsl-0.9.3-r1.ebuild b/net-dialup/bewan-adsl/bewan-adsl-0.9.3-r1.ebuild
index f900be3c1621..8aab60645c9f 100644
--- a/net-dialup/bewan-adsl/bewan-adsl-0.9.3-r1.ebuild
+++ b/net-dialup/bewan-adsl/bewan-adsl-0.9.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/bewan-adsl/bewan-adsl-0.9.3-r1.ebuild,v 1.3 2006/08/15 18:02:28 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/bewan-adsl/bewan-adsl-0.9.3-r1.ebuild,v 1.4 2006/09/26 21:17:12 mrness Exp $
 
 inherit eutils linux-mod
 
@@ -39,6 +39,9 @@ src_unpack() {
 	# Upstream consider actual version to be thread safe
 	epatch "${FILESDIR}/${P}-smp.patch"
 
+	epatch "${FILESDIR}/${P}-kernel-2.6.16.patch"
+	epatch "${FILESDIR}/${P}-no-strip.patch"
+
 	# Declare desired COPTIONS in the Makefile for the PCI module
 	use kt400 && sed -i 's/^\(COPTIONS *= *\)/\1 -DKT400/g' "${PCI_S}/Makefile"
 	use pcitimer && sed -i 's/^\(COPTIONS *= *\)/\1 -DUSE_HW_TIMER/g' "${PCI_S}/Makefile"
diff --git a/net-dialup/bewan-adsl/files/bewan-adsl-0.9.3-kernel-2.6.16.patch b/net-dialup/bewan-adsl/files/bewan-adsl-0.9.3-kernel-2.6.16.patch
new file mode 100644
index 000000000000..4506e2b6ddec
--- /dev/null
+++ b/net-dialup/bewan-adsl/files/bewan-adsl-0.9.3-kernel-2.6.16.patch
@@ -0,0 +1,196 @@
+diff -Nru unicorn.orig/unicorn_atm/unicorn_atmdrv.c unicorn/unicorn_atm/unicorn_atmdrv.c
+--- unicorn.orig/unicorn_atm/unicorn_atmdrv.c	2006-01-03 17:36:40.000000000 +0200
++++ unicorn/unicorn_atm/unicorn_atmdrv.c	2006-09-26 23:50:39.878067750 +0300
+@@ -101,7 +101,7 @@
+ struct unicorn_atmdrv *unicorn_atmdrv = NULL;
+ 
+ // driver parameters
+-unsigned char *mac_address=NULL;
++char mac_address[ETH_ALEN*2 + 1] = { 0x0 };
+ #if DEBUG
+ #ifdef ATM_DRIVER
+ unsigned long DebugLevel=0; // ATM_D,DATA_D
+@@ -1293,10 +1293,10 @@
+        return 0;
+ }
+ 
+-MODULE_PARM(mac_address, "s");
++module_param_string(mac_address, mac_address, sizeof(mac_address), 0);
+ #if DEBUG
+ #ifdef ATM_DRIVER
+-MODULE_PARM(DebugLevel, "i");
++module_param(DebugLevel, ulong, 0);
+ #endif
+ #endif
+ 
+diff -Nru unicorn.orig/unicorn_eth/unicorn_ethdrv.c unicorn/unicorn_eth/unicorn_ethdrv.c
+--- unicorn.orig/unicorn_eth/unicorn_ethdrv.c	2006-01-02 18:56:36.000000000 +0200
++++ unicorn/unicorn_eth/unicorn_ethdrv.c	2006-09-26 23:50:39.878067750 +0300
+@@ -140,12 +140,12 @@
+ struct unicorn_ethdrv *unicorn_ethdrv = NULL;
+ 
+ // driver parameters
+-static char *if_name = NULL;
+-static unsigned char *mac_address=NULL;
++static char if_name[IFNAMSIZ] = { 0x0 };
++static char mac_address[ETH_ALEN*2 + 1] = { 0x0 };
+ static int VPI= ATM_VPI_UNSPEC;
+ static int VCI= ATM_VCI_UNSPEC;
+-static char *PROTOCOL = NULL;
+-static char *ENCAPS = NULL;
++static char PROTOCOL[8] = { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 };
++static char ENCAPS[11] = { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 };
+ #if DEBUG
+ #ifdef ETH_DRIVER
+ unsigned long DebugLevel=0; // ATM_D,DATA_D
+@@ -1355,15 +1355,15 @@
+ 	WARN("\n");
+ }
+ 
+-MODULE_PARM(if_name,"s");
+-MODULE_PARM(mac_address, "s");
+-MODULE_PARM(VPI, "i");
+-MODULE_PARM(VCI, "i");
+-MODULE_PARM(PROTOCOL, "s");
+-MODULE_PARM(ENCAPS, "s");
++module_param_string(if_name, if_name, sizeof(if_name), 0);
++module_param_string(mac_address, mac_address, sizeof(mac_address), 0);
++module_param(VPI, int, 0);
++module_param(VCI, int, 0);
++module_param_string(PROTOCOL, PROTOCOL, sizeof(PROTOCOL), 0);
++module_param_string(ENCAPS, ENCAPS, sizeof(ENCAPS), 0);
+ #if DEBUG
+ #ifdef ETH_DRIVER
+-MODULE_PARM(DebugLevel, "i");
++module_param(DebugLevel, ulong, 0);
+ #endif
+ #endif
+ 
+diff -Nru unicorn.orig/unicorn_pci/unicorn_pcidrv.c unicorn/unicorn_pci/unicorn_pcidrv.c
+--- unicorn.orig/unicorn_pci/unicorn_pcidrv.c	2006-01-02 18:58:23.000000000 +0200
++++ unicorn/unicorn_pci/unicorn_pcidrv.c	2006-09-27 00:02:36.920752750 +0300
+@@ -2157,38 +2157,25 @@
+ }
+ 
+ /* module parameters for MSW */
+-MODULE_PARM(ActivationMode, "i");
+-//MODULE_PARM(ActivationTaskTimeout, "i");
+-MODULE_PARM(ActTimeout, "i");
+-MODULE_PARM(AutoActivation, "i");
+-//MODULE_PARM(BreakOnEntry, "i");
+-MODULE_PARM(DownstreamRate, "i");
+-MODULE_PARM(eocTrace, "i");
+-//MODULE_PARM(ExchangeDelay, "i");
+-MODULE_PARM(FmPollingRate, "i");
+-//MODULE_PARM(g_RefGain, "i");
+-MODULE_PARM(g_TeqMode, "i");
+-MODULE_PARM(InitTimeout, "i");
+-MODULE_PARM(Interoperability, "i");
+-MODULE_PARM(LCD_Trig, "i");
+-MODULE_PARM(LOS_LOF_Trig, "i");
+-MODULE_PARM(LoopbackMode, "i");
+-MODULE_PARM(MswDebugLevel, "i");
+-MODULE_PARM(RetryTime, "i");
+-MODULE_PARM(setINITIALDAC, "i");
+-//MODULE_PARM(TrainingDelay, "i");
+-//MODULE_PARM(TruncateMode, "i");
+-MODULE_PARM(useAFE, "i");
+-//MODULE_PARM(useRFC019v, "i");
+-//MODULE_PARM(useRFC029v, "i");
+-//MODULE_PARM(useRFC033v, "i");
+-//MODULE_PARM(useRFC040v, "i");
+-MODULE_PARM(useRFC041v, "i");
+-//MODULE_PARM(useRFCFixedRate, "i");
+-//MODULE_PARM(useVCXO, "i");
+-//MODULE_PARM(_no_TS652, "i");
++module_param(ActivationMode, ulong, 0);
++module_param(ActTimeout, ulong, 0);
++module_param(AutoActivation, ulong, 0);
++module_param(DownstreamRate, ulong, 0);
++module_param(eocTrace, ulong, 0);
++module_param(FmPollingRate, ulong, 0);
++module_param(g_TeqMode, ushort, 0);
++module_param(InitTimeout, ulong, 0);
++module_param(Interoperability, ulong, 0);
++module_param(LCD_Trig, ulong, 0);
++module_param(LOS_LOF_Trig, ulong, 0);
++module_param(LoopbackMode, ulong, 0);
++module_param(MswDebugLevel, ulong, 0);
++module_param(RetryTime, ulong, 0);
++module_param(setINITIALDAC, ulong, 0);
++module_param(useAFE, ulong, 0);
++module_param(useRFC041v, ulong, 0);
+ #if DEBUG
+-MODULE_PARM(DebugLevel, "i");
++module_param(DebugLevel, ulong, 0);
+ #endif
+ 
+ static int __init
+diff -Nru unicorn.orig/unicorn_usb/unicorn_usbdrv.c unicorn/unicorn_usb/unicorn_usbdrv.c
+--- unicorn.orig/unicorn_usb/unicorn_usbdrv.c	2005-05-26 13:25:25.000000000 +0300
++++ unicorn/unicorn_usb/unicorn_usbdrv.c	2006-09-26 23:58:34.751745500 +0300
+@@ -2289,39 +2289,32 @@
+ };
+ 
+ /* module parameters for MSW */
+-MODULE_PARM(ActivationMode, "i");
+-//MODULE_PARM(ActivationTaskTimeout, "i");
+-MODULE_PARM(ActTimeout, "i");
+-MODULE_PARM(AutoActivation, "i");
+-//MODULE_PARM(BreakOnEntry, "i");
+-MODULE_PARM(DownstreamRate, "i");
+-MODULE_PARM(eocTrace, "i");
+-MODULE_PARM(ExchangeDelay, "i");
+-MODULE_PARM(FmPollingRate, "i");
+-MODULE_PARM(g_RefGain, "i");
+-MODULE_PARM(g_TeqMode, "i");
+-MODULE_PARM(InitTimeout, "i");
+-MODULE_PARM(Interoperability, "i");
+-MODULE_PARM(LCD_Trig, "i");
+-MODULE_PARM(LOS_LOF_Trig, "i");
+-MODULE_PARM(LoopbackMode, "i");
+-MODULE_PARM(MswDebugLevel, "i");
+-MODULE_PARM(RetryTime, "i");
+-//MODULE_PARM(setINITIALDAC, "i");
+-MODULE_PARM(TrainingDelay, "i");
+-//MODULE_PARM(TruncateMode, "i");
+-MODULE_PARM(useAFE, "i");
+-MODULE_PARM(useRFC019v, "i");
+-MODULE_PARM(useRFC029v, "i");
+-//MODULE_PARM(useRFC033v, "i");
+-MODULE_PARM(useRFC040v, "i");
+-MODULE_PARM(useRFC041v, "i");
+-//MODULE_PARM(useRFCFixedRate, "i");
+-MODULE_PARM(useVCXO, "i");
+-MODULE_PARM(_no_TS652, "i");
+-//MODULE_PARM(FrameNumber, "i");
++module_param(ActivationMode, ulong, 0);
++module_param(ActTimeout, ulong, 0);
++module_param(AutoActivation, ulong, 0);
++module_param(DownstreamRate, ulong, 0);
++module_param(eocTrace, ulong, 0);
++module_param(ExchangeDelay, ulong, 0);
++module_param(FmPollingRate, ulong, 0);
++module_param(g_RefGain, ulong, 0);
++module_param(g_TeqMode, ushort, 0);
++module_param(InitTimeout, ulong, 0);
++module_param(Interoperability, ulong, 0);
++module_param(LCD_Trig, ulong, 0);
++module_param(LOS_LOF_Trig, ulong, 0);
++module_param(LoopbackMode, ulong, 0);
++module_param(MswDebugLevel, ulong, 0);
++module_param(RetryTime, ulong, 0);
++module_param(TrainingDelay, ulong, 0);
++module_param(useAFE, ulong, 0);
++module_param(useRFC019v, ulong, 0);
++module_param(useRFC029v, ulong, 0);
++module_param(useRFC040v, ulong, 0);
++module_param(useRFC041v, ulong, 0);
++module_param(useVCXO, ulong, 0);
++module_param(_no_TS652, ulong, 0);
+ #if DEBUG
+-MODULE_PARM(DebugLevel, "i");
++module_param(DebugLevel, ulong, 0);
+ #endif
+ 
+ //----------------------------------------------------------------------
diff --git a/net-dialup/bewan-adsl/files/bewan-adsl-0.9.3-no-strip.patch b/net-dialup/bewan-adsl/files/bewan-adsl-0.9.3-no-strip.patch
new file mode 100644
index 000000000000..d8b29cbe1538
--- /dev/null
+++ b/net-dialup/bewan-adsl/files/bewan-adsl-0.9.3-no-strip.patch
@@ -0,0 +1,20 @@
+diff -Nru unicorn.orig/tools/Makefile unicorn/tools/Makefile
+--- unicorn.orig/tools/Makefile	2003-09-28 11:51:24.000000000 +0300
++++ unicorn/tools/Makefile	2006-09-27 00:12:31.381904250 +0300
+@@ -24,5 +24,5 @@
+ 	rm -f unicorn_status unicorn_status.cgi oam_ping *.o

+ 

+ install: all  

+-	$(INSTALL) -s -c unicorn_status $(DESTDIR)$(BINDIR)

+-	$(INSTALL) -s -c oam_ping $(DESTDIR)$(BINDIR)

++	$(INSTALL) -c unicorn_status $(DESTDIR)$(BINDIR)

++	$(INSTALL) -c oam_ping $(DESTDIR)$(BINDIR)

+diff -Nru unicorn.orig/unicorntest/Makefile unicorn/unicorntest/Makefile
+--- unicorn.orig/unicorntest/Makefile	2003-09-28 11:48:34.000000000 +0300
++++ unicorn/unicorntest/Makefile	2006-09-27 00:12:52.979254000 +0300
+@@ -18,4 +18,4 @@
+ 	rm -f unicorntest *.o

+ 

+ install: all  

+-	$(INSTALL) -s -c unicorntest $(DESTDIR)$(BINDIR)

++	$(INSTALL) -c unicorntest $(DESTDIR)$(BINDIR)