[svn] r4861 - trunk/rpms/dkms-tiacx

packagers at lists.rpmforge.net packagers at lists.rpmforge.net
Mon Oct 30 15:46:24 CET 2006 

Author: thias
Date: 2006-10-30 15:46:23 +0100 (Mon, 30 Oct 2006)
New Revision: 4861

Added:
   trunk/rpms/dkms-tiacx/tiacx-2.6.18-mm3-build.patch
Removed:
   trunk/rpms/dkms-tiacx/dkms-tiacx-0.4.7-build.patch
Modified:
   trunk/rpms/dkms-tiacx/dkms-tiacx.spec
Log:
Update dkms-tiacx with the driver sources from the 2.6.18-mm3 kernel.


Deleted: trunk/rpms/dkms-tiacx/dkms-tiacx-0.4.7-build.patch
===================================================================
--- trunk/rpms/dkms-tiacx/dkms-tiacx-0.4.7-build.patch	2006-10-30 14:39:40 UTC (rev 4860)
+++ trunk/rpms/dkms-tiacx/dkms-tiacx-0.4.7-build.patch	2006-10-30 14:46:23 UTC (rev 4861)
@@ -1,80 +0,0 @@
-diff -Naupr drivers.orig/net/wireless/tiacx/common.c drivers/net/wireless/tiacx/common.c
---- drivers.orig/net/wireless/tiacx/common.c	2006-06-29 15:33:30.000000000 +0200
-+++ drivers/net/wireless/tiacx/common.c	2006-10-09 14:24:34.000000000 +0200
-@@ -30,7 +30,6 @@
- ** ---------------------------------------------------------------------
- */
- 
--#include <linux/config.h>
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/kernel.h>
-diff -Naupr drivers.orig/net/wireless/tiacx/ioctl.c drivers/net/wireless/tiacx/ioctl.c
---- drivers.orig/net/wireless/tiacx/ioctl.c	2006-06-29 15:33:30.000000000 +0200
-+++ drivers/net/wireless/tiacx/ioctl.c	2006-10-09 14:24:34.000000000 +0200
-@@ -30,7 +30,6 @@
- ** ---------------------------------------------------------------------
- */
- 
--#include <linux/config.h>
- #include <linux/version.h>
- #include <linux/kernel.h>
- #include <linux/types.h>
-diff -Naupr drivers.orig/net/wireless/tiacx/Makefile drivers/net/wireless/tiacx/Makefile
---- drivers.orig/net/wireless/tiacx/Makefile	2006-06-29 15:33:04.000000000 +0200
-+++ drivers/net/wireless/tiacx/Makefile	2006-10-09 14:27:54.000000000 +0200
-@@ -2,5 +2,13 @@ acx-common-y := wlan.o ioctl.o common.o
- acx-usb-y := usb.o
- acx-pci-y := pci.o
- 
-+ifndef CONFIG_ACX_PCI
-+CONFIG_ACX_PCI=m
-+endif
-+
-+ifndef CONFIG_ACX_USB
-+CONFIG_ACX_USB=m
-+endif
-+
- obj-$(CONFIG_ACX_PCI) += acx-common.o acx-pci.o
- obj-$(CONFIG_ACX_USB) += acx-common.o acx-usb.o
-diff -Naupr drivers.orig/net/wireless/tiacx/pci.c drivers/net/wireless/tiacx/pci.c
---- drivers.orig/net/wireless/tiacx/pci.c	2006-06-29 15:33:30.000000000 +0200
-+++ drivers/net/wireless/tiacx/pci.c	2006-10-09 14:24:34.000000000 +0200
-@@ -31,7 +31,6 @@
- */
- #define ACX_PCI 1
- 
--#include <linux/config.h>
- #include <linux/version.h>
- #include <linux/compiler.h> /* required for Lx 2.6.8 ?? */
- #include <linux/kernel.h>
-@@ -51,6 +50,7 @@
- #include <linux/pm.h>
- #include <linux/vmalloc.h>
- #include <linux/dma-mapping.h>
-+#include <linux/utsrelease.h>
- 
- #include "acx.h"
- 
-diff -Naupr drivers.orig/net/wireless/tiacx/usb.c drivers/net/wireless/tiacx/usb.c
---- drivers.orig/net/wireless/tiacx/usb.c	2006-06-29 15:33:30.000000000 +0200
-+++ drivers/net/wireless/tiacx/usb.c	2006-10-09 14:24:34.000000000 +0200
-@@ -45,7 +45,6 @@
- #define ACX_USB 1
- 
- #include <linux/version.h>
--#include <linux/config.h>
- #include <linux/types.h>
- #include <linux/module.h>
- #include <linux/moduleparam.h>
-diff -Naupr drivers.orig/net/wireless/tiacx/wlan.c drivers/net/wireless/tiacx/wlan.c
---- drivers.orig/net/wireless/tiacx/wlan.c	2006-06-29 15:33:04.000000000 +0200
-+++ drivers/net/wireless/tiacx/wlan.c	2006-10-09 14:24:34.000000000 +0200
-@@ -37,7 +37,6 @@
- ** http://www.linux-wlan.com
- */
- 
--#include <linux/config.h>
- #include <linux/version.h>
- #include <linux/types.h>
- #include <linux/if_arp.h>

