diff --git a/linux-firmware.spec b/linux-firmware.spec index 91be1e8..0d6ddae 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,10 +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 %install mkdir -p %{buildroot}/%{_lib_path} @@ -133,6 +129,14 @@ 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 +popd %files %dir %{_lib_path} @@ -175,6 +179,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 + * Fri Aug 30 2024 wangxiao - 20240811-1 - update to 20240811 - linux-firmware has changed python to python3, so remove this patch @@ -194,10 +201,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