From: Alexander Burmashev Date: Thu, 7 Feb 2019 15:45:10 +0000 (-0800) Subject: uek-rpm: optimize find-requires usage X-Git-Tag: v4.1.12-124.31.3~277 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a7e1d6714e24930ba16ba856854e4017b36d7bea;p=users%2Fjedix%2Flinux-maple.git uek-rpm: optimize find-requires usage There are no deps found for debuginfo-common, doc and headers subpackage, so Autoreq: no is now set for them, also switch from /usr/lib/rpm/redhat/find-requires usage to /usr/lib/rpm/rpmdeps --requires, since latter is faster and less buggy. Both changes noticeably boost kernel rpm build time. Orabug: 29323635 Signed-off-by: Alex Burmashev Reviewed-by: Somasundaram Krishnasamy Signed-off-by: Brian Maly --- diff --git a/uek-rpm/ol6/kernel-uek.spec b/uek-rpm/ol6/kernel-uek.spec index d7ac8be50557c..cde35262605f4 100644 --- a/uek-rpm/ol6/kernel-uek.spec +++ b/uek-rpm/ol6/kernel-uek.spec @@ -621,7 +621,7 @@ BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root # Pass path of the RPM temp dir containing kabideps to find-provides script. %global _use_internal_dependency_generator 0 %define __find_provides %_sourcedir/find-provides %{_tmppath} -%define __find_requires /usr/lib/rpm/redhat/find-requires kernel +%define __find_requires /usr/lib/rpm/rpmdeps --requires %description The kernel package contains the Linux kernel (vmlinuz), the core of any @@ -648,6 +648,7 @@ Summary: Various documentation bits found in the kernel source Group: Documentation Obsoletes: kernel-doc Provides: kernel-doc +AutoReq: no %description doc This package contains documentation files from the kernel source. Various bits of information about the Linux kernel and the @@ -664,6 +665,7 @@ Obsoletes: glibc-kernheaders Obsoletes: kernel-headers Provides: kernel-headers Provides: glibc-kernheaders = 3.0-46 +AutoReq: no %description headers Kernel-headers includes the C header files that specify the interface between the Linux kernel and userspace libraries and programs. The @@ -699,6 +701,7 @@ files combining both kernel and initial ramdisk. Summary: Kernel source files used by %{name}-debuginfo packages Group: Development/Debug Provides: %{name}-debuginfo-common-%{_target_cpu} = %{version}-%{release} +AutoReq: no %description debuginfo-common This package is required by %{name}-debuginfo subpackages. It provides the kernel source files common to all builds. diff --git a/uek-rpm/ol7/kernel-uek.spec b/uek-rpm/ol7/kernel-uek.spec index b769ce9885112..5b28f489ae254 100644 --- a/uek-rpm/ol7/kernel-uek.spec +++ b/uek-rpm/ol7/kernel-uek.spec @@ -615,7 +615,7 @@ BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root # Pass path of the RPM temp dir containing kabideps to find-provides script. %global _use_internal_dependency_generator 0 %define __find_provides %_sourcedir/find-provides %{_tmppath} -%define __find_requires /usr/lib/rpm/redhat/find-requires kernel +%define __find_requires /usr/lib/rpm/rpmdeps --requires %description The kernel package contains the Linux kernel (vmlinuz), the core of any @@ -642,6 +642,7 @@ Summary: Various documentation bits found in the kernel source Group: Documentation Obsoletes: kernel-doc Provides: kernel-doc +AutoReq: no %description doc This package contains documentation files from the kernel source. Various bits of information about the Linux kernel and the @@ -658,6 +659,7 @@ Obsoletes: glibc-kernheaders Obsoletes: kernel-headers Provides: kernel-headers Provides: glibc-kernheaders = 3.0-46 +AutoReq: no %description headers Kernel-headers includes the C header files that specify the interface between the Linux kernel and userspace libraries and programs. The @@ -693,6 +695,7 @@ files combining both kernel and initial ramdisk. Summary: Kernel source files used by %{name}-debuginfo packages Group: Development/Debug Provides: %{name}-debuginfo-common-%{_target_cpu} = %{version}-%{release} +AutoReq: no %description debuginfo-common This package is required by %{name}-debuginfo subpackages. It provides the kernel source files common to all builds.