Author: nvieville
Update of /cvs/nonfree/rpms/wl-kmod/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv8699
Modified Files:
.cvsignore sources wl-kmod-001_license.patch
wl-kmod-002_wext_workaround.patch wl-kmod-003_kernel_3.8.patch
wl-kmod.spec
Removed Files:
wl-kmod-004_kernel_3.10.patch wl-kmod-005_devinit_late.patch
Log Message:
* Tue Jul 15 2014 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> -
6.30.223.248-1
- Upstream update to 6.30.223.248
- Patches cleaned-up and removed
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-19/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore 15 Sep 2013 15:06:25 -0000 1.12
+++ .cvsignore 17 Jul 2014 20:05:39 -0000 1.13
@@ -1,3 +1,3 @@
-hybrid-v35_64-nodebug-pcoem-6_30_223_141.tar.gz
-hybrid-v35-nodebug-pcoem-6_30_223_141.tar.gz
+hybrid-v35_64-nodebug-pcoem-6_30_223_248.tar.gz
+hybrid-v35-nodebug-pcoem-6_30_223_248.tar.gz
wl-kmod-kmodtool-excludekernel-filterfile
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-19/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources 15 Sep 2013 15:06:25 -0000 1.13
+++ sources 17 Jul 2014 20:05:39 -0000 1.14
@@ -1,3 +1,3 @@
-039f33d2a3ff2890e42717092d1eb0c4 hybrid-v35_64-nodebug-pcoem-6_30_223_141.tar.gz
-f4809d9149e8e60ef95021ae93a4bf21 hybrid-v35-nodebug-pcoem-6_30_223_141.tar.gz
+0237917f75d121589ec16a44eac5f5b0 hybrid-v35_64-nodebug-pcoem-6_30_223_248.tar.gz
+e048154b3f4c7ad6bee36cab5b37486d hybrid-v35-nodebug-pcoem-6_30_223_248.tar.gz
5df50b59ac8a311c81c9ad569ffc2225 wl-kmod-kmodtool-excludekernel-filterfile
wl-kmod-001_license.patch:
wl_linux.c | 2 ++
1 file changed, 2 insertions(+)
Index: wl-kmod-001_license.patch
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-19/wl-kmod-001_license.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wl-kmod-001_license.patch 15 Sep 2013 15:06:25 -0000 1.1
+++ wl-kmod-001_license.patch 17 Jul 2014 20:05:39 -0000 1.2
@@ -1,7 +1,7 @@
-diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_141.orig/src/wl/sys/wl_linux.c
hybrid-v35_64-nodebug-pcoem-6_30_223_141/src/wl/sys/wl_linux.c
---- hybrid-v35_64-nodebug-pcoem-6_30_223_141.orig/src/wl/sys/wl_linux.c 2013-08-01
08:52:22.000000000 +0200
-+++ hybrid-v35_64-nodebug-pcoem-6_30_223_141/src/wl/sys/wl_linux.c 2013-09-14
16:06:43.404896532 +0200
-@@ -179,6 +179,8 @@
+diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_248.orig/src/wl/sys/wl_linux.c
hybrid-v35_64-nodebug-pcoem-6_30_223_248/src/wl/sys/wl_linux.c
+--- hybrid-v35_64-nodebug-pcoem-6_30_223_248.orig/src/wl/sys/wl_linux.c 2014-06-26
12:42:08.000000000 +0200
++++ hybrid-v35_64-nodebug-pcoem-6_30_223_248/src/wl/sys/wl_linux.c 2014-07-15
12:37:40.535352826 +0200
+@@ -156,6 +156,8 @@
static void wl_report_radio_state(wl_info_t *wl);
#endif
wl-kmod-002_wext_workaround.patch:
Makefile | 14 ++++++++++++++
1 file changed, 14 insertions(+)
Index: wl-kmod-002_wext_workaround.patch
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-19/wl-kmod-002_wext_workaround.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wl-kmod-002_wext_workaround.patch 15 Sep 2013 15:06:25 -0000 1.1
+++ wl-kmod-002_wext_workaround.patch 17 Jul 2014 20:05:39 -0000 1.2
@@ -1,6 +1,6 @@
-diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_141.orig/Makefile
hybrid-v35_64-nodebug-pcoem-6_30_223_141/Makefile
---- hybrid-v35_64-nodebug-pcoem-6_30_223_141.orig/Makefile 2013-08-01 08:52:22.000000000
+0200
-+++ hybrid-v35_64-nodebug-pcoem-6_30_223_141/Makefile 2013-09-14 17:56:21.206749114
+0200
+diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_248.orig/Makefile
hybrid-v35_64-nodebug-pcoem-6_30_223_248/Makefile
+--- hybrid-v35_64-nodebug-pcoem-6_30_223_248.orig/Makefile 2014-06-26 12:42:08.000000000
+0200
++++ hybrid-v35_64-nodebug-pcoem-6_30_223_248/Makefile 2014-07-15 14:24:54.607152512
+0200
@@ -18,6 +18,8 @@
#
# $Id$
wl-kmod-003_kernel_3.8.patch:
wl_linux.c | 4 ++++
1 file changed, 4 insertions(+)
Index: wl-kmod-003_kernel_3.8.patch
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-19/wl-kmod-003_kernel_3.8.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wl-kmod-003_kernel_3.8.patch 15 Sep 2013 15:06:25 -0000 1.1
+++ wl-kmod-003_kernel_3.8.patch 17 Jul 2014 20:05:39 -0000 1.2
@@ -1,15 +1,15 @@
-diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_141.orig/src/wl/sys/wl_linux.c
hybrid-v35_64-nodebug-pcoem-6_30_223_141/src/wl/sys/wl_linux.c
---- hybrid-v35_64-nodebug-pcoem-6_30_223_141.orig/src/wl/sys/wl_linux.c 2013-09-14
16:06:43.404896000 +0200
-+++ hybrid-v35_64-nodebug-pcoem-6_30_223_141/src/wl/sys/wl_linux.c 2013-09-14
18:22:15.929527944 +0200
-@@ -912,7 +912,11 @@
- pci_set_drvdata(pdev, NULL);
- }
+diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_248.orig/src/wl/sys/wl_linux.c
hybrid-v35_64-nodebug-pcoem-6_30_223_248/src/wl/sys/wl_linux.c
+--- hybrid-v35_64-nodebug-pcoem-6_30_223_248.orig/src/wl/sys/wl_linux.c 2014-07-15
12:37:40.535352000 +0200
++++ hybrid-v35_64-nodebug-pcoem-6_30_223_248/src/wl/sys/wl_linux.c 2014-07-15
16:34:34.359230514 +0200
+@@ -880,7 +880,11 @@
+ static SIMPLE_DEV_PM_OPS(wl_pm_ops, wl_suspend, wl_resume);
+ #endif
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
static struct pci_driver wl_pci_driver = {
+#else
+static struct pci_driver wl_pci_driver __refdata = {
+#endif
- name: "wl",
- probe: wl_pci_probe,
- suspend: wl_suspend,
+ .name = "wl",
+ .probe = wl_pci_probe,
+ .remove = __devexit_p(wl_remove),
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-19/wl-kmod.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- wl-kmod.spec 8 Jul 2014 19:40:57 -0000 1.128
+++ wl-kmod.spec 17 Jul 2014 20:05:39 -0000 1.129
@@ -6,20 +6,18 @@
%global buildforkernels current
Name: wl-kmod
-Version: 6.30.223.141
-Release: 2%{?dist}
+Version: 6.30.223.248
+Release: 1%{?dist}
Summary: Kernel module for Broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
URL:
http://www.broadcom.com/support/802.11/linux_sta.php
-Source0:
http://www.broadcom.com/docs/linux_sta/hybrid-v35-nodebug-pcoem-6_30_223_...
-Source1:
http://www.broadcom.com/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-6_30_2...
+Source0:
http://www.broadcom.com/docs/linux_sta/hybrid-v35-nodebug-pcoem-6_30_223_...
+Source1:
http://www.broadcom.com/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-6_30_2...
Source11: wl-kmod-kmodtool-excludekernel-filterfile
Patch0: wl-kmod-001_license.patch
Patch1: wl-kmod-002_wext_workaround.patch
Patch2: wl-kmod-003_kernel_3.8.patch
-Patch3: wl-kmod-004_kernel_3.10.patch
-Patch4: wl-kmod-005_devinit_late.patch
BuildRequires: %{_bindir}/kmodtool
@@ -61,8 +59,6 @@
%patch0 -p1 -b .license
%patch1 -p1 -b .wext_workaround.patch
%patch2 -p1 -b .kernel-3.8
-%patch3 -p1 -b .kernel-3.10
-%patch4 -p1 -b .devinit_late
popd
for kernel_version in %{?kernel_versions} ; do
@@ -92,6 +88,10 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Jul 15 2014 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> -
6.30.223.248-1
+- Upstream update to 6.30.223.248
+- Patches cleaned-up and removed
+
* Tue Jul 08 2014 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> -
6.30.223.141-2
- Added late patch for __devinit since kernel 3.8
--- wl-kmod-004_kernel_3.10.patch DELETED ---
--- wl-kmod-005_devinit_late.patch DELETED ---