diff --git a/.gitignore b/.gitignore index c03ac7b..78cc614 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/linux-firmware-20190918.tar.gz +SOURCES/linux-firmware-20200323.tar.gz diff --git a/.linux-firmware.metadata b/.linux-firmware.metadata index 76eb3ec..c439bb5 100644 --- a/.linux-firmware.metadata +++ b/.linux-firmware.metadata @@ -1 +1 @@ -5565b4860e1d64bdbd29ea68305d2c7c57bef564 SOURCES/linux-firmware-20190918.tar.gz +1973fc98826ec8c2526aac02e499e6426ce82d2e SOURCES/linux-firmware-20200323.tar.gz diff --git a/SPECS/linux-firmware.spec b/SPECS/linux-firmware.spec index abea39d..f84ec7d 100644 --- a/SPECS/linux-firmware.spec +++ b/SPECS/linux-firmware.spec @@ -1,8 +1,10 @@ -%global checkout 6c6918a -%global firmware_release 74 +%global checkout 8eb0b28 +%global firmware_release 78 + +%define _binary_payload w9.xzdio Name: linux-firmware -Version: 20190918 +Version: 20200323 Release: %{firmware_release}.git%{checkout}%{?dist} Summary: Firmware files used by the Linux kernel @@ -31,6 +33,8 @@ Obsoletes: libertas-sd8686-firmware Obsoletes: libertas-sd8787-firmware Obsoletes: libertas-usb8388-olpc-firmware +BuildRequires: git make + %define fwdir /usr/lib/firmware %define _binaries_in_noarch_packages_terminate_build 0 @@ -222,6 +226,15 @@ contained inside the provided LICENSE file. Please read it carefully. %setup -q -c -n linux-firmware-%{checkout} %build + +%install +rm -rf $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT%{fwdir} +mkdir -p $RPM_BUILD_ROOT%{fwdir}/updates +make DESTDIR=$RPM_BUILD_ROOT/ FIRMWAREDIR=%{fwdir} install + +pushd $RPM_BUILD_ROOT/%{fwdir} + # Remove firmware shipped in separate packages already # Perhaps these should be built as subpackages of linux-firmware? rm -rf ess korg sb16 yamaha @@ -246,15 +259,9 @@ rm -f i6050-fw-usb-1.5.sbcf # Remove images for vxge, we do not provide that driver in RHEL7 kernel rm -rf vxge -# Remove the check_whence.py file -rm -f check_whence.py +rm -f check_whence.py configure Makefile README -%install -rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT%{fwdir} -mkdir -p $RPM_BUILD_ROOT%{fwdir}/updates -cp -r * $RPM_BUILD_ROOT%{fwdir} -rm $RPM_BUILD_ROOT%{fwdir}/{WHENCE,LICENCE.*,LICENSE.*} +popd # Create file list but exclude firmwares that we place in subpackages FILEDIR=`pwd` @@ -382,6 +389,19 @@ rm -rf $RPM_BUILD_ROOT %doc WHENCE LICENCE.* LICENSE.* %changelog +* Tue Apr 7 2020 Jan Stancek - 20200323-78.git8eb0b28 +- Set higher compression (rhbz 1817410) + +* Mon Mar 23 2020 Jan Stancek - 20200323-77.git8eb0b28 +- Update to latest upstream linux-firmware image for assorted updates (rhbz 1813818) + +* Tue Dec 17 2019 Jan Stancek - 20191203-76.gite8a0f4c +- Fix missing firmware symlinks (rhbz 1783196) + +* Tue Dec 3 2019 Jan Stancek - 20191203-75.gite8a0f4c +- Update to latest upstream linux-firmware image for assorted updates +- Update qed zipped/unzipped firmware to latest upstream (rhbz 1720385) + * Wed Sep 18 2019 Jan Stancek - 20190918-74.git6c6918a - Update to latest upstream linux-firmware image for assorted updates - Update bnx2x firmware to latest upstream (rhbz 1720386)