Modified: trunk/rpms/dkms-tiacx/dkms-tiacx.spec
===================================================================
--- trunk/rpms/dkms-tiacx/dkms-tiacx.spec	2006-10-30 14:39:40 UTC (rev 4860)
+++ trunk/rpms/dkms-tiacx/dkms-tiacx.spec	2006-10-30 14:46:23 UTC (rev 4861)
@@ -8,9 +8,9 @@
 Release: 3
 License: GPL
 Group: System Environment/Kernel
-URL: http://www.kernel.org/pub/linux/kernel/people/linville/
-Source: http://www.kernel.org/pub/linux/kernel/people/linville/tiacx.tar.bz2
-Patch0: dkms-tiacx-0.4.7-build.patch
+URL: http://www.kernel.org/pub/linux/kernel/people/akpm/
+Source: tiacx-2.6.18-mm3.tar.bz2
+Patch0: tiacx-2.6.18-mm3-build.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch: noarch
 Requires: gcc
@@ -24,8 +24,8 @@
 
 
 %prep
-%setup -c
-%patch0 -p0 -b .build
+%setup -n tiacx-2.6.18-mm3
+%patch0 -p1
 
 
 %build
@@ -40,19 +40,16 @@
 
 # Kernel module sources install for dkms
 %{__mkdir_p} %{buildroot}%{_usrsrc}/%{dkms_name}-%{dkms_vers}/
-%{__cp} -a drivers/net/wireless/tiacx/{*.h,*.c,Makefile} \
-    %{buildroot}%{_usrsrc}/%{dkms_name}-%{dkms_vers}/
+%{__cp} -a * %{buildroot}%{_usrsrc}/%{dkms_name}-%{dkms_vers}/
 
 # Configuration for dkms
 %{__cat} > %{buildroot}%{_usrsrc}/%{dkms_name}-%{dkms_vers}/dkms.conf << 'EOF'
 PACKAGE_NAME=%{dkms_name}
 PACKAGE_VERSION=%{dkms_vers}
-BUILT_MODULE_NAME[0]=acx-common
-BUILT_MODULE_NAME[1]=acx-pci
-BUILT_MODULE_NAME[2]=acx-usb
+MAKE[0]="make -C ${kernel_source_dir} M=${dkms_tree}/%{dkms_name}/%{dkms_vers}/build"
+CLEAN[0]="make -C ${kernel_source_dir} M=${dkms_tree}/%{dkms_name}/%{dkms_vers}/build clean"
+BUILT_MODULE_NAME[0]=acx
 DEST_MODULE_LOCATION[0]=/kernel/drivers/net/wireless
-DEST_MODULE_LOCATION[1]=/kernel/drivers/net/wireless
-DEST_MODULE_LOCATION[2]=/kernel/drivers/net/wireless
 AUTOINSTALL="YES"
 EOF
 
@@ -75,11 +72,15 @@
 
 %files
 %defattr(-, root, root, 0755)
-%doc drivers/net/wireless/tiacx/README
+%doc Changelog README
 %{_usrsrc}/%{dkms_name}-%{dkms_vers}/
 
 
 %changelog
+* Sat Oct 28 2006 Matthias Saou <http://freshrpms.net/> 0.4.7-4
+- Switch to the sources found in the 2.6.18-mm3 kernel since the others
+  always made my test machine freeze, but these work.
+
 * Tue Oct 10 2006 Matthias Saou <http://freshrpms.net/> 0.4.7-3
 - Add the rpm release to the dkms module version, to make updating the module
   to a fixed same version work (--rpm_safe_upgrade doesn't work as advertised).

Added: trunk/rpms/dkms-tiacx/tiacx-2.6.18-mm3-build.patch
===================================================================
--- trunk/rpms/dkms-tiacx/tiacx-2.6.18-mm3-build.patch	                        (rev 0)
+++ trunk/rpms/dkms-tiacx/tiacx-2.6.18-mm3-build.patch	2006-10-30 14:46:23 UTC (rev 4861)
@@ -0,0 +1,25 @@
+diff -Naupr tiacx-2.6.18-mm3.orig/acx_struct.h tiacx-2.6.18-mm3/acx_struct.h
+--- tiacx-2.6.18-mm3.orig/acx_struct.h	2006-10-28 12:23:06.000000000 +0200
++++ tiacx-2.6.18-mm3/acx_struct.h	2006-10-28 13:19:09.000000000 +0200
+@@ -30,6 +30,9 @@
+ ** ---------------------------------------------------------------------
+ */
+ 
++#define CONFIG_ACX_PCI 1
++#define CONFIG_ACX_USB 1
++
+ /***********************************************************************
+ ** Forward declarations of types
+ */
+diff -Naupr tiacx-2.6.18-mm3.orig/Makefile tiacx-2.6.18-mm3/Makefile
+--- tiacx-2.6.18-mm3.orig/Makefile	2006-10-28 12:23:06.000000000 +0200
++++ tiacx-2.6.18-mm3/Makefile	2006-10-28 13:19:58.000000000 +0200
+@@ -1,6 +1,3 @@
+-obj-$(CONFIG_ACX) += acx.o
++obj-m += acx.o
+ 
+-acx-obj-$(CONFIG_ACX_PCI) += pci.o
+-acx-obj-$(CONFIG_ACX_USB) += usb.o
+-
+-acx-objs := wlan.o conv.o ioctl.o common.o $(acx-obj-y)
++acx-objs := wlan.o conv.o ioctl.o common.o pci.o usb.o

More information about the svn-commits mailing list