Work around absense of rdfind during build, add file directives for new iwlwifi files

Resolves: RHEL-16721, RHEL-14260

Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
This commit is contained in:
Denys Vlasenko 2023-11-22 01:03:44 +01:00
parent 450a2beaad
commit 92da026adb

View File

@ -1,6 +1,6 @@
%global checkout 9552083a
%global firmware_release 119
%global firmware_release 120
%global _firmwarepath /usr/lib/firmware
%define _binaries_in_noarch_packages_terminate_build 0
@ -276,6 +276,39 @@ git am %{patches}
%install
mkdir -p $RPM_BUILD_ROOT/%{_firmwarepath}
mkdir -p $RPM_BUILD_ROOT/%{_firmwarepath}/updates
# Patch copy-firmware.sh to not use rdfind.
# "BuildRequires: ... rdfind" is a proper solution, but centos 8 and rhel8 don't have it (yet?)
patch -p1 <<"EOF"
--- a/copy-firmware.sh 2023-11-21 12:17:51.580616232 +0100
+++ b/copy-firmware.sh 2023-11-22 02:04:25.210249915 +0100
@@ -69,11 +69,6 @@
exit 1
fi
-if ! which rdfind 2>/dev/null >/dev/null; then
- echo "ERROR: rdfind is not installed"
- exit 1
-fi
-
# shellcheck disable=SC2162 # file/folder name can include escaped symbols
grep -E '^(RawFile|File):' WHENCE | sed -E -e 's/^(RawFile|File): */\1 /;s/"//g' | while read k f; do
test -f "$f" || continue
@@ -87,14 +82,6 @@
fi
done
-$verbose "Finding duplicate files"
-rdfind -makesymlinks true -makeresultsfile false "$destdir" >/dev/null
-find "$destdir" -type l | while read -r l; do
- target="$(realpath "$l")"
- $verbose "Correcting path for $l"
- ln -fs "$(realpath --relative-to="$(dirname "$(realpath -s "$l")")" "$target")" "$l"
-done
-
# shellcheck disable=SC2162 # file/folder name can include escaped symbols
grep -E '^Link:' WHENCE | sed -e 's/^Link: *//g;s/-> //g' | while read f d; do
if test -L "$f$compext"; then
EOF
make DESTDIR=%{buildroot}/ FIRMWAREDIR=%{_firmwarepath} install
pushd $RPM_BUILD_ROOT/%{_firmwarepath}
@ -401,6 +434,10 @@ sed -e 's/^/%%dir /' linux-firmware.dirs >> linux-firmware.files
%{_firmwarepath}/iwlwifi-ty-a0-gf-a0*.pnvm
%{_firmwarepath}/iwlwifi-so-a0-*.ucode
%{_firmwarepath}/iwlwifi-so-a0-*.pnvm
%{_firmwarepath}/iwlwifi-gl-*.ucode
%{_firmwarepath}/iwlwifi-gl-*.pnvm
%{_firmwarepath}/iwlwifi-ma-*.ucode
%{_firmwarepath}/iwlwifi-ma-*.pnvm
%files -n libertas-usb8388-firmware
%license WHENCE LICENCE.Marvell
@ -428,6 +465,11 @@ sed -e 's/^/%%dir /' linux-firmware.dirs >> linux-firmware.files
%config(noreplace) %{_firmwarepath}/netronome/nic_AMDA*
%changelog
* Wed Nov 22 2023 Denys Vlasenko <dvlasenk@redhat.com> - 20231121-120.git9552083a
- Work around absense of rdfind during build
- Add file directives for new iwlwifi files
Resolves: RHEL-16721, RHEL-14260
* Tue Nov 21 2023 Denys Vlasenko <dvlasenk@redhat.com> - 20231121-119.git9552083a
- Update to latest upstream linux-firmware image for assorted updates
- Update AMD cpu microcode