From c589f8807673d17dfd0329160ce28ad9d302ba69 Mon Sep 17 00:00:00 2001 From: Andrey Savich Date: Dec 15 2022 16:51:59 +0000 Subject: [PATCH 1/6] Update rtl88x2bu-kmod.spec to newer commit - i hope... --- diff --git a/rtl88x2bu-kmod.spec b/rtl88x2bu-kmod.spec index 285bf53..2354289 100644 --- a/rtl88x2bu-kmod.spec +++ b/rtl88x2bu-kmod.spec @@ -1,12 +1,12 @@ -%global commit 761a1b6f8f54f1e667ca9d77917b5e5871827caf +%global commit 2590672d717e2516dd2e96ed66f1037a6815bced %global shortcommit %(c=%{commit}; echo ${c:0:7}) -#global gitdate 20210321 +#global gitdate 20221207 %define buildforkernels akmod %global debug_package %{nil} Name: rtl88x2bu-kmod -Version: 5.13.1morrownr +Version: 5.13.2morrownr Release: 3%{?dist} Summary: Realtek %{kmod_name} linux wireless driver License: GPLv2 From 8aeb4c7b50c3ab720a521a491fb70ccd42bcbee7 Mon Sep 17 00:00:00 2001 From: Andrey Savich Date: Dec 16 2022 13:41:03 +0000 Subject: [PATCH 2/6] Comment the magic thing --- diff --git a/rtl88x2bu-kmod.spec b/rtl88x2bu-kmod.spec index 2354289..5c55f3c 100644 --- a/rtl88x2bu-kmod.spec +++ b/rtl88x2bu-kmod.spec @@ -16,8 +16,8 @@ Source0: %{URL}/archive/%{commit}/rtl88x2bu-%{shortcommit}.tar.gz %global AkmodsBuildRequires %{_bindir}/kmodtool xz time elfutils-libelf-devel gcc bc BuildRequires: %{AkmodsBuildRequires} -# kmodtool does its magic here -%{expand:%(kmodtool --target %{_target_cpu} --repo fedora --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) } +# kmodtool does its magic here - ill disable it for now and see if anything changes on build +#%{expand:%(kmodtool --target %{_target_cpu} --repo fedora --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) } %description %{summary}. From 77eab1d67a6cd8556e7284e0d067d4535bf828bd Mon Sep 17 00:00:00 2001 From: Andrey Savich Date: Dec 16 2022 13:53:39 +0000 Subject: [PATCH 3/6] Update rtl88x2bu-kmod.spec --- diff --git a/rtl88x2bu-kmod.spec b/rtl88x2bu-kmod.spec index 5c55f3c..b75784e 100644 --- a/rtl88x2bu-kmod.spec +++ b/rtl88x2bu-kmod.spec @@ -17,7 +17,7 @@ Source0: %{URL}/archive/%{commit}/rtl88x2bu-%{shortcommit}.tar.gz BuildRequires: %{AkmodsBuildRequires} # kmodtool does its magic here - ill disable it for now and see if anything changes on build -#%{expand:%(kmodtool --target %{_target_cpu} --repo fedora --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) } +%{expand:%(kmodtool --target %{_target_cpu} --repo fedora --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) } %description %{summary}. @@ -35,7 +35,7 @@ Provides: %{name}-common = %{version}-%{release} #debug print what kmodtool generated kmodtool --target %{_target_cpu} --repo fedora --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null -%setup -q -c +%setup -q -c -T -a 0 pushd rtl88x2bu-%{commit} popd From 49024eb0b60644a87b7cbdba9e1009cd34135c4c Mon Sep 17 00:00:00 2001 From: Andrey Savich Date: Dec 16 2022 13:54:27 +0000 Subject: [PATCH 4/6] Update rtl88x2bu-kmod.spec --- diff --git a/rtl88x2bu-kmod.spec b/rtl88x2bu-kmod.spec index b75784e..f178fe1 100644 --- a/rtl88x2bu-kmod.spec +++ b/rtl88x2bu-kmod.spec @@ -43,7 +43,7 @@ for kernel_version in %{?kernel_versions} ; do cp -a rtl88x2bu-%{commit} _kmod_build_${kernel_version%%___*} done -#setup -q -c -T -a 0 +#setup -q -c echo "override rtl88x2bu * weak-updates/rtl88x2bu" > kmod-rtl88x2bu.conf %build From 52e68684004fe9ef77d07bde48d43be2de1d7bf0 Mon Sep 17 00:00:00 2001 From: Andrey Savich Date: Dec 16 2022 13:56:21 +0000 Subject: [PATCH 5/6] Update rtl88x2bu-kmod.spec --- diff --git a/rtl88x2bu-kmod.spec b/rtl88x2bu-kmod.spec index f178fe1..f5dc176 100644 --- a/rtl88x2bu-kmod.spec +++ b/rtl88x2bu-kmod.spec @@ -16,7 +16,7 @@ Source0: %{URL}/archive/%{commit}/rtl88x2bu-%{shortcommit}.tar.gz %global AkmodsBuildRequires %{_bindir}/kmodtool xz time elfutils-libelf-devel gcc bc BuildRequires: %{AkmodsBuildRequires} -# kmodtool does its magic here - ill disable it for now and see if anything changes on build +# kmodtool does its magic here %{expand:%(kmodtool --target %{_target_cpu} --repo fedora --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) } %description From 400e9c9f1295f832b9914307fec9b3235901fbbc Mon Sep 17 00:00:00 2001 From: Andrey Savich Date: Dec 16 2022 14:01:20 +0000 Subject: [PATCH 6/6] Update rtl88x2bu-kmod.spec --- diff --git a/rtl88x2bu-kmod.spec b/rtl88x2bu-kmod.spec index f5dc176..239dd54 100644 --- a/rtl88x2bu-kmod.spec +++ b/rtl88x2bu-kmod.spec @@ -39,13 +39,12 @@ kmodtool --target %{_target_cpu} --repo fedora --kmodname %{name} %{?buildforke pushd rtl88x2bu-%{commit} popd +echo "override rtl88x2bu * weak-updates/rtl88x2bu" > kmod-rtl88x2bu.conf + for kernel_version in %{?kernel_versions} ; do cp -a rtl88x2bu-%{commit} _kmod_build_${kernel_version%%___*} done -#setup -q -c -echo "override rtl88x2bu * weak-updates/rtl88x2bu" > kmod-rtl88x2bu.conf - %build for kernel_version in %{?kernel_versions} ; do pushd _kmod_build_${kernel_version%%___*}