[svn] r4799 - in trunk/rpms: . dkms-ipw3945 dkms-tiacx

packagers at lists.rpmforge.net packagers at lists.rpmforge.net
Mon Oct 9 14:34:27 CEST 2006 

Author: thias
Date: 2006-10-09 14:34:26 +0200 (Mon, 09 Oct 2006)
New Revision: 4799

Added:
   trunk/rpms/dkms-ipw3945/
   trunk/rpms/dkms-ipw3945/dkms-ipw3945.spec
   trunk/rpms/dkms-ipw3945/ipw3945-1.1.0-ieee80211_api.patch
Modified:
   trunk/rpms/dkms-tiacx/dkms-tiacx-0.4.7-build.patch
   trunk/rpms/dkms-tiacx/dkms-tiacx.spec
Log:
Initial import of dkms-ipw3945 and simplify dkms-tiacx's dkms.conf.


Added: trunk/rpms/dkms-ipw3945/dkms-ipw3945.spec
===================================================================
--- trunk/rpms/dkms-ipw3945/dkms-ipw3945.spec	                        (rev 0)
+++ trunk/rpms/dkms-ipw3945/dkms-ipw3945.spec	2006-10-09 12:34:26 UTC (rev 4799)
@@ -0,0 +1,78 @@
+# $Id$
+# Authority: matthias
+# Dist: nodist
+
+%define dkms_name ipw3945
+
+Summary: Driver for Intel® PRO/Wirelss 3945 network adaptors
+Name: dkms-ipw3945
+Version: 1.1.0
+Release: 1
+License: GPL
+Group: System Environment/Kernel
+URL: http://ipw3945.sourceforge.net/
+Source: http://dl.sf.net/ipw3945/ipw3945-%{version}.tgz
+Patch0: ipw3945-1.1.0-ieee80211_api.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildArch: noarch
+Requires: gcc
+Requires: ipw3945-firmware, ipw3945d
+Requires(pre): dkms
+Requires(post): dkms
+
+%description
+Driver (Linux kernel module) for Intel® PRO/Wirelss 3945 network adaptors.
+
+
+%prep
+%setup -n ipw3945-%{version}
+%patch0 -p1 -b .ieee80211_api
+
+
+%build
+
+
+%install
+%{__rm} -rf %{buildroot}
+
+# Kernel module sources install for dkms
+%{__mkdir_p} %{buildroot}%{_usrsrc}/%{dkms_name}-%{version}/
+%{__cp} -a *.h *.c Makefile snapshot/ \
+    %{buildroot}%{_usrsrc}/%{dkms_name}-%{version}/
+
+# Configuration for dkms
+%{__cat} > %{buildroot}%{_usrsrc}/%{dkms_name}-%{version}/dkms.conf << 'EOF'
+PACKAGE_NAME=%{dkms_name}
+PACKAGE_VERSION=%{version}
+BUILT_MODULE_NAME[0]=ipw3945
+DEST_MODULE_LOCATION[0]=/kernel/drivers/net/wireless
+AUTOINSTALL="YES"
+EOF
+
+
+%clean
+%{__rm} -rf %{buildroot}
+
+
+%post
+# Add to DKMS registry
+dkms add -m %{dkms_name} -v %{version} -q --rpm_safe_upgrade
+# Build now
+dkms build -m %{dkms_name} -v %{version} -q
+dkms install -m %{dkms_name} -v %{version} -q
+
+%preun
+# Remove all versions from DKMS registry
+dkms remove -m %{dkms_name} -v %{version} --all -q --rpm_safe_upgrade
+
+
+%files
+%defattr(-, root, root, 0755)
+%doc CHANGES ISSUES LICENSE* README.ipw3945
+%{_usrsrc}/%{dkms_name}-%{version}/
+
+
+%changelog
+* Mon Oct  9 2006 Matthias Saou <http://freshrpms.net/> 1.1.0-1
+- Initial RPM release.
+


Property changes on: trunk/rpms/dkms-ipw3945/dkms-ipw3945.spec
___________________________________________________________________
Name: svn:keywords
   + Id

