[wl-kmod] Fix typo in spec file for RHEL 8.x Add patch to fix gcc fallthrough warning Updated URLs to new Broa

commit a3864ab57270d76d963ce87855be48047175c0c0 Author: Nicolas Viéville <nicolas.vieville(a)uphf.fr&gt; Date: Wed Oct 16 17:00:19 2019 +0200 Fix typo in spec file for RHEL 8.x Add patch to fix gcc fallthrough warning Updated URLs to new Broadcom WEB site wl-kmod-017_fix_gcc_fallthrough_warning.patch | 11 +++++++++++ wl-kmod.spec | 12 +++++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) --- diff --git a/wl-kmod-017_fix_gcc_fallthrough_warning.patch b/wl-kmod-017_fix_gcc_fallthrough_warning.patch new file mode 100644 index 0000000..8bf91bd --- /dev/null +++ b/wl-kmod-017_fix_gcc_fallthrough_warning.patch @@ -0,0 +1,11 @@ +diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_271.orig/src/wl/sys/wl_cfg80211_hybrid.c hybrid-v35_64-nodebug-pcoem-6_30_223_271/src/wl/sys/wl_cfg80211_hybrid.c +--- hybrid-v35_64-nodebug-pcoem-6_30_223_271.orig/src/wl/sys/wl_cfg80211_hybrid.c 2019-06-01 14:37:25.675650990 +0200 ++++ hybrid-v35_64-nodebug-pcoem-6_30_223_271/src/wl/sys/wl_cfg80211_hybrid.c 2019-10-16 16:33:57.319456346 +0200 +@@ -856,6 +856,7 @@ + break; + case NL80211_AUTHTYPE_NETWORK_EAP: + WL_DBG(("network eap\n")); ++ // fall through + default: + val = 2; + WL_ERR(("invalid auth type (%d)\n", sme->auth_type)); diff --git a/wl-kmod.spec b/wl-kmod.spec index e3ab7b8..8ee01c7 100644 --- a/wl-kmod.spec +++ b/wl-kmod.spec @@ -10,11 +10,11 @@ Name: wl-kmod Version: 6.30.223.271 -Release: 29%{?dist} +Release: 30%{?dist} Summary: Kernel module for Broadcom wireless devices Group: System Environment/Kernel License: Redistributable, no modification permitted -URL: https://www.broadcom.com/support/download-search/?pf=Wireless+LAN+Infrast... +URL: https://www.broadcom.com/support/download-search?pg=&pf=Wireless+LAN/... Source0: https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35-no... Source1: https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35_64... Source11: wl-kmod-kmodtool-excludekernel-filterfile @@ -34,6 +34,7 @@ Patch12: wl-kmod-013_gcc8_fix_bounds_check_warnings.patch Patch13: wl-kmod-014_kernel_read_pos_increment_fix.patch Patch14: wl-kmod-015_kernel_5.1_get_ds_removed.patch Patch15: wl-kmod-016_fix_unsupported_mesh_point.patch +Patch16: wl-kmod-017_fix_gcc_fallthrough_warning.patch # needed for plague to make sure it builds for i586 and i686 ExclusiveArch: i686 x86_64 @@ -90,6 +91,7 @@ pushd %{name}-%{version}-src %patch13 -p1 -b .kernel_read_pos_increment_fix %patch14 -p1 -b .kernel_5.1_get_ds_removed %patch15 -p1 -b .fix_unsupported_mesh_point +%patch16 -p1 -b .fix_gcc_fallthrough_warning.patch # Manual patching to build for RHEL - inspired by CentOS wl-kmod.spec # Actually works for RHEL 6.x and 7.x @@ -243,7 +245,6 @@ pushd %{name}-%{version}-src %if %{kvr} == 80 # Only apply to EL 8.0 point release # > No changes currently needed for EL 8.0 point release - fi %endif %if %{kvr} >= 80 # Apply to EL 8.0 point release and later @@ -280,6 +281,11 @@ chmod 0755 $RPM_BUILD_ROOT%{kmodinstdir_prefix}*%{kmodinstdir_postfix}/* || : rm -rf $RPM_BUILD_ROOT %changelog +* Wed Oct 16 2019 Nicolas Viéville <nicolas.vieville(a)uphf.fr&gt; - 6.30.223.271-30 +- Fix typo in spec file for RHEL 8.x +- Add patch to fix gcc fallthrough warning +- Updated URLs to new Broadcom WEB site + * Tue Sep 24 2019 Nicolas Viéville <nicolas.vieville(a)uphf.fr&gt; - 6.30.223.271-29 - Reworked patch to workaround RHBZ#1703745 and RFBZ#5245 - Rework SPEC file in order to build for RHEL 8.x