[wl-kmod/el7] (86 commits) ...Merge branch 'master' into el7
by Nicolas Viéville
Summary of changes:
5f10fa1... * Tue Apr 22 2014 Nicolas Viéville <nicolas.vieville@univ- (*)
4a2f6a4... * Tue Apr 22 2014 Nicolas Viéville <nicolas.vieville@univ- (*)
1c077ec... * Thu May 08 2014 Nicolas Viéville <nicolas.vieville@univ- (*)
05e4887... * Tue Jul 08 2014 Nicolas Viéville <nicolas.vieville@univ- (*)
52462bb... * Tue Jul 15 2014 Nicolas Viéville <nicolas.vieville@univ- (*)
c60ce12... * Wed Sep 10 2014 Nicolas Viéville <nicolas.vieville@univ- (*)
6e42af8... * Fri Oct 03 2014 Nicolas Viéville <nicolas.vieville@univ- (*)
04bbba9... * Mon Oct 27 2014 Nicolas Viéville <nicolas.vieville@univ- (*)
9306a06... * Fri Dec 05 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.3 (*)
e599045... * Sun Dec 14 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.3 (*)
f553c89... * Fri Dec 19 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.3 (*)
f468c8c... * Sat Jan 10 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 6.3 (*)
469b0b9... * Thu Jan 15 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 6.3 (*)
b358bfd... * Wed Jan 21 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 6.3 (*)
bacaafd... * Mon Feb 02 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 6.3 (*)
6299374... * Wed Feb 04 2015 Nicolas Viéville <nicolas.vieville@univ- (*)
6d05bf0... * Sun Feb 08 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 6.3 (*)
47df8fd... * Sat Feb 14 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 6.3 (*)
3a1f770... * Fri Mar 06 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 6.3 (*)
0b00685... * Tue Mar 10 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 6.3 (*)
99052b9... * Sat Mar 21 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 6.3 (*)
1a9b954... * Mon Mar 23 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 6.3 (*)
4075bae... Add patch for 4.0 kernel (*)
9e05d3d... * Wed Mar 25 2015 Nicolas Viéville <nicolas.vieville@univ- (*)
a67b42d... Build for kernels (*)
3bb52df... Rebuild akmod and kmod for current kernel (*)
7139a4e... Rebuilt for current (*)
eb44b05... * Fri Mar 27 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 6.3 (*)
6f4a461... * Mon Mar 30 2015 Nicolas Chauvet <kwizart(a)gmail.com> - Reb (*)
add5df6... Fixup (*)
1903522... * Wed Apr 15 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 6.3 (*)
1032b39... * Wed Apr 22 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 6.3 (*)
7af4493... * Sat May 02 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 6.3 (*)
608cbaa... * Sat May 09 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 6.3 (*)
c3e7ebb... * Wed May 13 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 6.3 (*)
09f727d... * Wed May 20 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 6.3 (*)
d2fec38... * Wed May 20 2015 Nicolas Viéville <nicolas.vieville@univ- (*)
2ead0a2... * Sun May 24 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 6.3 (*)
806b12f... * Tue Jun 02 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 6.3 (*)
7712fb6... * Wed Jun 10 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 6.3 (*)
ff4c28b... * Sun Jun 28 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 6.3 (*)
9aee401... * Thu Jul 02 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 6.3 (*)
d191118... * Thu Jul 16 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 6.3 (*)
67cc5e8... * Fri Jul 24 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 6.3 (*)
31e6bfd... * Thu Jul 30 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 6.3 (*)
304d015... * Fri Aug 07 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 6.3 (*)
96e61bc... * Thu Aug 13 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 6.3 (*)
264c757... * Fri Aug 21 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 6.3 (*)
c2d4fe9... * Wed Aug 26 2015 Nicolas Viéville <nicolas.vieville@univ- (*)
c3cafc3... * Wed Sep 16 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 6.3 (*)
b36570e... * Wed Sep 23 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 6.3 (*)
5233bfe... * Tue Oct 06 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 6.3 (*)
a61ad02... * Wed Oct 14 2015 Nicolas Viéville <nicolas.vieville@univ- (*)
f95c1f4... * Sat Oct 17 2015 Nicolas Viéville <nicolas.vieville@univ- (*)
1a7b119... * Sun Oct 18 2015 Nicolas Viéville <nicolas.vieville@univ- (*)
a220b3b... * Mon Dec 21 2015 Nicolas Viéville <nicolas.vieville@univ- (*)
cce41ee... * Mon Dec 21 2015 Nicolas Viéville <nicolas.vieville@univ- (*)
091826e... Merge branch 'master' of https://github.com/NVieville/wl-km (*)
3f4b4e0... Fixup don't use lookaside cache for this file (*)
c0f022c... Add patch to replace IEEE80211_BAND_x macros with NL80211_B (*)
9da558c... Re-add sources (rfpkg new-sources ...) (*)
7aab64d... Fix 4.7 kernel patch (*)
69c510c... Add patch for kernel >= 4.8 - add cfg80211_scan_info struct (*)
6ecf276... Add patch to fix kernel warnings - thanks to Adrien Bustany (*)
573adaf... - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass (*)
55ac30b... Add patch for kernel >= 4.11 - remove last_rx reference in (*)
fda5796... Merge branch 'master' of ssh://pkgs.rpmfusion.org/nonfree/w (*)
43b389a... Add patch for kernel >= 4.11 - remove last_rx reference in (*)
4cc9d1f... Fix build Release tag (*)
cbba1b2... Fix build Release tag (*)
16da630... Add akmod-wl AkmodsBuildRequires and fix package BuildRequi (*)
37c0144... Add akmod-wl AkmodsBuildRequires and fix package BuildRequi (*)
a702359... Merge branch 'f26' in order to be in sync with master again (*)
b7c66d6... Add patch for kernel >= 4.12 - add cfg80211_roam_info struc (*)
3cf1535... Rework patch for kernel >= 4.12 - thanks to Tim Thomas (*)
23c78fc... - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass (*)
c1d4c41... Add patch for kernel >= 4.14 from Olaf Hering - thanks to T (*)
022d878... Add patch for kernel >= 4.15 - fix timer issue - rfbz#4798 (*)
c4ae3c9... - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass (*)
ef3d6e6... Add patch for GCC >= 8 - fix strncpy truncation compiler wa (*)
15be156... - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass (*)
8de95a7... - Rebuilt for Fedora 29 Mass Rebuild binutils issue (*)
a221a2c... Don't increment position if not needed after kernel_read fu (*)
7b623bd... - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass (*)
6cbc8c5... Rework SPEC file in order to build for RHEL 6.x and 7.x Reb (*)
d1e3150... Merge branch 'master' into el7
(*) This commit already existed in another branch; no separate mail sent
5 years
[broadcom-wl/el7: 15/15] Merge branch 'master' into el7
by Nicolas Viéville
commit ee406cd725ecd1f466b2a4eee496176f441802d7
Merge: 23128f7 8d2fecb
Author: Nicolas Viéville <nicolas.vieville(a)uphf.fr>
Date: Sun Apr 7 18:57:16 2019 +0200
Merge branch 'master' into el7
.gitignore | 8 +-
broadcom-wl-001_license.patch | 12 --
broadcom-wl-blacklist.conf | 6 +
broadcom-wl.spec | 148 +++++++++++++++++------
com.broadcom.wireless.hybrid.driver.metainfo.xml | 51 ++++++++
generate-modalias-metadata.py | 74 ++++++++++++
sources | 6 +-
7 files changed, 252 insertions(+), 53 deletions(-)
---
5 years
[wl-kmod] Rework SPEC file in order to build for RHEL 6.x and 7.x Rebuilt for akmods-ostree-post scriptlet
by Nicolas Viéville
commit 6cbc8c5c465bdf11cf9be67c22fbb3304ef74b0c
Author: Nicolas Viéville <nicolas.vieville(a)uphf.fr>
Date: Sun Apr 7 18:15:04 2019 +0200
Rework SPEC file in order to build for RHEL 6.x and 7.x
Rebuilt for akmods-ostree-post scriptlet
wl-kmod.spec | 146 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 145 insertions(+), 1 deletion(-)
---
diff --git a/wl-kmod.spec b/wl-kmod.spec
index 20a1edd..e7ac78d 100644
--- a/wl-kmod.spec
+++ b/wl-kmod.spec
@@ -8,7 +8,7 @@
Name: wl-kmod
Version: 6.30.223.271
-Release: 22%{?dist}
+Release: 23%{?dist}
Summary: Kernel module for Broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -84,6 +84,146 @@ pushd %{name}-%{version}-src
%patch11 -p1 -b .kernel_4.15_new_timer
%patch12 -p1 -b .gcc8_fix_bounds_check_warnings
%patch13 -p1 -b .kernel_read_pos_increment_fix
+
+# Manual patching to build for RHEL - inspired by CentOS wl-kmod.spec
+# Actually works for RHEL 6.x and 7.x
+%if 0%{?rhel} == 6
+ # Define kvl (linux) & kvr (release) for use in "patching" logical
+ %define kvl %(echo %{kernel_versions} | cut -d"-" -f1)
+ %define kvr %(echo %{kernel_versions} | cut -d"-" -f2 | cut -d"." -f1)
+
+ # Perform "patching" edits to the src/wl/sys/wl_cfg80211_hybrid.c file.
+ # Note: Using this method, as opposed to making a patch, allows
+ # the src.rpm to be compiled under various point release kernels.
+ # Note: Use [ >][>=] where both >= & > are present
+ %if "%{kvl}" == "2.6.32"
+ %if %{kvr} >= 71
+ # Apply to EL 6.0 point release and later
+ %{__sed} -i 's/ >= KERNEL_VERSION(3, 6, 0)/ >= KERNEL_VERSION(2, 6, 32)/' src/wl/sys/wl_cfg80211_hybrid.c
+ %endif
+ %if %{kvr} >= 131
+ # Apply to EL 6.1 point release and later (2.6.32-131.0.15)
+ # > No changes currently needed for EL 6.1 point release
+ %endif
+ %if %{kvr} >= 220
+ # Apply to EL 6.2 point release and later
+ # > No changes currently needed for EL 6.2 point release
+ %endif
+ %if %{kvr} >= 279
+ # Apply to EL 6.3 point release and later
+ %{__sed} -i 's/ >= KERNEL_VERSION(2, 6, 36)/ >= KERNEL_VERSION(2, 6, 32)/' src/wl/sys/wl_cfg80211_hybrid.c
+ %{__sed} -i 's/ >= KERNEL_VERSION(2, 6, 37)/ >= KERNEL_VERSION(2, 6, 32)/' src/wl/sys/wl_cfg80211_hybrid.c
+ %{__sed} -i 's/ >= KERNEL_VERSION(2, 6, 38)/ >= KERNEL_VERSION(2, 6, 32)/' src/wl/sys/wl_cfg80211_hybrid.c
+ %{__sed} -i 's/ > KERNEL_VERSION(2, 6, 39)/ > KERNEL_VERSION(2, 6, 31)/' src/wl/sys/wl_cfg80211_hybrid.c
+ %{__sed} -i 's/ >= KERNEL_VERSION(2, 6, 39)/ >= KERNEL_VERSION(2, 6, 32)/' src/wl/sys/wl_cfg80211_hybrid.c
+ %{__sed} -i 's/ >= KERNEL_VERSION(3, 1, 0)/ >= KERNEL_VERSION(2, 6, 32)/' src/wl/sys/wl_cfg80211_hybrid.c
+ %endif
+ %if %{kvr} == 358
+ # Only apply to EL 6.4 point release
+ if $(grep -q "/lib/modules/kabi/kabi_whitelist" /usr/lib/rpm/redhat/find-requires.ksyms 2>/dev/null) ; then
+ %{__sed} -i 's@/lib/modules/kabi/kabi_whitelist@/lib/modules/kabi-current/kabi_whitelist@g' /usr/lib/rpm/redhat/find-requires.ksyms
+ fi
+ %endif
+ %if %{kvr} >= 358
+ # Apply to EL 6.4 point release and later
+ # > No changes currently needed for EL 6.4 point release
+ %endif
+ %if %{kvr} == 431
+ # Only apply to EL 6.5 point release
+ if $(grep -q "/lib/modules/kabi/kabi_whitelist" /usr/lib/rpm/redhat/find-requires.ksyms 2>/dev/null) ; then
+ %{__sed} -i 's@/lib/modules/kabi/kabi_whitelist@/lib/modules/kabi-current/kabi_whitelist@g' /usr/lib/rpm/redhat/find-requires.ksyms
+ fi
+ %endif
+ %if %{kvr} >= 431
+ # Apply to EL 6.5 point release and later
+ %{__sed} -i 's/ >= KERNEL_VERSION(3, 8, 0)/ >= KERNEL_VERSION(2, 6, 32)/' src/wl/sys/wl_cfg80211_hybrid.c
+ %{__sed} -i 's/ >= KERNEL_VERSION(3, 9, 0)/ >= KERNEL_VERSION(2, 6, 32)/' src/wl/sys/wl_cfg80211_hybrid.c
+ %endif
+ %if %{kvr} == 504
+ # Only apply to EL 6.6 point release
+ if $(grep -q "/lib/modules/kabi/kabi_whitelist" /usr/lib/rpm/redhat/find-requires.ksyms 2>/dev/null) ; then
+ %{__sed} -i 's@/lib/modules/kabi/kabi_whitelist@/lib/modules/kabi-current/kabi_whitelist@g' /usr/lib/rpm/redhat/find-requires.ksyms
+ fi
+ %endif
+ %if %{kvr} >= 504
+ # Apply to EL 6.6 point release and later
+ # > No changes currently needed for EL 6.6 point release
+ %endif
+ %if %{kvr} >= 573
+ # Apply to EL 6.7 point release and later
+ %{__sed} -i 's/ >= KERNEL_VERSION(3, 11, 0)/ >= KERNEL_VERSION(2, 6, 32)/' src/wl/sys/wl_cfg80211_hybrid.c
+ %{__sed} -i 's/ < KERNEL_VERSION(3, 16, 0)/ < KERNEL_VERSION(2, 6, 32)/' src/wl/sys/wl_cfg80211_hybrid.c
+ %{__sed} -i 's/ < KERNEL_VERSION(3, 18, 0)/ < KERNEL_VERSION(2, 6, 32)/' src/wl/sys/wl_cfg80211_hybrid.c
+ %{__sed} -i 's/ >= KERNEL_VERSION(3, 15, 0)/ >= KERNEL_VERSION(2, 6, 32)/' src/wl/sys/wl_cfg80211_hybrid.c
+ %endif
+ %if %{kvr} >= 642
+ # Apply to EL 6.8 point release and later
+ %{__sed} -i 's/ >= KERNEL_VERSION(4, 0, 0)/ >= KERNEL_VERSION(2, 6, 32)/' src/wl/sys/wl_cfg80211_hybrid.c
+ %{__sed} -i 's/ < KERNEL_VERSION(4,2,0)/ < KERNEL_VERSION(2, 6, 32)/' src/wl/sys/wl_cfg80211_hybrid.c
+ %endif
+ %if %{kvr} >= 696
+ # Apply to EL 6.9 point release and later
+ # > No changes currently needed for EL 6.9 point release
+ %endif
+ %if %{kvr} >= 754
+ # Apply to EL 6.10 point release and later
+ # > No changes currently needed for EL 6.10 point release
+ %endif
+ %endif
+%endif
+%if 0%{?rhel} == 7
+ # Define kvl (linux) & kvr (release) for use in "patching" logical
+ %define kvl %(echo %{kernel_versions} | cut -d"-" -f1)
+ %define kvr %(echo %{kernel_versions} | cut -d"-" -f2 | cut -d"." -f1)
+
+ # Perform "patching" edits to the src/wl/sys/wl_cfg80211_hybrid.c file.
+ # Note: Using this method, as opposed to making a patch, allows
+ # the src.rpm to be compiled under various point release kernels.
+ # Note: Use [ >][>=] where both >= & > are present
+ %if "%{kvl}" == "3.10.0"
+ %if %{kvr} == 123
+ # Only apply to EL 7.0 point release
+ if $(grep -q "/lib/modules/kabi/kabi_whitelist" /usr/lib/rpm/redhat/find-requires.ksyms 2>/dev/null) ; then
+ %{__sed} -i 's@/lib/modules/kabi/kabi_whitelist@/lib/modules/kabi-rhel70/kabi_whitelist@g' /usr/lib/rpm/redhat/find-requires.ksyms
+ fi
+ %endif
+ %if %{kvr} >= 123
+ # Apply to EL 7.0 point release and later
+ # > No changes currently needed for EL 7.0 point release
+ %endif
+ %if %{kvr} >= 229
+ # Apply to EL 7.1 point release and later
+ %{__sed} -i 's/ >= KERNEL_VERSION(3, 11, 0)/ >= KERNEL_VERSION(3, 10, 0)/' src/wl/sys/wl_cfg80211_hybrid.c
+ %{__sed} -i 's/ >= KERNEL_VERSION(3, 15, 0)/ >= KERNEL_VERSION(3, 10, 0)/' src/wl/sys/wl_cfg80211_hybrid.c
+ %{__sed} -i 's/ < KERNEL_VERSION(3, 16, 0)/ < KERNEL_VERSION(3, 10, 0)/' src/wl/sys/wl_cfg80211_hybrid.c
+ %endif
+ %if %{kvr} >= 327
+ # Apply to EL 7.2 point release and later
+ %{__sed} -i 's/ < KERNEL_VERSION(3, 18, 0)/ < KERNEL_VERSION(3, 9, 0)/' src/wl/sys/wl_cfg80211_hybrid.c
+ %{__sed} -i 's/ >= KERNEL_VERSION(4, 0, 0)/ >= KERNEL_VERSION(3, 10, 0)/' src/wl/sys/wl_cfg80211_hybrid.c
+ %endif
+ %if %{kvr} >= 514
+ # Apply to EL 7.3 point release and later
+ %{__sed} -i 's/ < KERNEL_VERSION(4,2,0)/ < KERNEL_VERSION(3, 9, 0)/' src/wl/sys/wl_cfg80211_hybrid.c
+ %{__sed} -i 's/ >= KERNEL_VERSION(4, 7, 0)/ >= KERNEL_VERSION(3, 10, 0)/' src/wl/sys/wl_cfg80211_hybrid.c
+ %endif
+ %if %{kvr} >= 693
+ # Apply to EL 7.4 point release and later
+ %{__sed} -i 's/ >= KERNEL_VERSION(4, 8, 0)/ >= KERNEL_VERSION(3, 10, 0)/' src/wl/sys/wl_cfg80211_hybrid.c
+ %endif
+ %if %{kvr} >= 862
+ # Apply to EL 7.5 point release and later
+ %{__sed} -i 's/ <= KERNEL_VERSION(4, 10, 0)/ <= KERNEL_VERSION(3, 9, 0)/' src/wl/sys/wl_linux.c
+ %{__sed} -i 's/ >= KERNEL_VERSION(4, 11, 0)/ >= KERNEL_VERSION(3, 10, 0)/g' src/wl/sys/wl_cfg80211_hybrid.c
+ %{__sed} -i 's/ < KERNEL_VERSION(4, 12, 0)/ < KERNEL_VERSION(3, 10, 0)/g' src/wl/sys/wl_cfg80211_hybrid.c
+ %{__sed} -i 's/ >= KERNEL_VERSION(4, 12, 0)/ >= KERNEL_VERSION(3, 10, 0)/g' src/wl/sys/wl_cfg80211_hybrid.c
+ %endif
+ %if %{kvr} >= 957
+ # Apply to EL 7.6 point release and later
+ # > No changes currently needed for EL 7.6 point release
+ %endif
+ %endif
+%endif
popd
for kernel_version in %{?kernel_versions} ; do
@@ -113,6 +253,10 @@ chmod 0755 $RPM_BUILD_ROOT%{kmodinstdir_prefix}*%{kmodinstdir_postfix}/* || :
rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Apr 06 2019 Nicolas Viéville <nicolas.vieville(a)uphf.fr> - 6.30.223.271-23
+- Rework SPEC file in order to build for RHEL 6.x and 7.x
+- Rebuilt for akmods-ostree-post scriptlet
+
* Tue Mar 05 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 6.30.223.271-22
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
5 years