Compare commits

...

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

2
.gitignore vendored

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

@ -1 +1 @@
661e485e63b976b42c3d0b7f283cc24b1fd445e9 SOURCES/cfg80211-redhat-5.14.0_284.11.1_dup9.2.tar.bz2 7fd8c6dfd34d7d572dbff28f5031871d2eaf204c SOURCES/cfg80211-redhat-4.18.0_348_dup8.5.tar.bz2

@ -1,81 +0,0 @@
Index: src/net/rfkill/core.c
===================================================================
--- src.orig/net/rfkill/core.c 2023-05-31 09:10:43.080564771 +0200
+++ src/net/rfkill/core.c 2023-05-31 09:18:14.284745810 +0200
@@ -86,6 +86,7 @@
MODULE_AUTHOR("Johannes Berg <johannes@sipsolutions.net>");
MODULE_DESCRIPTION("RF switch support");
MODULE_LICENSE("GPL");
+MODULE_VERSION("5.14.0_284.11.1_dup9.2");
/*
Index: src/net/rfkill/rfkill-gpio.c
===================================================================
--- src.orig/net/rfkill/rfkill-gpio.c 2023-05-31 09:10:43.081564763 +0200
+++ src/net/rfkill/rfkill-gpio.c 2023-05-31 09:18:40.427524539 +0200
@@ -171,3 +171,4 @@
MODULE_DESCRIPTION("gpio rfkill");
MODULE_AUTHOR("NVIDIA");
MODULE_LICENSE("GPL");
+MODULE_VERSION("5.14.0_284.11.1_dup9.2");
Index: src/net/wireless/core.c
===================================================================
--- src.orig/net/wireless/core.c 2023-05-31 09:09:16.234299832 +0200
+++ src/net/wireless/core.c 2023-05-31 09:17:23.322177154 +0200
@@ -37,6 +37,7 @@
MODULE_AUTHOR("Johannes Berg");
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("wireless configuration support");
+MODULE_VERSION("5.14.0_284.11.1_dup9.2");
MODULE_ALIAS_GENL_FAMILY(NL80211_GENL_NAME);
/* RCU-protected (and RTNL for writers) */
Index: src/net/wireless/lib80211.c
===================================================================
--- src.orig/net/wireless/lib80211.c 2023-05-31 09:09:16.237299807 +0200
+++ src/net/wireless/lib80211.c 2023-05-31 09:16:48.133474988 +0200
@@ -31,6 +31,7 @@
MODULE_DESCRIPTION(DRV_DESCRIPTION);
MODULE_AUTHOR("John W. Linville <linville@tuxdriver.com>");
MODULE_LICENSE("GPL");
+MODULE_VERSION("5.14.0_284.11.1_dup9.2");
struct lib80211_crypto_alg {
struct list_head list;
Index: src/net/wireless/lib80211_crypt_ccmp.c
===================================================================
--- src.orig/net/wireless/lib80211_crypt_ccmp.c 2023-05-31 09:09:16.238299798 +0200
+++ src/net/wireless/lib80211_crypt_ccmp.c 2023-05-31 09:17:47.211974952 +0200
@@ -29,6 +29,7 @@
MODULE_AUTHOR("Jouni Malinen");
MODULE_DESCRIPTION("Host AP crypt: CCMP");
MODULE_LICENSE("GPL");
+MODULE_VERSION("5.14.0_284.11.1_dup9.2");
#define AES_BLOCK_LEN 16
#define CCMP_HDR_LEN 8
Index: src/net/wireless/lib80211_crypt_tkip.c
===================================================================
--- src.orig/net/wireless/lib80211_crypt_tkip.c 2023-05-31 09:09:16.239299790 +0200
+++ src/net/wireless/lib80211_crypt_tkip.c 2023-05-31 09:17:37.889053861 +0200
@@ -36,6 +36,7 @@
MODULE_AUTHOR("Jouni Malinen");
MODULE_DESCRIPTION("lib80211 crypt: TKIP");
MODULE_LICENSE("GPL");
+MODULE_VERSION("5.14.0_284.11.1_dup9.2");
#define TKIP_HDR_LEN 8
Index: src/net/wireless/lib80211_crypt_wep.c
===================================================================
--- src.orig/net/wireless/lib80211_crypt_wep.c 2023-05-31 09:09:16.239299790 +0200
+++ src/net/wireless/lib80211_crypt_wep.c 2023-05-31 09:17:08.573301987 +0200
@@ -25,6 +25,7 @@
MODULE_AUTHOR("Jouni Malinen");
MODULE_DESCRIPTION("lib80211 crypt: WEP");
MODULE_LICENSE("GPL");
+MODULE_VERSION("5.14.0_284.11.1_dup9.2");
struct lib80211_wep_data {
u32 iv;

@ -0,0 +1,27 @@
Index: src/net/cfg80211/Makefile
===================================================================
--- src.orig/net/cfg80211/Makefile 2022-02-01 04:33:27.204477064 +0100
+++ src/net/cfg80211/Makefile 2022-02-01 04:36:59.615476658 +0100
@@ -1,14 +1,14 @@
# SPDX-License-Identifier: GPL-2.0
obj-$(CONFIG_CFG80211) += cfg80211.o
-obj-$(CONFIG_LIB80211) += lib80211.o
-obj-$(CONFIG_LIB80211_CRYPT_WEP) += lib80211_crypt_wep.o
-obj-$(CONFIG_LIB80211_CRYPT_CCMP) += lib80211_crypt_ccmp.o
-obj-$(CONFIG_LIB80211_CRYPT_TKIP) += lib80211_crypt_tkip.o
+#obj-$(CONFIG_LIB80211) += lib80211.o
+#obj-$(CONFIG_LIB80211_CRYPT_WEP) += lib80211_crypt_wep.o
+#obj-$(CONFIG_LIB80211_CRYPT_CCMP) += lib80211_crypt_ccmp.o
+#obj-$(CONFIG_LIB80211_CRYPT_TKIP) += lib80211_crypt_tkip.o
-obj-$(CONFIG_WEXT_CORE) += wext-core.o
-obj-$(CONFIG_WEXT_PROC) += wext-proc.o
-obj-$(CONFIG_WEXT_SPY) += wext-spy.o
-obj-$(CONFIG_WEXT_PRIV) += wext-priv.o
+#obj-$(CONFIG_WEXT_CORE) += wext-core.o
+#obj-$(CONFIG_WEXT_PROC) += wext-proc.o
+#obj-$(CONFIG_WEXT_SPY) += wext-spy.o
+#obj-$(CONFIG_WEXT_PRIV) += wext-priv.o
cfg80211-y += core.o sysfs.o radiotap.o util.o reg.o scan.o nl80211.o
cfg80211-y += mlme.o ibss.o sme.o chan.o ethtool.o mesh.o ap.o trace.o ocb.o

@ -1,7 +0,0 @@
Index: src/net/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ src/net/Makefile 2023-05-31 09:19:17.702209049 +0200
@@ -0,0 +1,2 @@
+obj-y += wireless/
+obj-y += rfkill/

@ -0,0 +1,24 @@
Index: src/net/cfg80211/core.c
===================================================================
--- src.orig/net/cfg80211/core.c 2022-01-30 05:10:25.845178771 +0100
+++ src/net/cfg80211/core.c 2022-01-30 05:14:29.182887108 +0100
@@ -38,6 +38,7 @@
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("wireless configuration support");
MODULE_ALIAS_GENL_FAMILY(NL80211_GENL_NAME);
+MODULE_VERSION("4.18.0-348_dup8.5");
/* RCU-protected (and RTNL for writers) */
LIST_HEAD(cfg80211_rdev_list);
Index: src/net/rfkill/core.c
===================================================================
--- src.orig/net/rfkill/core.c 2022-01-30 05:23:28.720805944 +0100
+++ src/net/rfkill/core.c 2022-01-30 05:29:46.298250062 +0100
@@ -97,6 +97,7 @@
MODULE_AUTHOR("Johannes Berg <johannes@sipsolutions.net>");
MODULE_DESCRIPTION("RF switch support");
MODULE_LICENSE("GPL");
+MODULE_VERSION("4.18.0-348_dup8.5");
/*

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

Loading…
Cancel
Save