[wl-kmod] Fix patch for kernel >= 6.0
by Nicolas Viéville
commit 52de5250c7c2a9daaa6334ab5bf262a133ea5929
Author: Nicolas Viéville <nicolas.vieville(a)uphf.fr>
Date: Mon Oct 17 01:22:35 2022 +0200
Fix patch for kernel >= 6.0
wl-kmod-023_kernel_6.0_adaptation.patch | 8 +++++---
wl-kmod.spec | 5 ++++-
2 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/wl-kmod-023_kernel_6.0_adaptation.patch b/wl-kmod-023_kernel_6.0_adaptation.patch
index 9ff534c..aa1ca18 100644
--- a/wl-kmod-023_kernel_6.0_adaptation.patch
+++ b/wl-kmod-023_kernel_6.0_adaptation.patch
@@ -1,13 +1,15 @@
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 2022-04-02 19:58:24.236715000 +0200
-+++ hybrid-v35_64-nodebug-pcoem-6_30_223_271/src/wl/sys/wl_cfg80211_hybrid.c 2022-10-16 16:20:30.529848770 +0200
-@@ -2532,7 +2532,11 @@
++++ hybrid-v35_64-nodebug-pcoem-6_30_223_271/src/wl/sys/wl_cfg80211_hybrid.c 2022-10-17 01:08:31.537677649 +0200
+@@ -2531,8 +2531,13 @@
+ return err;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
- roam_info.channel = &wl->conf->channel;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 0, 0)
++ roam_info.links[0].channel = &wl->conf->channel;
+ roam_info.links[0].bssid = (u8*)&wl->bssid;
+#else
+ roam_info.channel = &wl->conf->channel;
roam_info.bssid = (u8*)&wl->bssid;
+#endif
roam_info.req_ie = conn_info->req_ie;
diff --git a/wl-kmod.spec b/wl-kmod.spec
index f6fe6a3..a60c07f 100644
--- a/wl-kmod.spec
+++ b/wl-kmod.spec
@@ -10,7 +10,7 @@
Name: wl-kmod
Version: 6.30.223.271
-Release: 44%{?dist}
+Release: 45%{?dist}
Summary: Kernel module for Broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -346,6 +346,9 @@ chmod 0755 $RPM_BUILD_ROOT%{kmodinstdir_prefix}*%{kmodinstdir_postfix}/* || :
rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Oct 17 2022 Nicolas Viéville <nicolas.vieville(a)uphf.fr> - 6.30.223.271-45
+- Fix patch for kernel >= 6.0
+
* Sun Oct 16 2022 Nicolas Viéville <nicolas.vieville(a)uphf.fr> - 6.30.223.271-44
- Add patch for kernel >= 6.0
- Fix SPEC file for RHEL 9.x
2 years
[wl-kmod] Fix SPEC file for RHEL 9.x
by Nicolas Viéville
commit c04ffd7b127dc0d80ea80fcb19956af582e2babb
Author: Nicolas Viéville <nicolas.vieville(a)uphf.fr>
Date: Sun Oct 16 23:10:45 2022 +0200
Fix SPEC file for RHEL 9.x
wl-kmod.spec | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/wl-kmod.spec b/wl-kmod.spec
index d101806..f6fe6a3 100644
--- a/wl-kmod.spec
+++ b/wl-kmod.spec
@@ -3,7 +3,7 @@
# "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
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} >= 9
%global buildforkernels akmod
%global debug_package %{nil}
%endif
@@ -311,8 +311,9 @@ pushd %{name}-%{version}-src
# > No changes currently needed for EL 9.0 point release
%endif
%if %{kvr} >= 70
- # Apply to EL 9.0 point release and later
- # > No changes currently needed for EL 9.0 point release
+ # Apply to EL 9.0 point release and later
+ %{__sed} -i 's/ < KERNEL_VERSION(5, 17, 0)/ < KERNEL_VERSION(5, 14, 0)/g' src/wl/sys/wl_iw.h
+ %{__sed} -i 's/ >= KERNEL_VERSION(5, 17, 0)/ >= KERNEL_VERSION(5, 14, 0)/g' src/wl/sys/wl_linux.c
%endif
%endif
%endif
@@ -347,6 +348,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Sun Oct 16 2022 Nicolas Viéville <nicolas.vieville(a)uphf.fr> - 6.30.223.271-44
- Add patch for kernel >= 6.0
+- Fix SPEC file for RHEL 9.x
* Mon Aug 08 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 6.30.223.271-43
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg
2 years
[wl-kmod/el7: 3/3] Merge branch 'master' into el7
by Nicolas Viéville
commit 4f808ba2ffb932653c4e62bb3fe73bbdcc8959e8
Merge: ef4fa00 d6acdf7
Author: Nicolas Viéville <nicolas.vieville(a)uphf.fr>
Date: Sun Oct 16 20:33:42 2022 +0200
Merge branch 'master' into el7
wl-kmod-023_kernel_6.0_adaptation.patch | 15 +++++++++++++++
wl-kmod.spec | 11 ++++++++++-
2 files changed, 25 insertions(+), 1 deletion(-)
---
2 years
[wl-kmod] Add patch for kernel >= 6.0
by Nicolas Viéville
commit d6acdf7711f0d121ffe2ac18b10034eb65c5e4f9
Author: Nicolas Viéville <nicolas.vieville(a)uphf.fr>
Date: Sun Oct 16 20:01:53 2022 +0200
Add patch for kernel >= 6.0
wl-kmod-023_kernel_6.0_adaptation.patch | 15 +++++++++++++++
wl-kmod.spec | 7 ++++++-
2 files changed, 21 insertions(+), 1 deletion(-)
---
diff --git a/wl-kmod-023_kernel_6.0_adaptation.patch b/wl-kmod-023_kernel_6.0_adaptation.patch
new file mode 100644
index 0000000..9ff534c
--- /dev/null
+++ b/wl-kmod-023_kernel_6.0_adaptation.patch
@@ -0,0 +1,15 @@
+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 2022-04-02 19:58:24.236715000 +0200
++++ hybrid-v35_64-nodebug-pcoem-6_30_223_271/src/wl/sys/wl_cfg80211_hybrid.c 2022-10-16 16:20:30.529848770 +0200
+@@ -2532,7 +2532,11 @@
+
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
+ roam_info.channel = &wl->conf->channel;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 0, 0)
++ roam_info.links[0].bssid = (u8*)&wl->bssid;
++#else
+ roam_info.bssid = (u8*)&wl->bssid;
++#endif
+ roam_info.req_ie = conn_info->req_ie;
+ roam_info.req_ie_len = conn_info->req_ie_len;
+ roam_info.resp_ie = conn_info->resp_ie;
diff --git a/wl-kmod.spec b/wl-kmod.spec
index 901c336..d101806 100644
--- a/wl-kmod.spec
+++ b/wl-kmod.spec
@@ -10,7 +10,7 @@
Name: wl-kmod
Version: 6.30.223.271
-Release: 43%{?dist}
+Release: 44%{?dist}
Summary: Kernel module for Broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -40,6 +40,7 @@ Patch18: wl-kmod-019_kernel_5.9_segment_eq_removed.patch
Patch19: wl-kmod-020_kernel_5.10_get_set_fs_removed.patch
Patch20: wl-kmod-021_kernel_5.17_adaptation.patch
Patch21: wl-kmod-022_kernel_5.18_adaptation.patch
+Patch22: wl-kmod-023_kernel_6.0_adaptation.patch
# needed for plague to make sure it builds for i586 and i686
ExclusiveArch: i686 x86_64
@@ -102,6 +103,7 @@ pushd %{name}-%{version}-src
%patch19 -p1 -b .kernel_5.10_get_set_fs_removed
%patch20 -p1 -b .kernel_5.17_adaptation
%patch21 -p1 -b .kernel_5.18_adaptation
+%patch22 -p1 -b .kernel_6.0_adaptation
# Manual patching to build for RHEL - inspired by CentOS wl-kmod.spec
# Actually works for RHEL 6.x and 7.x
@@ -343,6 +345,9 @@ chmod 0755 $RPM_BUILD_ROOT%{kmodinstdir_prefix}*%{kmodinstdir_postfix}/* || :
rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Oct 16 2022 Nicolas Viéville <nicolas.vieville(a)uphf.fr> - 6.30.223.271-44
+- Add patch for kernel >= 6.0
+
* Mon Aug 08 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 6.30.223.271-43
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg
5.1
2 years
[vlc/el7: 33/33] Merge branch 'master' into el7
by Nicolas Chauvet
commit dd7eb25b1d3ecf7d1d8d9d26ed1048ba03188ef4
Merge: 8d3047c ca4689c
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Sun Oct 16 17:12:28 2022 +0200
Merge branch 'master' into el7
fix-dav1d-1.0.patch | 149 ++++++++++++++++++++++++++++++++++++++++++++++++++++
sources | 2 +-
vlc.spec | 106 ++++++++++++++++++++++---------------
3 files changed, 213 insertions(+), 44 deletions(-)
---
2 years
