Merge: REDHAT: Makefile, dont reset dist-git-tmp if set

MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/4498

JIRA: internal

This reverts my previous attempt at fixing this, and introduces a new fix.
Makefile.rhpkg is called on each invocation of @$(MAKE), because of it,
RHDISTGIT_TMP is being redefined to the default value after the first invocation.
This fixes that by checking if the variable has already been set before
redefining it.

Signed-off-by: Lucas Zampieri <lzampier@redhat.com>

Approved-by: Jan Stancek <jstancek@redhat.com>
Approved-by: Patrick Talbert <ptalbert@redhat.com>
Approved-by: Bruno Meneguele <bmeneg@redhat.com>
Approved-by: John Pittman <jpittman@redhat.com>

Merged-by: Lucas Zampieri <lzampier@redhat.com>

Author: zampierilucas

redhat/Makefile.rhpkg

@@ -19,9 +19,7 @@ endif
 #RHDISTGIT_CACHE:=
 # Temporary directory to clone the dist-git repo to. Change this if you
 # have a faster storage
-ifndef RHDISTGIT_TMP
-  RHDISTGIT_TMP:=/tmp
-endif
+RHDISTGIT_TMP?=/tmp
 
 # load configuration, starting with home directory then local
 ifeq ("$(RHDISTGIT_CACHE)", "")

redhat/self-test/data/centos-6161a435c191.el7

@@ -46,7 +46,6 @@ PROCESS_CONFIGS_OPTS=-n -w -c
 REDHAT=../redhat 
 RELEASETAG=kernel-5.12.0-0.rc4.6.test 
 RHDISTGIT_BRANCH=c9s 
-RHDISTGIT_TMP=/tmp 
 RHDISTGIT_USER="shadowman" 
 RHEL_MAJOR=9 
 RHEL_MINOR=5 

redhat/self-test/data/centos-6161a435c191.fc25

@@ -46,7 +46,6 @@ PROCESS_CONFIGS_OPTS=-n -w -c
 REDHAT=../redhat 
 RELEASETAG=kernel-5.12.0-0.rc4.6.test 
 RHDISTGIT_BRANCH=c9s 
-RHDISTGIT_TMP=/tmp 
 RHDISTGIT_USER="shadowman" 
 RHEL_MAJOR=9 
 RHEL_MINOR=5 

redhat/self-test/data/centos-9f4ad9e425a1.el7

@@ -46,7 +46,6 @@ PROCESS_CONFIGS_OPTS=-n -w -c
 REDHAT=../redhat 
 RELEASETAG=kernel-5.12.0-6.test 
 RHDISTGIT_BRANCH=c9s 
-RHDISTGIT_TMP=/tmp 
 RHDISTGIT_USER="shadowman" 
 RHEL_MAJOR=9 
 RHEL_MINOR=5 

redhat/self-test/data/centos-9f4ad9e425a1.fc25

@@ -46,7 +46,6 @@ PROCESS_CONFIGS_OPTS=-n -w -c
 REDHAT=../redhat 
 RELEASETAG=kernel-5.12.0-6.test 
 RHDISTGIT_BRANCH=c9s 
-RHDISTGIT_TMP=/tmp 
 RHDISTGIT_USER="shadowman" 
 RHEL_MAJOR=9 
 RHEL_MINOR=5 

redhat/self-test/data/centos-a5e13c6df0e4.el7

@@ -46,7 +46,6 @@ PROCESS_CONFIGS_OPTS=-n -w -c
 REDHAT=../redhat 
 RELEASETAG=kernel-5.12.0-0.rc5.6.test 
 RHDISTGIT_BRANCH=c9s 
-RHDISTGIT_TMP=/tmp 
 RHDISTGIT_USER="shadowman" 
 RHEL_MAJOR=9 
 RHEL_MINOR=5 

redhat/self-test/data/centos-a5e13c6df0e4.fc25

@@ -46,7 +46,6 @@ PROCESS_CONFIGS_OPTS=-n -w -c
 REDHAT=../redhat 
 RELEASETAG=kernel-5.12.0-0.rc5.6.test 
 RHDISTGIT_BRANCH=c9s 
-RHDISTGIT_TMP=/tmp 
 RHDISTGIT_USER="shadowman" 
 RHEL_MAJOR=9 
 RHEL_MINOR=5 

redhat/self-test/data/centos-edc9dd1e3c31.el7

@@ -46,7 +46,6 @@ PROCESS_CONFIGS_OPTS=-n -w -c
 REDHAT=../redhat 
 RELEASETAG=kernel-5.12.0-6.test 
 RHDISTGIT_BRANCH=c9s 
-RHDISTGIT_TMP=/tmp 
 RHDISTGIT_USER="shadowman" 
 RHEL_MAJOR=9 
 RHEL_MINOR=5 

redhat/self-test/data/centos-edc9dd1e3c31.fc25

@@ -46,7 +46,6 @@ PROCESS_CONFIGS_OPTS=-n -w -c
 REDHAT=../redhat 
 RELEASETAG=kernel-5.12.0-6.test 
 RHDISTGIT_BRANCH=c9s 
-RHDISTGIT_TMP=/tmp 
 RHDISTGIT_USER="shadowman" 
 RHEL_MAJOR=9 
 RHEL_MINOR=5 

redhat/self-test/data/fedora-6161a435c191.el7

@@ -46,7 +46,6 @@ PROCESS_CONFIGS_OPTS=-n -w -c
 REDHAT=../redhat 
 RELEASETAG=kernel-5.12.0-0.rc4.6.test 
 RHDISTGIT_BRANCH=rawhide 
-RHDISTGIT_TMP=/tmp 
 RHDISTGIT_USER="shadowman" 
 RHEL_MAJOR=9 
 RHEL_MINOR=5