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 <alexander.burmashev@oracle.com>
Reviewed-by: Somasundaram Krishnasamy <somasundaram.krishnasamy@oracle.com>
Signed-off-by: Brian Maly <brian.maly@oracle.com>

diff --git a/uek-rpm/ol6/kernel-uek.spec b/uek-rpm/ol6/kernel-uek.spec
index d7ac8be50557c9111e9003496bd1db39c8c7189f..cde35262605f4fb587937d666b8036d51a3b4fe5 100644 (file)
--- 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 b769ce9885112101b4e045af90e312185775d0b1..5b28f489ae2544acb6a457c4cfe5979316779970 100644 (file)
--- 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.