From e8ef8f4ffecb6fa9638655e513e4b9b14df638ce Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Mon, 2 Oct 2023 05:41:05 -0400 Subject: [PATCH] Flip conditional to make weak-installing firmware the default As it stands, the logic was set up such that the weak dependencies were not being used in ELN, which makes optional minimization of the package set for virtual machine images difficult for RHEL-ish images. --- linux-firmware.spec | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/linux-firmware.spec b/linux-firmware.spec index a564cf6..dae0ad6 100644 --- a/linux-firmware.spec +++ b/linux-firmware.spec @@ -5,7 +5,7 @@ Name: linux-firmware Version: 20230919 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Firmware files used by the Linux kernel License: GPL+ and GPLv2+ and MIT and Redistributable, no modification permitted URL: http://www.kernel.org/ @@ -21,19 +21,19 @@ Provides: kernel-firmware = %{version} Obsoletes: kernel-firmware < %{version} Conflicts: microcode_ctl < 2.1-0 -Recommends: amd-gpu-firmware -Recommends: intel-gpu-firmware -Recommends: nvidia-gpu-firmware -%if 0%{?fedora} > 38 -Recommends: atheros-firmware -Recommends: brcmfmac-firmware -Recommends: mt7xxx-firmware -Recommends: realtek-firmware -%else +%if 0%{?fedora} && 0%{?fedora} < 39 Requires: atheros-firmware Requires: brcmfmac-firmware Requires: mt7xxx-firmware Requires: realtek-firmware +%else +Recommends: amd-gpu-firmware +Recommends: intel-gpu-firmware +Recommends: nvidia-gpu-firmware +Recommends: atheros-firmware +Recommends: brcmfmac-firmware +Recommends: mt7xxx-firmware +Recommends: realtek-firmware %endif %description @@ -469,6 +469,9 @@ sed -e 's/^/%%dir /' linux-firmware.dirs >> linux-firmware.files %{_firmwarepath}/v4l-cx2* %changelog +* Mon Oct 02 2023 Neal Gompa - 20230919-2 +- Flip conditional to make weak-installing firmware the default + * Tue Sep 19 2023 Peter Robinson - 20230919-1 - Update to upstream 20230919 release - amd-ucode: Add note on fam19h warnings