From e7f86c239d33bfb9b40c677f0c5d44b5dd19e8c7ab158d641b4efe38b22827ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 29 Apr 2025 12:46:26 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main kernel-firmware-bnx2 revision bff84e31c791d4db7911fc415d9c4796 --- kernel-firmware-bnx2.changes | 9 +++++++ kernel-firmware-bnx2.spec | 34 +++++++++++++-------------- kernel-firmware-tools-20250211.tar.xz | 3 --- kernel-firmware-tools-20250425.tar.gz | 3 +++ 4 files changed, 28 insertions(+), 21 deletions(-) delete mode 100644 kernel-firmware-tools-20250211.tar.xz create mode 100644 kernel-firmware-tools-20250425.tar.gz diff --git a/kernel-firmware-bnx2.changes b/kernel-firmware-bnx2.changes index 788cfd7..fbdbe6e 100644 --- a/kernel-firmware-bnx2.changes +++ b/kernel-firmware-bnx2.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Apr 25 13:52:22 UTC 2025 - Takashi Iwai + +- Change conflicts filesystem < 84 to conflicts filesystem without + may-perform-usrmerge. Version 84 is specific to Tumbleweed; CODE + 16 uses Version 16; yet we need to ensure we get an up-to-date + version of filesystem. Relying on the recently introduced provides + instructing zypp about the usrmerge is perfect for this use case. + ------------------------------------------------------------------- Tue Feb 11 09:26:37 UTC 2025 - Takashi Iwai diff --git a/kernel-firmware-bnx2.spec b/kernel-firmware-bnx2.spec index 1a2e8d9..361db52 100644 --- a/kernel-firmware-bnx2.spec +++ b/kernel-firmware-bnx2.spec @@ -26,45 +26,40 @@ Name: kernel-firmware-bnx2 Version: 20250206 Release: 0 Summary: Kernel firmware files for Broadcom network drivers -License: SUSE-Firmware AND GPL-2.0-or-later +License: GPL-2.0-or-later AND SUSE-Firmware Group: System/Kernel URL: https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/ Source0: %{name}-%{version}.tar.xz -# URL: https://github.com/openSUSE/kernel-firmware-tools/ -Source1: kernel-firmware-tools-20250211.tar.xz +Source1: https://github.com/openSUSE/kernel-firmware-tools/archive/refs/tags/20250425.tar.gz#/kernel-firmware-tools-20250425.tar.gz Source2: %{name}-rpmlintrc Source3: git_id Source10: aliases BuildRequires: suse-module-tools Requires(post): %{_bindir}/mkdir Requires(post): %{_bindir}/touch -Requires(postun):%{_bindir}/mkdir -Requires(postun):%{_bindir}/touch +Requires(postun): %{_bindir}/mkdir +Requires(postun): %{_bindir}/touch Requires(post): dracut >= 049 Conflicts: kernel < 5.3 Conflicts: kernel-firmware-uncompressed BuildArch: noarch %if 0%{?suse_version} >= 1550 -# make sure we have post-usrmerge filesystem package on TW -Conflicts: filesystem < 84 +Conflicts: (filesystem without may-perform-usrmerge) %endif +Supplements: modalias(pci:v00001077d000016A1sv*sd*bc*sc*i*) +Supplements: modalias(pci:v00001077d000016A4sv*sd*bc*sc*i*) +Supplements: modalias(pci:v00001077d000016ADsv*sd*bc*sc*i*) Supplements: modalias(pci:v000014E4d00001639sv*sd*bc*sc*i*) Supplements: modalias(pci:v000014E4d0000163Asv*sd*bc*sc*i*) Supplements: modalias(pci:v000014E4d0000163Bsv*sd*bc*sc*i*) Supplements: modalias(pci:v000014E4d0000163Csv*sd*bc*sc*i*) +Supplements: modalias(pci:v000014E4d0000163Dsv*sd*bc*sc*i*) +Supplements: modalias(pci:v000014E4d0000163Esv*sd*bc*sc*i*) +Supplements: modalias(pci:v000014E4d0000163Fsv*sd*bc*sc*i*) Supplements: modalias(pci:v000014E4d0000164Asv*sd*bc*sc*i*) Supplements: modalias(pci:v000014E4d0000164Asv0000103Csd00003101bc*sc*i*) Supplements: modalias(pci:v000014E4d0000164Asv0000103Csd00003106bc*sc*i*) Supplements: modalias(pci:v000014E4d0000164Csv*sd*bc*sc*i*) -Supplements: modalias(pci:v000014E4d000016AAsv*sd*bc*sc*i*) -Supplements: modalias(pci:v000014E4d000016AAsv0000103Csd00003102bc*sc*i*) -Supplements: modalias(pci:v000014E4d000016ACsv*sd*bc*sc*i*) -Supplements: modalias(pci:v00001077d000016A1sv*sd*bc*sc*i*) -Supplements: modalias(pci:v00001077d000016A4sv*sd*bc*sc*i*) -Supplements: modalias(pci:v00001077d000016ADsv*sd*bc*sc*i*) -Supplements: modalias(pci:v000014E4d0000163Dsv*sd*bc*sc*i*) -Supplements: modalias(pci:v000014E4d0000163Esv*sd*bc*sc*i*) -Supplements: modalias(pci:v000014E4d0000163Fsv*sd*bc*sc*i*) Supplements: modalias(pci:v000014E4d0000164Esv*sd*bc*sc*i*) Supplements: modalias(pci:v000014E4d0000164Fsv*sd*bc*sc*i*) Supplements: modalias(pci:v000014E4d00001650sv*sd*bc*sc*i*) @@ -79,7 +74,10 @@ Supplements: modalias(pci:v000014E4d000016A2sv*sd*bc*sc*i*) Supplements: modalias(pci:v000014E4d000016A4sv*sd*bc*sc*i*) Supplements: modalias(pci:v000014E4d000016A5sv*sd*bc*sc*i*) Supplements: modalias(pci:v000014E4d000016A9sv*sd*bc*sc*i*) +Supplements: modalias(pci:v000014E4d000016AAsv*sd*bc*sc*i*) +Supplements: modalias(pci:v000014E4d000016AAsv0000103Csd00003102bc*sc*i*) Supplements: modalias(pci:v000014E4d000016ABsv*sd*bc*sc*i*) +Supplements: modalias(pci:v000014E4d000016ACsv*sd*bc*sc*i*) Supplements: modalias(pci:v000014E4d000016ADsv*sd*bc*sc*i*) Supplements: modalias(pci:v000014E4d000016AEsv*sd*bc*sc*i*) Supplements: modalias(pci:v000014E4d000016AFsv*sd*bc*sc*i*) @@ -87,9 +85,9 @@ Supplements: modalias(pci:v000014E4d000016AFsv*sd*bc*sc*i*) %description This package contains kernel firmware files for Broadcom network drivers. - %prep -%autosetup -a1 -p1 +%autosetup -p1 +tar xf %{S:1} --strip-components=1 # strip down WHENCE for the topic scripts/strip-topic-whence.sh bnx2 < WHENCE > WHENCE.new mv WHENCE.new WHENCE diff --git a/kernel-firmware-tools-20250211.tar.xz b/kernel-firmware-tools-20250211.tar.xz deleted file mode 100644 index 036a78f..0000000 --- a/kernel-firmware-tools-20250211.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a1553e6b4c9ab0cacf4c5b632d74a16b6cee2dd69a370cfc57685221a705600d -size 14424 diff --git a/kernel-firmware-tools-20250425.tar.gz b/kernel-firmware-tools-20250425.tar.gz new file mode 100644 index 0000000..a45f059 --- /dev/null +++ b/kernel-firmware-tools-20250425.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7364202554baf494a3a469b17646832374b3651358c255627f99c4ec4a4338b6 +size 16848