[OS-BUILD PATCH] rpmspec: fix check that calls InitBuildVars

[Herton R. Krzesinski (via Email Bridge)]

From: Herton R. Krzesinski <herton(a)redhat.com&gt;

rpmspec: fix check that calls InitBuildVars

InitBuildVars is only called in case BuildKernel is not called (because
it already calls InitBuildVars), and that is done eg. when all kernel
builds are disabled but still building of tools is wanted which needs
the definitions/variables it declares. However, the check is missing the
case when armv7hl with_pae is enabled which already called
BuildKernel->InitBuildVars, this just adds the missing check.

Signed-off-by: Herton R. Krzesinski <herton(a)redhat.com&gt;

diff a/redhat/kernel.spec.template b/redhat/kernel.spec.template
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -2043,7 +2043,7 @@ BuildKernel %make_target %kernel_image %{_use_vdso}
 %endif
 
 %ifnarch noarch i686
-%if !%{with_debug} && !%{with_zfcpdump} && !%{with_up}
+%if !%{with_debug} && !%{with_zfcpdump} && !%{with_pae} &&
!%{with_up}
 # If only building the user space tools, then initialize the build environment
 # and some variables so that the various userspace tools can be built.
 InitBuildVars

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1134

[Jan Stancek (via Email Bridge)]

From: Jan Stancek on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1134#note_5764...

Acked-by: Jan Stancek <jstancek(a)redhat.com&gt;