Updating spec files to explicitly set a build kernel version

Orabug: 30619056 Signed-off-by: Kris Van Hees <kris.van.hees@oracle.com>
oracle · Jun 23, 2021 · 7170888 · 7170888
1 parent e4eb5a9
commit 7170888
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/buildrpm/ol7/dtrace.spec b/buildrpm/ol7/dtrace.spec
@@ -25,7 +25,7 @@
 # under /usr/src/kernels, define local_kernels on the command line (in addition
 # to dtrace_kernels).
 
-%{!?build_kernel: %define build_kernel 5.4.0-1944%{?dist}uek}
+%{!?build_kernel: %define build_kernel 5.4.0-1948.2%{?dist}uek}
 %{!?dtrace_kernels: %define dtrace_kernels %{build_kernel}}
 
 # ARM64 doesn't yet have a 32-bit glibc, so all support for 32-on-64 must be
@@ -44,6 +44,7 @@ Requires:     cpp elfutils-libelf zlib libdtrace-ctf >= 1.1.0 yum libpcap
 BuildRequires: glibc-headers bison flex zlib-devel elfutils-libelf-devel
 BuildRequires: libdtrace-ctf-devel >= 1.1.0 libpcap-devel
 # BuildRequires: glibc-static %{glibc32} wireshark
+BuildRequires: kernel%{variant}-devel = %{build_kernel}
 Summary:      DTrace user interface.
 Version:      2.0.0
 Release:      0.3%{?dist}

diff --git a/buildrpm/ol8/dtrace.spec b/buildrpm/ol8/dtrace.spec
@@ -25,7 +25,7 @@
 # under /usr/src/kernels, define local_kernels on the command line (in addition
 # to dtrace_kernels).
 
-%{!?build_kernel: %define build_kernel 5.4.0-1944%{?dist}uek}
+%{!?build_kernel: %define build_kernel 5.4.0-1948.2%{?dist}uek}
 %{!?dtrace_kernels: %define dtrace_kernels %{build_kernel}}
 
 # ARM64 doesn't yet have a 32-bit glibc, so all support for 32-on-64 must be
@@ -44,6 +44,7 @@ Requires:     cpp elfutils-libelf zlib libdtrace-ctf >= 1.1.0 yum libpcap
 BuildRequires: glibc-headers bison flex zlib-devel elfutils-libelf-devel
 BuildRequires: libdtrace-ctf-devel >= 1.1.0 libpcap-devel
 # BuildRequires: glibc-static %{glibc32} wireshark
+BuildRequires: kernel%{variant}-devel = %{build_kernel}
 Summary:      DTrace user interface.
 Version:      2.0.0
 Release:      0.3%{?dist}