diff --git a/.gitignore b/.gitignore index 73ce309..15fa5f8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -SOURCES/linux-firmware-20220726.tar.xz -SOURCES/yellow_carp_dmcub.bin +SOURCES/linux-firmware-20230217.tar.xz diff --git a/.linux-firmware.metadata b/.linux-firmware.metadata index 62d88f6..6d321b3 100644 --- a/.linux-firmware.metadata +++ b/.linux-firmware.metadata @@ -1,2 +1 @@ -f5ea7c14f9f3fdd302f23834871a1c2d43ac2a15 SOURCES/linux-firmware-20220726.tar.xz -e5f890a55d4d39860c9f051e030841a08084857b SOURCES/yellow_carp_dmcub.bin +20808b417ed66349f48993ca33e2cbec64e7e729 SOURCES/linux-firmware-20230217.tar.xz diff --git a/SPECS/linux-firmware.spec b/SPECS/linux-firmware.spec index 6153666..256c7ba 100644 --- a/SPECS/linux-firmware.spec +++ b/SPECS/linux-firmware.spec @@ -1,12 +1,12 @@ -%global checkout 150864a4 +%global checkout 83f1d778 -%global firmware_release 111 +%global firmware_release 113 %global _firmwarepath /usr/lib/firmware %define _binaries_in_noarch_packages_terminate_build 0 Name: linux-firmware -Version: 20220726 +Version: 20230217 Release: %{firmware_release}.git%{checkout}%{?dist} Summary: Firmware files used by the Linux kernel License: GPL+ and GPLv2+ and MIT and Redistributable, no modification permitted @@ -18,8 +18,6 @@ BuildArch: noarch # This is still causing problems in RHEL9 (see bug 1959913) and because of that we should keep out of RHEL8 too # 2) git archive --worktree-attributes --format=tar --prefix=linux-firmware-%%{checkout}/ %%{checkout} | xz > linux-firmware-%%{version}.tar.xz Source0: %{name}-%{version}.tar.xz -# Updated AMD GPU firmware from linux-firmware commit ba115d4589ee2792f00b779aab3ea00de7911f30 -Source1: yellow_carp_dmcub.bin Provides: kernel-firmware = %{version} xorg-x11-drv-ati-firmware = 7.0 Obsoletes: kernel-firmware < %{version} xorg-x11-drv-ati-firmware < 6.13.0-0.22 @@ -280,9 +278,6 @@ mkdir -p $RPM_BUILD_ROOT/%{_firmwarepath} mkdir -p $RPM_BUILD_ROOT/%{_firmwarepath}/updates make DESTDIR=%{buildroot}/ FIRMWAREDIR=%{_firmwarepath} install -# Copy updated AMD GPU firmware into place -cp %{SOURCE1} $RPM_BUILD_ROOT/%{_firmwarepath}/amdgpu/ - pushd $RPM_BUILD_ROOT/%{_firmwarepath} # Remove firmware shipped in separate packages already # Perhaps these should be built as subpackages of linux-firmware? @@ -433,9 +428,6 @@ sed -e 's/^/%%dir /' linux-firmware.dirs >> linux-firmware.files %config(noreplace) %{_firmwarepath}/netronome/nic_AMDA* %changelog -* Fri Feb 17 2023 Jarod Wilson - 20220726-111.git150864a4 -- Update AMD GPU firmware for multiple monitor fixes (rhbz 2165148) - * Tue Jul 26 2022 Jarod Wilson - 20220726-110.git150864a4 - Omit unused password-protected vxge firmware files from package (rhbz 2108051) - Pick up latest AMD GPU firmwares