[OS-BUILD PATCHv3 6/24] redhat/Makefile: Move BUILD_TARGET and BUILD_SCRATCH_TARGET to Makefile.variables

[Prarit Bhargava (via Email Bridge)]

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

redhat/Makefile: Move BUILD_TARGET and BUILD_SCRATCH_TARGET to Makefile.variables

Move BUILD_TARGET and BUILD_SCRATCH_TARGET 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
@@ -132,24 +132,34 @@ ifeq ("$(DISTRO)", "fedora")
   SINGLE_TARBALL:=0
   TARFILE_RELEASE:=$(UPSTREAM_TARBALL_NAME)
   RHDISTGIT_BRANCH:=rawhide
-  BUILD_SCRATCH_TARGET ?= temp-ark-rhel-8-test
+  ifndef BUILD_SCRATCH_TARGET
+    BUILD_SCRATCH_TARGET:=temp-ark-rhel-8-test
+  endif
 else ifeq ("$(DISTRO)", "centos")
   # A unified tarball means that the tarball in the srpm contains both the
   # upstream sources and RHEL specific patches.
   SINGLE_TARBALL:=1
   RHDISTGIT_BRANCH:=c$(RHEL_MAJOR)s
   BUILD_PROFILE ?= -p stream
-  BUILD_SCRATCH_TARGET ?= c$(RHEL_MAJOR)s-candidate
+  ifndef BUILD_SCRATCH_TARGET
+    BUILD_SCRATCH_TARGET:=c$(RHEL_MAJOR)s-candidate
+  endif
   TARFILE_RELEASE:=$(KVERSION)-$(PKGRELEASE)
 else
   # A unified tarball means that the tarball in the srpm contains both the
   # upstream sources and RHEL specific patches.
   SINGLE_TARBALL:=1
   RHDISTGIT_BRANCH:=rhel-$(RHEL_MAJOR).$(RHEL_MINOR).0
-  BUILD_SCRATCH_TARGET ?= rhel-$(RHEL_MAJOR).$(RHEL_MINOR).0-test-pesign
+  ifndef BUILD_SCRATCH_TARGET
+    BUILD_SCRATCH_TARGET:=rhel-$(RHEL_MAJOR).$(RHEL_MINOR).0-test-pesign
+  endif
   TARFILE_RELEASE:=$(KVERSION)-$(PKGRELEASE)
 endif
 
+ifndef BUILD_TARGET
+  BUILD_TARGET:=--scratch $(BUILD_SCRATCH_TARGET)
+endif
+
 TARFILE:=linux-$(TARFILE_RELEASE).tar.xz
 TARBALL:=$(REDHAT)/$(TARFILE)
 DISTRO_BUILD:=$(PREBUILD)$(shell echo $(BUILD) | sed -e
's|\(^[0-9]\{1,4\}\)\..*|\1|')
@@ -189,7 +199,6 @@ else
    PROCESS_CONFIGS_OPTS=-n -w -c
 endif
 
-BUILD_TARGET ?= --scratch $(BUILD_SCRATCH_TARGET)
 FLAVOR =
 
 RHGITURL?=$(shell $(GIT) config rhg.url || $(GIT) config remote.origin.url)
diff --git a/redhat/Makefile.variables b/redhat/Makefile.variables
index blahblah..blahblah 100644
--- a/redhat/Makefile.variables
+++ b/redhat/Makefile.variables
@@ -69,3 +69,13 @@ GIT ?= git
 # the "top of tree" commit ID.  This is useful in cases where users want to
 # build against an older commit but do not want to check out the tree.
 HEAD ?= HEAD
+
+# This is the brew/koji scratch build target.  A list of targets can be found
+# by executing the 'brew list-targets' or 'koji list-targets' command. 
The
+# default values can be found in redhat/Makefile and are dependent on the
+# target OS.  The target OS can be changed by setting the DIST or DISTRO
+# variables.
+BUILD_SCRATCH_TARGET ?=
+
+# This is the brew/koji command scratch build options.
+BUILD_TARGET ?=

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