[OS-BUILD PATCHv3 10/24] redhat/Makefile: Move PREBUILD_GIT_ONLY to Makefile.variables

[Prarit Bhargava (via Email Bridge)]

From: Prarit Bhargava <prarit(a)redhat.com&gt;

redhat/Makefile: Move PREBUILD_GIT_ONLY to Makefile.variables

Move PREBUILD_GIT_ONLY to Makefile.variables.

Signed-off-by: Prarit Bhargava <prarit(a)redhat.com&gt;

diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -79,10 +79,12 @@ ifeq ($(SNAPSHOT),1)
     PREBUILD:=0$(KEXTRAVERSION).
     RPMKPATCHLEVEL:=$(shell expr $(RPMKPATCHLEVEL) + 1)
   endif
-  ifneq ($(filter $(MAKECMDGOALS),dist-git-test dist-git),)
-    PREBUILD_GIT_ONLY ?= 0
-  else
-    PREBUILD_GIT_ONLY ?= 1
+  ifndef PREBUILD_GIT_ONLY
+    ifneq ($(filter $(MAKECMDGOALS),dist-git-test dist-git),)
+      PREBUILD_GIT_ONLY:=0
+    else
+      PREBUILD_GIT_ONLY:=1
+    endif
   endif
   ifeq ($(PREBUILD_GIT_ONLY),1)
     PREBUILD:=$(PREBUILD)$(MARKER).
diff --git a/redhat/Makefile.variables b/redhat/Makefile.variables
index blahblah..blahblah 100644
--- a/redhat/Makefile.variables
+++ b/redhat/Makefile.variables
@@ -90,3 +90,9 @@ BUILD_FLAGS ?=
 # This sets the incremental build version value in the rpm NVR.  If unset, this
 # defaults to RHEL_RELEASE from Makefile.rhelver
 BUILD ?=
+
+# Builds may include a s390x+zfcpdump arch build, which results in the build
+# failing because the UTS_RELEASE field exceeded 64 chars.  This variable can
+# be set to 1 to decrease the kernel UTS_RELEASE and PKGRELEASE by 11 characters
+# (YYYYMMDDgit).
+PREBUILD_GIT_ONLY ?=

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