Author: nvieville Update of /cvs/nonfree/rpms/wl-kmod/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv13304 Modified Files: .cvsignore sources wl-kmod.spec Added Files: wl-kmod-001_wext_workaround.patch Removed Files: wl-kmod-001_license.patch wl-kmod-002_wext_workaround.patch wl-kmod-003_kernel_3.8.patch wl-kmod-004_kernel_3.15.patch wl-kmod-005_gcc_4.9.patch wl-kmod-006_kernel_3.16.patch wl-kmod-007_kernel_3.17.patch wl-kmod-008_kernel_3.18.patch wl-kmod-009_kernel_3.18_null_pointer.patch wl-kmod-010_kernel_4.0.patch wl-kmod-011_kernel_4.2.patch Log Message: * Wed Oct 14 2015 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr&gt; - 6.30.223.271-1 - Upstream update to 6.30.223.271 - Patches cleaned-up and removed wl-kmod-001_wext_workaround.patch: Makefile | 14 ++++++++++++++ 1 file changed, 14 insertions(+) --- NEW FILE wl-kmod-001_wext_workaround.patch --- diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_271.orig/Makefile hybrid-v35_64-nodebug-pcoem-6_30_223_271/Makefile --- hybrid-v35_64-nodebug-pcoem-6_30_223_271.orig/Makefile 2015-09-19 00:47:30.000000000 +0200 +++ hybrid-v35_64-nodebug-pcoem-6_30_223_271/Makefile 2015-10-14 18:30:11.979644333 +0200 @@ -18,6 +18,8 @@ # # $Id: Makefile_kbuild_portsrc 580354 2015-08-18 23:42:37Z $ +API_ETC_FILE := /etc/akmods/akmod-wl/api + ifneq ($(KERNELRELEASE),) LINUXVER_GOODFOR_CFG80211:=$(strip $(shell \ @@ -36,6 +38,18 @@ fi \ )) + API_FILE:=$(strip $(shell \ + if [ -r "$(API_ETC_FILE)" ]; then \ + echo TRUE; \ + else \ + echo FALSE; \ + fi \ + )) + + ifeq ($(API_FILE), TRUE) + include $(API_ETC_FILE) + endif + ifneq ($(API),) ifeq ($(API), CFG80211) APICHOICE := FORCE_CFG80211 Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/wl-kmod/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 15 Jul 2014 21:38:56 -0000 1.13 +++ .cvsignore 14 Oct 2015 18:50:16 -0000 1.14 @@ -1,3 +1,3 @@ -hybrid-v35_64-nodebug-pcoem-6_30_223_248.tar.gz -hybrid-v35-nodebug-pcoem-6_30_223_248.tar.gz +hybrid-v35_64-nodebug-pcoem-6_30_223_271.tar.gz +hybrid-v35-nodebug-pcoem-6_30_223_271.tar.gz wl-kmod-kmodtool-excludekernel-filterfile Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/wl-kmod/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 15 Jul 2014 21:38:56 -0000 1.14 +++ sources 14 Oct 2015 18:50:16 -0000 1.15 @@ -1,3 +1,3 @@ -0237917f75d121589ec16a44eac5f5b0 hybrid-v35_64-nodebug-pcoem-6_30_223_248.tar.gz -e048154b3f4c7ad6bee36cab5b37486d hybrid-v35-nodebug-pcoem-6_30_223_248.tar.gz +115903050c41d466161784d4c843f4f9 hybrid-v35_64-nodebug-pcoem-6_30_223_271.tar.gz +4e75f4cb7d87f690f9659ffc478495f0 hybrid-v35-nodebug-pcoem-6_30_223_271.tar.gz 5df50b59ac8a311c81c9ad569ffc2225 wl-kmod-kmodtool-excludekernel-filterfile Index: wl-kmod.spec =================================================================== RCS file: /cvs/nonfree/rpms/wl-kmod/devel/wl-kmod.spec,v retrieving revision 1.132 retrieving revision 1.133 diff -u -r1.132 -r1.133 --- wl-kmod.spec 6 Oct 2015 09:21:19 -0000 1.132 +++ wl-kmod.spec 14 Oct 2015 18:50:16 -0000 1.133 @@ -3,29 +3,19 @@ # "buildforkernels newest" macro for just that build; immediately after # queuing that build enable the macro again for subsequent builds; that way # a new akmod package will only get build when a new one is actually needed -%global buildforkernels newest +%global buildforkernels current Name: wl-kmod -Version: 6.30.223.248 -Release: 9%{?dist}.3 +Version: 6.30.223.271 +Release: 1%{?dist} Summary: Kernel module for Broadcom wireless devices Group: System Environment/Kernel License: Redistributable, no modification permitted URL: https://www.broadcom.com/support/?gid=1 -Source0: https://www.broadcom.com/docs/linux_sta/hybrid-v35-nodebug-pcoem-6_30_223... -Source1: https://www.broadcom.com/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-6_30_... +Source0: https://www.broadcom.com/docs/linux_sta/hybrid-v35-nodebug-pcoem-6_30_223... +Source1: https://www.broadcom.com/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-6_30_... 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.15.patch -Patch4: wl-kmod-005_gcc_4.9.patch -Patch5: wl-kmod-006_kernel_3.16.patch -Patch6: wl-kmod-007_kernel_3.17.patch -Patch7: wl-kmod-008_kernel_3.18.patch -Patch8: wl-kmod-009_kernel_3.18_null_pointer.patch -Patch9: wl-kmod-010_kernel_4.0.patch -Patch10: wl-kmod-011_kernel_4.2.patch +Patch0: wl-kmod-001_wext_workaround.patch BuildRequires: %{_bindir}/kmodtool @@ -64,17 +54,7 @@ %else tar xzf %{SOURCE1} %endif -%patch0 -p1 -b .license -%patch1 -p1 -b .wext_workaround.patch -%patch2 -p1 -b .kernel-3.8 -%patch3 -p1 -b .kernel-3.15 -%patch4 -p1 -b .gcc-4.9 -%patch5 -p1 -b .kernel-3.16 -%patch6 -p1 -b .kernel-3.17 -%patch7 -p1 -b .kernel-3.18 -%patch8 -p1 -b .kernel-3.18_null_pointer -%patch9 -p1 -b .kernel-4.0 -%patch10 -p1 -b .kernel-4.2 +%patch0 -p1 -b .wext_workaround.patch popd for kernel_version in %{?kernel_versions} ; do @@ -104,6 +84,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Oct 14 2015 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr&gt; - 6.30.223.271-1 +- Upstream update to 6.30.223.271 +- Patches cleaned-up and removed + * Tue Oct 06 2015 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 6.30.223.248-9.3 - Rebuilt for kernel --- wl-kmod-001_license.patch DELETED --- --- wl-kmod-002_wext_workaround.patch DELETED --- --- wl-kmod-003_kernel_3.8.patch DELETED --- --- wl-kmod-004_kernel_3.15.patch DELETED --- --- wl-kmod-005_gcc_4.9.patch DELETED --- --- wl-kmod-006_kernel_3.16.patch DELETED --- --- wl-kmod-007_kernel_3.17.patch DELETED --- --- wl-kmod-008_kernel_3.18.patch DELETED --- --- wl-kmod-009_kernel_3.18_null_pointer.patch DELETED --- --- wl-kmod-010_kernel_4.0.patch DELETED --- --- wl-kmod-011_kernel_4.2.patch DELETED ---