From 74f47270a2e831bcccb110fd5008b7a28fef1321 Mon Sep 17 00:00:00 2001 From: wangxiao65 Date: Fri, 20 Sep 2024 06:46:12 +0000 Subject: [PATCH] need use copy-firmware.sh, modify the process of build and install (cherry picked from commit 2a70f63e074ac6f06e20d97df3f85df352596593) --- linux-firmware.spec | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/linux-firmware.spec b/linux-firmware.spec index bf9ac34..10b64cb 100644 --- a/linux-firmware.spec +++ b/linux-firmware.spec @@ -1,6 +1,6 @@ %define _binaries_in_noarch_packages_terminate_build 0 -%global release 1 +%global release 2 %global _lib_path /usr/lib/firmware %global _license_path /usr/share/licenses @@ -122,11 +122,6 @@ This package contains firmware images required by some devices. %autosetup -p1 %build -rm -f usbdux/*dux */*.asm -rm -rf carl9170fw -rm -f Makefile README configure -rm -rf check_whence.py copy-firmware.sh -rm -rf build_packages.py contrib %install mkdir -p %{buildroot}/%{_lib_path} @@ -134,6 +129,15 @@ mkdir -p %{buildroot}/%{_license_path} cp -r * %{buildroot}/%{_lib_path} cp -r WHENCE LICENCE.* %{buildroot}/%{_license_path} rm %{buildroot}/%{_lib_path}/{WHENCE,LICENCE.*,LICENSE.*} +make COPYOPTS="--ignore-duplicates" DESTDIR=%{buildroot} FIRMWAREDIR=%{_lib_path} install + +pushd %{buildroot}/%{_lib_path} +rm -f usbdux/*dux */*.asm +rm -rf carl9170fw +rm -f Makefile README configure +rm -rf check_whence.py copy-firmware.sh +rm -rf build_packages.py contrib +popd %files %dir %{_lib_path} @@ -176,6 +180,9 @@ rm %{buildroot}/%{_lib_path}/{WHENCE,LICENCE.*,LICENSE.*} %changelog +* Thu Sep 19 2024 wangxiao - 20240811-2 +- need use copy-firmware.sh, modify the process of build and install + * Thu Aug 29 2024 wangxiao - 20240811-1 - update to 20240811 @@ -209,10 +216,10 @@ rm %{buildroot}/%{_lib_path}/{WHENCE,LICENCE.*,LICENSE.*} * Tue Dec 15 2020 xinghe - 20200817-3 - remove Obsoletes relationship error -* Mon AUg 31 2020 xinghe - 20200817-2 +* Mon Aug 31 2020 xinghe - 20200817-2 - fix source url -* Wed Aug 25 2020 xinghe - 20200817-1 +* Tue Aug 25 2020 xinghe - 20200817-1 - update to 20200817 * Fri Jul 24 2020 jinzhimin - 20200619-1 -- Gitee