From 29113035058b74230c8307fa94b397aae60501588cd63e8e5aa35e8b47f5e503 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Fri, 25 Apr 2025 16:01:32 +0200 Subject: [PATCH] Do not conflict filesystem < 84 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. --- kernel-firmware-mediatek.changes | 9 +++++++++ kernel-firmware-mediatek.spec | 5 ++--- kernel-firmware-tools-20250409.tar.gz | 3 --- kernel-firmware-tools-20250425.tar.gz | 3 +++ 4 files changed, 14 insertions(+), 6 deletions(-) delete mode 100644 kernel-firmware-tools-20250409.tar.gz create mode 100644 kernel-firmware-tools-20250425.tar.gz diff --git a/kernel-firmware-mediatek.changes b/kernel-firmware-mediatek.changes index 2b46026..bf707a3 100644 --- a/kernel-firmware-mediatek.changes +++ b/kernel-firmware-mediatek.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. + ------------------------------------------------------------------- Wed Apr 9 10:11:54 UTC 2025 - Takashi Iwai diff --git a/kernel-firmware-mediatek.spec b/kernel-firmware-mediatek.spec index e726283..9883781 100644 --- a/kernel-firmware-mediatek.spec +++ b/kernel-firmware-mediatek.spec @@ -30,7 +30,7 @@ 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 -Source1: https://github.com/openSUSE/kernel-firmware-tools/archive/refs/tags/20250409.tar.gz#/kernel-firmware-tools-20250409.tar.gz +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 @@ -45,8 +45,7 @@ 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 Provides: ralink-firmware = %{version} Obsoletes: ralink-firmware < %{version} diff --git a/kernel-firmware-tools-20250409.tar.gz b/kernel-firmware-tools-20250409.tar.gz deleted file mode 100644 index 34a0a63..0000000 --- a/kernel-firmware-tools-20250409.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:42aaef90118012b6cb7856be6726379d47c7a0c2477b180ad3d1f49b794ea7c6 -size 16821 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 -- 2.49.0