Fix duplicate iwlwifi files in iwl*-firmware and linux-firmware packages

Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
This commit is contained in:
Denys Vlasenko 2025-11-15 09:07:52 +01:00
parent 961028aba4
commit fca4aa573f

View File

@ -1,5 +1,5 @@
%global debug_package %{nil}
%global firmware_release 156
%global firmware_release 157
%global _firmwarepath /usr/lib/firmware
%define _binaries_in_noarch_packages_terminate_build 0
@ -330,7 +330,9 @@ find . \! -type d > $FILEDIR/linux-firmware.files
find . -type d | sed -e '/^.$/d' > $FILEDIR/linux-firmware.dirs
popd
sed -i -e 's:^./::' linux-firmware.{files,dirs}
sed -i -e '/^iwlwifi/d' \
sed \
-i -e '/^iwlwifi/d' \
-i -e '/^intel\/iwlwifi\/iwlwifi/d' \
-i -e '/^libertas\/sd8686/d' \
-i -e '/^libertas\/usb8388/d' \
-i -e '/^mrvl\/sd8787/d' \
@ -546,6 +548,10 @@ if st and st.type == "directory" then
end
%changelog
* Tue Aug 12 2025 Denys Vlasenko <dvlasenk@redhat.com> - 20251111-157
- Fix duplicate iwlwifi files in iwl*-firmware and linux-firmware packages
Resolves: RHEL-128087
* Tue Aug 12 2025 Denys Vlasenko <dvlasenk@redhat.com> - 20251111-156
- Update linux-firmware to latest upstream (RHEL-128087)
Changes since the last update are noted on items below, copied from