rpms/kernel
9
2
Fork 4
Code Issues Pull Requests Releases Activity

use -delete on find commands where possible rather than forking out to xargs/rm

Browse Source
This commit is contained in:
Peter Robinson 2018-10-14 10:21:30 +01:00
parent f0d49a4dcb
commit fae554d6cb
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kernel.spec
View File

@ -1274,7 +1274,7 @@ BuildKernel() {
%ifarch %{arm} aarch64 %ifarch %{arm} aarch64
%{make} %{?make_opts} ARCH=$Arch dtbs dtbs_install INSTALL_DTBS_PATH=$RPM_BUILD_ROOT/%{image_install_path}/dtb-$KernelVer %{make} %{?make_opts} ARCH=$Arch dtbs dtbs_install INSTALL_DTBS_PATH=$RPM_BUILD_ROOT/%{image_install_path}/dtb-$KernelVer
cp -r $RPM_BUILD_ROOT/%{image_install_path}/dtb-$KernelVer $RPM_BUILD_ROOT/lib/modules/$KernelVer/dtb cp -r $RPM_BUILD_ROOT/%{image_install_path}/dtb-$KernelVer $RPM_BUILD_ROOT/lib/modules/$KernelVer/dtb
find arch/$Arch/boot/dts -name '*.dtb' -type f | xargs rm -f find arch/$Arch/boot/dts -name '*.dtb' -type f -delete
%endif %endif
# Start installing the results # Start installing the results
@ -1665,7 +1665,7 @@ make ARCH=%{hdrarch} INSTALL_HDR_PATH=$RPM_BUILD_ROOT/usr headers_install
find $RPM_BUILD_ROOT/usr/include \ find $RPM_BUILD_ROOT/usr/include \
\( -name .install -o -name .check -o \ \( -name .install -o -name .check -o \
-name ..install.cmd -o -name ..check.cmd \) | xargs rm -f -name ..install.cmd -o -name ..check.cmd \) -delete
%endif %endif
@ -1675,7 +1675,7 @@ make ARCH=%{hdrarch} INSTALL_HDR_PATH=$RPM_BUILD_ROOT/usr/tmp-headers headers_in
find $RPM_BUILD_ROOT/usr/tmp-headers/include \ find $RPM_BUILD_ROOT/usr/tmp-headers/include \
\( -name .install -o -name .check -o \ \( -name .install -o -name .check -o \
-name ..install.cmd -o -name ..check.cmd \) | xargs rm -f -name ..install.cmd -o -name ..check.cmd \) -delete
# Copy all the architectures we care about to their respective asm directories # Copy all the architectures we care about to their respective asm directories
for arch in arm arm64 powerpc s390 x86 ; do for arch in arm arm64 powerpc s390 x86 ; do