Added: trunk/rpms/dkms-ipw3945/ipw3945-1.1.0-ieee80211_api.patch
===================================================================
--- trunk/rpms/dkms-ipw3945/ipw3945-1.1.0-ieee80211_api.patch	                        (rev 0)
+++ trunk/rpms/dkms-ipw3945/ipw3945-1.1.0-ieee80211_api.patch	2006-10-09 12:34:26 UTC (rev 4799)
@@ -0,0 +1,23 @@
+diff -Naupr ipw3945-1.1.0.orig/ipw3945.h ipw3945-1.1.0/ipw3945.h
+--- ipw3945-1.1.0.orig/ipw3945.h	2006-07-14 20:52:16.000000000 +0200
++++ ipw3945-1.1.0/ipw3945.h	2006-10-09 14:15:26.000000000 +0200
+@@ -29,7 +29,6 @@
+ 
+ #include <linux/module.h>
+ #include <linux/moduleparam.h>
+-#include <linux/config.h>
+ #include <linux/init.h>
+ 
+ #include <linux/version.h>
+diff -Naupr ipw3945-1.1.0.orig/Makefile ipw3945-1.1.0/Makefile
+--- ipw3945-1.1.0.orig/Makefile	2006-07-14 17:34:55.000000000 +0200
++++ ipw3945-1.1.0/Makefile	2006-10-09 14:15:11.000000000 +0200
+@@ -90,7 +90,7 @@ IEEE80211_VER := $(shell $(DIR)/snapshot
+ IEEE80211_API := $(shell sed -ne "s:\#define.*IEEE80211_API_VERSION[^0-9]*\([0-9]*\).*:\1:p" $(IEEE80211_PATH)net/ieee80211.h)
+ 
+ ifeq ($(IEEE80211_API),)
+-	IEEE80211_API := $(shell [[ "$(IEEE80211_VER)" == 1.1.14* ]] && \
++	IEEE80211_API := $(shell [[ "$(IEEE80211_VER)" == *1.1.13* ]] && \
+ 		{ echo "2" ; } || \
+ 		{ ver=$(IEEE80211_VER); ver=$${ver\#*.} ; echo $${ver%.*} ; })
+ 	EXTRA_CFLAGS += -DIEEE80211_API_VERSION=$(IEEE80211_API)

Modified: trunk/rpms/dkms-tiacx/dkms-tiacx-0.4.7-build.patch
===================================================================
--- trunk/rpms/dkms-tiacx/dkms-tiacx-0.4.7-build.patch	2006-10-09 11:43:54 UTC (rev 4798)
+++ trunk/rpms/dkms-tiacx/dkms-tiacx-0.4.7-build.patch	2006-10-09 12:34:26 UTC (rev 4799)
@@ -1,6 +1,6 @@
 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 13:12:03.000000000 +0200
++++ drivers/net/wireless/tiacx/common.c	2006-10-09 14:24:34.000000000 +0200
 @@ -30,7 +30,6 @@
  ** ---------------------------------------------------------------------
  */
@@ -11,7 +11,7 @@
  #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 13:12:09.000000000 +0200
++++ drivers/net/wireless/tiacx/ioctl.c	2006-10-09 14:24:34.000000000 +0200
 @@ -30,7 +30,6 @@
  ** ---------------------------------------------------------------------
  */
@@ -20,9 +20,26 @@
  #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 13:12:54.000000000 +0200
++++ drivers/net/wireless/tiacx/pci.c	2006-10-09 14:24:34.000000000 +0200
 @@ -31,7 +31,6 @@
  */
  #define ACX_PCI 1
@@ -41,7 +58,7 @@
  
 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 13:13:01.000000000 +0200
++++ drivers/net/wireless/tiacx/usb.c	2006-10-09 14:24:34.000000000 +0200
 @@ -45,7 +45,6 @@
  #define ACX_USB 1
  
@@ -52,7 +69,7 @@
  #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 13:13:08.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
  */

Modified: trunk/rpms/dkms-tiacx/dkms-tiacx.spec
===================================================================
--- trunk/rpms/dkms-tiacx/dkms-tiacx.spec	2006-10-09 11:43:54 UTC (rev 4798)
+++ trunk/rpms/dkms-tiacx/dkms-tiacx.spec	2006-10-09 12:34:26 UTC (rev 4799)
@@ -1,12 +1,13 @@
 # $Id$
 # Authority: matthias
+# Dist: nodist
 
 %define dkms_name tiacx
 
 Summary: Driver for Texas Instruments' ACX100/ACX111 wireless network chips
 Name: dkms-tiacx
 Version: 0.4.7
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Kernel
 URL: http://www.kernel.org/pub/linux/kernel/people/linville/
@@ -44,8 +45,6 @@
 %{__cat} > %{buildroot}%{_usrsrc}/%{dkms_name}-%{version}/dkms.conf << 'EOF'
 PACKAGE_NAME=%{dkms_name}
 PACKAGE_VERSION=%{version}
-MAKE[0]="make -C ${kernel_source_dir} M=${dkms_tree}/%{dkms_name}/%{version}/build CONFIG_ACX_PCI=m CONFIG_ACX_USB=m"
-CLEAN[0]="make -C ${kernel_source_dir} M=${dkms_tree}/%{dkms_name}/%{version}/build CONFIG_ACX_PCI=m CONFIG_ACX_USB=m clean"
 BUILT_MODULE_NAME[0]=acx-common
 BUILT_MODULE_NAME[1]=acx-pci
 BUILT_MODULE_NAME[2]=acx-usb
@@ -79,6 +78,9 @@
 
 
 %changelog
+* Mon Oct  9 2006 Matthias Saou <http://freshrpms.net/> 0.4.7-2
+- Further patch Makefile to simplify the dkms.conf entries.
+
 * Mon Oct  9 2006 Matthias Saou <http://freshrpms.net/> 0.4.7-1
 - Initial RPM release.

More information about the svn-commits mailing list