Compare commits

...

No commits in common. 'c8' and 'c9' have entirely different histories.
c8 ... c9

2
.gitignore vendored

@ -1 +1 @@
SOURCES/mac80211-redhat-4.18.0_348_dup8.5.tar.bz2
SOURCES/mac80211-redhat-5.14.0_284.11.1_dup9.2.tar.bz2

@ -1 +1 @@
bddefce557a92bf6223cc648f76545b17a3bd7f1 SOURCES/mac80211-redhat-4.18.0_348_dup8.5.tar.bz2
5dae06468e214948ed3b74747277aa21d049f53b SOURCES/mac80211-redhat-5.14.0_284.11.1_dup9.2.tar.bz2

@ -0,0 +1,9 @@
Index: src/net/mac80211/main.c
===================================================================
--- src.orig/net/mac80211/main.c 2023-05-30 14:58:22.109191134 +0200
+++ src/net/mac80211/main.c 2023-05-30 14:59:39.480490980 +0200
@@ -1574,3 +1574,4 @@
MODULE_DESCRIPTION("IEEE 802.11 subsystem");
MODULE_LICENSE("GPL");
+MODULE_VERSION("5.14.0_284.11.1_dup9.2");

@ -1,7 +0,0 @@
Index: src/Makefile
===================================================================
--- src/Makefile 1970-01-01 00:00:00.000000000 +0000
+++ src/Makefile 2022-02-01 04:20:42.205681534 +0100
@@ -1,0 +1,2 @@
+obj-y += lib/crypto/
+obj-y += net/mac80211/

@ -1,18 +0,0 @@
Index: src/net/mac80211/main.c
===================================================================
--- src.orig/net/mac80211/main.c 2022-01-30 05:33:20.680231094 +0100
+++ src/net/mac80211/main.c 2022-01-30 05:35:07.846221845 +0100
@@ -1475,3 +1475,4 @@
MODULE_DESCRIPTION("IEEE 802.11 subsystem");
MODULE_LICENSE("GPL");
+MODULE_VERSION("4.18.0-348_dup8.5");
Index: src/lib/crypto/arc4.c
===================================================================
--- src.orig/lib/crypto/arc4.c 2022-01-30 05:33:11.978313045 +0100
+++ src/lib/crypto/arc4.c 2022-01-30 05:35:29.499017927 +0100
@@ -72,3 +72,4 @@
EXPORT_SYMBOL(arc4_crypt);
MODULE_LICENSE("GPL");
+MODULE_VERSION("4.18.0-348_dup8.5");

