[OS-BUILD PATCHv3 5/24] redhat/Makefile: Remove RHPRODUCT variable

[Prarit Bhargava (via Email Bridge)]

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

redhat/Makefile: Remove RHPRODUCT variable

The only use of RHPRODUCT is to set the RHDISTGIT_BRANCH variable.

Remove the RHPRODUCT variable and just use RHDISTGIT_BRANCH.  This will
make future change easier.

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
@@ -131,13 +131,13 @@ ifeq ("$(DISTRO)", "fedora")
   # and the patches get applied as a diff in the spec file
   SINGLE_TARBALL:=0
   TARFILE_RELEASE:=$(UPSTREAM_TARBALL_NAME)
-  RHPRODUCT:=rawhide
+  RHDISTGIT_BRANCH:=rawhide
   BUILD_SCRATCH_TARGET ?= temp-ark-rhel-8-test
 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
-  RHPRODUCT:=c$(RHEL_MAJOR)s
+  RHDISTGIT_BRANCH:=c$(RHEL_MAJOR)s
   BUILD_PROFILE ?= -p stream
   BUILD_SCRATCH_TARGET ?= c$(RHEL_MAJOR)s-candidate
   TARFILE_RELEASE:=$(KVERSION)-$(PKGRELEASE)
@@ -145,7 +145,7 @@ else
   # A unified tarball means that the tarball in the srpm contains both the
   # upstream sources and RHEL specific patches.
   SINGLE_TARBALL:=1
-  RHPRODUCT:=rhel-$(RHEL_MAJOR).$(RHEL_MINOR).0
+  RHDISTGIT_BRANCH:=rhel-$(RHEL_MAJOR).$(RHEL_MINOR).0
   BUILD_SCRATCH_TARGET ?= rhel-$(RHEL_MAJOR).$(RHEL_MINOR).0-test-pesign
   TARFILE_RELEASE:=$(KVERSION)-$(PKGRELEASE)
 endif
diff --git a/redhat/Makefile.rhpkg b/redhat/Makefile.rhpkg
index blahblah..blahblah 100644
--- a/redhat/Makefile.rhpkg
+++ b/redhat/Makefile.rhpkg
@@ -16,8 +16,6 @@ RHDISTGIT_USER:="$(shell whoami)"
 # Temporary directory to clone the dist-git repo to. Change this if you
 # have a faster storage
 RHDISTGIT_TMP:=/tmp
-# Branch it should be switched into
-RHDISTGIT_BRANCH:=${RHPRODUCT}
 
 # load configuration, starting with home directory then local
 ifeq ("$(RHDISTGIT_CACHE)", "")

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