From 43acffe376c8d1b8c6e9a2781156c33278950938 Mon Sep 17 00:00:00 2001 From: Slava Barinov Date: Wed, 12 Oct 2016 12:06:23 +0300 Subject: packaging: switch find calls from -exec to -delete and xargs The -delete and xargs approach is faster than -exec and in Tizen 3.0 cross-builds it grants huge build acceleration due to tool acceleration system peculiarities. Change-Id: Ibbbb82962235cd098cd6952c288e9f120bb63ed3 Signed-off-by: Slava Barinov Signed-off-by: Seung-Woo Kim --- packaging/linux-exynos-tm2.spec | 30 +++++++++++++++--------------- packaging/odroid-linux-kernel.spec | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/packaging/linux-exynos-tm2.spec b/packaging/linux-exynos-tm2.spec index b12df4e6b72b..699eddc757a4 100644 --- a/packaging/linux-exynos-tm2.spec +++ b/packaging/linux-exynos-tm2.spec @@ -130,8 +130,8 @@ install -m 644 COPYING %{_builddir}/boot/ make INSTALL_MOD_STRIP=1 INSTALL_MOD_PATH=%{_builddir} modules_install # 2-5. Install uapi headers -find uapi-headers/usr/include -name ".install" | xargs rm -f -find uapi-headers/usr/include -name "..install.cmd" | xargs rm -f +find uapi-headers/usr/include -name ".install" -delete +find uapi-headers/usr/include -name "..install.cmd" -delete rm -f uapi-headers/usr/include/asm*/atomic.h rm -f uapi-headers/usr/include/asm*/io.h mv uapi-headers/usr %{_builddir}/ @@ -143,19 +143,19 @@ rm -rf vmlinux* rm -rf kernel.img rm -rf uapi-headers rm -f tools/mkimage* -find %{_builddir}/linux-kernel-%{version} -name ".tmp_vmlinux*" -exec rm -f {} \; -find %{_builddir}/linux-kernel-%{version} -name ".gitignore" -exec rm -f {} \; -find %{_builddir}/linux-kernel-%{version} -name "\.*dtb*tmp" -exec rm -f {} \; -find %{_builddir}/linux-kernel-%{version} -name "\.*dtb" -exec rm -f {} \; -find %{_builddir}/linux-kernel-%{version} -name "*\.*tmp" -exec rm -f {} \; -find %{_builddir}/linux-kernel-%{version} -name "vmlinux" -exec rm -f {} \; -find %{_builddir}/linux-kernel-%{version} -name "Image" -exec rm -f {} \; -find %{_builddir}/linux-kernel-%{version} -name "Image.gz" -exec rm -f {} \; -find %{_builddir}/linux-kernel-%{version} -name "*.cmd" -exec rm -f {} \; -find %{_builddir}/linux-kernel-%{version} -name "*\.ko" -exec rm -f {} \; -find %{_builddir}/linux-kernel-%{version} -name "*\.o" -exec rm -f {} \; -find %{_builddir}/linux-kernel-%{version} -name "*\.S" -exec rm -f {} \; -find %{_builddir}/linux-kernel-%{version} -name "*\.c" -not -path "%{_builddir}/linux-kernel-%{version}/scripts/*" -exec rm -f {} \; +find %{_builddir}/linux-kernel-%{version} -name ".tmp_vmlinux*" -delete +find %{_builddir}/linux-kernel-%{version} -name ".gitignore" -delete +find %{_builddir}/linux-kernel-%{version} -name "\.*dtb*tmp" -delete +find %{_builddir}/linux-kernel-%{version} -name "\.*dtb" -delete +find %{_builddir}/linux-kernel-%{version} -name "*\.*tmp" -delete +find %{_builddir}/linux-kernel-%{version} -name "vmlinux" -delete +find %{_builddir}/linux-kernel-%{version} -name "Image" -delete +find %{_builddir}/linux-kernel-%{version} -name "Image.gz" -delete +find %{_builddir}/linux-kernel-%{version} -name "*.cmd" -delete +find %{_builddir}/linux-kernel-%{version} -name "*\.ko" -delete +find %{_builddir}/linux-kernel-%{version} -name "*\.o" -delete +find %{_builddir}/linux-kernel-%{version} -name "*\.S" -delete +find %{_builddir}/linux-kernel-%{version} -name "*\.c" -not -path "%{_builddir}/linux-kernel-%{version}/scripts/*" -delete # 3-2. move files for devel package cd %{_builddir} diff --git a/packaging/odroid-linux-kernel.spec b/packaging/odroid-linux-kernel.spec index 32580da03940..5fd5b6705ff4 100644 --- a/packaging/odroid-linux-kernel.spec +++ b/packaging/odroid-linux-kernel.spec @@ -86,7 +86,7 @@ rm -rf %{buildroot}/System.map* rm -rf %{buildroot}/vmlinux* # 7. Update file permisions -find %{buildroot}/lib/modules/ -name "*.ko" -type f -exec chmod 755 {} \; +find %{buildroot}/lib/modules/ -name "*.ko" -type f -print0 | xargs -0 chmod 755 # 8. Create symbolic links rm -f %{buildroot}/lib/modules/%{fullVersion}/build -- cgit v1.2.3