From cfb4a9ebc07d925593dcf00b18792a7713a496c7 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 28 Feb 2023 18:13:45 +0000 Subject: [PATCH] Auto sync2gitlab import of linux-firmware-20230217-113.git83f1d778.el8.src.rpm --- .gitignore | 1 + linux-firmware.spec | 14 +++----------- sources | 3 +-- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index e1d73cc..c9fe101 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ SOURCES/linux-firmware-20220726.tar.xz SOURCES/yellow_carp_dmcub.bin /linux-firmware-20220726.tar.xz /yellow_carp_dmcub.bin +/linux-firmware-20230217.tar.xz diff --git a/linux-firmware.spec b/linux-firmware.spec index 6153666..256c7ba 100644 --- a/linux-firmware.spec +++ b/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 diff --git a/sources b/sources index 999c88a..969ebec 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (linux-firmware-20220726.tar.xz) = 79caaefd71d9dfb6bd14a2e6c9a2f85edc92505fcce4a6ca07d42465c6e24d209052cb6ed73b6421a64994e8bd0e013e14f0c46ee597d368fee998a7df707aed -SHA512 (yellow_carp_dmcub.bin) = 766f48b843d2b0b4bbe30f658189c439179bae6f59fb63116b06c1dea1c066bf1e5e39282e377e8a7838529f36f367fc80399af04fcdc28eb36bfe37c0d34463 +SHA512 (linux-firmware-20230217.tar.xz) = ad28a78385c6400be7bf1ebce65efc0020d7994ff0aad237f16bb37f3568dcee6646d72deec8505c1f03bbb6757e9c111fddcb792ce31d05411b6c93b2b4ae30