@ -1,13 +1,13 @@
%define kmod_name mac80211
%define kmod_vendor redhat
%define kmod_rpm_name kmod-redhat-mac80211
%define kmod_driver_version 4.18.0_348_dup8.5
%define kmod_driver_version 5.14.0_284.11.1_dup9.2
%define kmod_driver_epoch %{nil}
%define kmod_rpm_release 2
%define kmod_kernel_version 4.18.0-348.el8
%define kmod_kernel_version_min %{nil}
%define kmod_kernel_version_dep %{nil}
%define kmod_kbuild_dir .
%define kmod_rpm_release 3
%define kmod_kernel_version 5.14.0-284.11.1.el9_2
%define kmod_kernel_version_min 5.14.0-284
%define kmod_kernel_version_dep 5.14.0-284.el9
%define kmod_kbuild_dir net/mac80211
%define kmod_dependencies %{nil}
%define kmod_dist_build_deps %{nil}
%define kmod_build_dependencies %{nil}
@ -21,7 +21,7 @@
%define kernel_devel_pkg kernel-devel
%define kernel_modules_pkg kernel-modules
%{!?dist: %define dist .el8_5}
%{!?dist: %define dist .el9_2}
%{!?make_build: %define make_build make}
%if "%{kmod_kernel_version_dep}" == ""
@ -29,17 +29,23 @@
%endif
%if "%{kmod_dist_build_deps}" == ""
%if (0%{?rhel} > 8) || (0%{?centos} > 8)
%define abi_list stablelist
%define kmod_dist_build_deps redhat-rpm-config kernel-abi-stablelists elfutils-libelf-devel kernel-rpm-macros kmod
%else
%if (0%{?rhel} > 7) || (0%{?centos} > 7)
%define abi_list whitelist
%define kmod_dist_build_deps redhat-rpm-config kernel-abi-whitelists elfutils-libelf-devel kernel-rpm-macros kmod
%else
%define abi_list whitelist
%define kmod_dist_build_deps redhat-rpm-config kernel-abi-whitelists
%endif
%endif
%endif
Source0: %{kmod_name}-%{kmod_vendor}-%{kmod_driver_version}.tar.bz2
# Source code patches
Patch0: 9000-cleanup-Makefile.patch
Patch1: 9001-add-module-version.patch
Patch0: 9000-add-driver-version.patch
%define findpat %( echo "%""P" )
%define __find_requires /usr/lib/rpm/redhat/find-requires.ksyms
@ -77,9 +83,7 @@ Provides: %kernel_modules_pkg = %{kmod_kernel_version_dep}.%{_target_cpu}
Provides: kmod-%{kmod_name} = %{?epoch:%{epoch}:}%{version}-%{release}
Requires(post): %{sbindir}/weak-modules
Requires(postun): %{sbindir}/weak-modules
Requires: kernel >= 4.18.0-348.el8
Requires: kernel < 4.18.0-349.el8
Requires: kernel >= 5.14.0-284
%if 0
Requires: firmware(%{kmod_name}) = ENTER_FIRMWARE_VERSION
%endif
@ -124,9 +128,6 @@ mac80211 firmware for Driver Update Program
%if 0%{kmod_devel_package}
%package -n kmod-redhat-mac80211-devel
Version: %{kmod_driver_version}
Requires: kernel >= 4.18.0-348.el8
Requires: kernel < 4.18.0-349.el8
Summary: mac80211 development files for Driver Update Program
%description -n kmod-redhat-mac80211-devel
@ -244,7 +245,6 @@ exit 0
%setup -n %{kmod_name}-%{kmod_vendor}-%{kmod_driver_version}
%patch0 -p1
%patch1 -p1
set -- *
mkdir source
mv "$@" source/
@ -265,7 +265,7 @@ PWD_PATH=$(realpath --relative-to="%{kernel_source}" . 2>/dev/null || echo "$PWD
# mark modules executable so that strip-to-file can strip them
find obj/%{kmod_kbuild_dir} -name "*.ko" -type f -exec chmod u+x '{}' +
whitelist="/lib/modules/kabi-current/kabi_whitelist_%{_target_cpu}"
kabilist="/lib/modules/kabi-current/kabi_%{abi_list}_%{_target_cpu}"
for modules in $( find obj/%{kmod_kbuild_dir} -name "*.ko" -type f -printf "%{findpat}\n" | sed 's|\.ko$||' | sort -u ) ; do
# update depmod.conf
module_weak_path=$(echo "$modules" | sed 's/[\/]*[^\/]*$//')
@ -282,7 +282,7 @@ for modules in $( find obj/%{kmod_kbuild_dir} -name "*.ko" -type f -printf "%{fi
# update greylist
nm -u obj/%{kmod_kbuild_dir}/$modules.ko | sed 's/.*U //' | sed 's/^\.//' | sort -u | while read -r symbol; do
grep -q "^\s*$symbol\$" $whitelist || echo "$symbol" >> source/greylist
grep -q "^\s*$symbol\$" $kabilist || echo "$symbol" >> source/greylist
done
done
sort -u source/greylist | uniq > source/greylist.txt
@ -322,11 +322,7 @@ fi
rm -rf $RPM_BUILD_ROOT
%changelog
* Wed Feb 09 2022 Eugene Syromiatnikov <esyr@redhat.com> 4.18.0_348_dup8.5-2
- Bump release due to "Package build kmod-redhat-mac80211-4.18.0_348_dup8.5-1.el8_5
kept gated because not onboarded to gating".
* Wed Feb 09 2022 Eugene Syromiatnikov <esyr@redhat.com> 4.18.0_348_dup8.5-1
- 9dc660bf1362f5a22a908e61004498cf7ec063a8
* Tue Jun 27 2023 Eugene Syromiatnikov <esyr@redhat.com> 5.14.0_284.11.1_dup9.2-3
- c8eb14f582ef9c529860817fbe91ba1a6a270315
- mac80211 kernel module for Driver Update Program
- Resolves: #bz2051885, #bz2051886
- Resolves: #bz2214527

Loading…
Cancel
Save