From fca4aa573fb1d36d5c24f53da156b8c58c02769d Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Sat, 15 Nov 2025 09:07:52 +0100 Subject: [PATCH] Fix duplicate iwlwifi files in iwl*-firmware and linux-firmware packages Signed-off-by: Denys Vlasenko --- linux-firmware.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/linux-firmware.spec b/linux-firmware.spec index 9018b93..57cd16d 100644 --- a/linux-firmware.spec +++ b/linux-firmware.spec @@ -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 - 20251111-157 +- Fix duplicate iwlwifi files in iwl*-firmware and linux-firmware packages +Resolves: RHEL-128087 + * Tue Aug 12 2025 Denys Vlasenko - 20251111-156 - Update linux-firmware to latest upstream (RHEL-128087) Changes since the last update are noted on items below, copied from