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

zampierilucas · zampierilucas · commit 0562bed0dce3 · 2024-07-01T12:54:14.000-03:00
JIRA: Internal

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.
Remove self-test fixed value for DISTGIT_TMP as now it is defined by
user-config, and then fallsback to /tmp if not found.

Signed-off-by: Lucas Zampieri &lt;lzampier@redhat.com&gt;
diff --git a/redhat/Makefile.rhpkg b/redhat/Makefile.rhpkg
@@ -19,7 +19,7 @@ endif
 #RHDISTGIT_CACHE:=
 # Temporary directory to clone the dist-git repo to. Change this if you
 # have a faster storage
-RHDISTGIT_TMP:=/tmp
+RHDISTGIT_TMP?=/tmp
 
 # load configuration, starting with home directory then local
 ifeq ("$(RHDISTGIT_CACHE)", "")
diff --git a/redhat/self-test/data/centos-6161a435c191.el7 b/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 
diff --git a/redhat/self-test/data/centos-6161a435c191.fc25 b/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 
diff --git a/redhat/self-test/data/centos-9f4ad9e425a1.el7 b/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 
diff --git a/redhat/self-test/data/centos-9f4ad9e425a1.fc25 b/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 
diff --git a/redhat/self-test/data/centos-a5e13c6df0e4.el7 b/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 
diff --git a/redhat/self-test/data/centos-a5e13c6df0e4.fc25 b/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 
diff --git a/redhat/self-test/data/centos-edc9dd1e3c31.el7 b/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 
diff --git a/redhat/self-test/data/centos-edc9dd1e3c31.fc25 b/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 
diff --git a/redhat/self-test/data/fedora-6161a435c191.el7 b/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 
diff --git a/redhat/self-test/data/fedora-6161a435c191.fc25 b/redhat/self-test/data/fedora-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=rawhide 
-RHDISTGIT_TMP=/tmp 
 RHDISTGIT_USER="shadowman" 
 RHEL_MAJOR=9 
 RHEL_MINOR=5 
diff --git a/redhat/self-test/data/fedora-9f4ad9e425a1.el7 b/redhat/self-test/data/fedora-9f4ad9e425a1.el7
@@ -46,7 +46,6 @@ PROCESS_CONFIGS_OPTS=-n -w -c
 REDHAT=../redhat 
 RELEASETAG=kernel-5.12.0-6.test 
 RHDISTGIT_BRANCH=rawhide 
-RHDISTGIT_TMP=/tmp 
 RHDISTGIT_USER="shadowman" 
 RHEL_MAJOR=9 
 RHEL_MINOR=5 
diff --git a/redhat/self-test/data/fedora-9f4ad9e425a1.fc25 b/redhat/self-test/data/fedora-9f4ad9e425a1.fc25
@@ -46,7 +46,6 @@ PROCESS_CONFIGS_OPTS=-n -w -c
 REDHAT=../redhat 
 RELEASETAG=kernel-5.12.0-6.test 
 RHDISTGIT_BRANCH=rawhide 
-RHDISTGIT_TMP=/tmp 
 RHDISTGIT_USER="shadowman" 
 RHEL_MAJOR=9 
 RHEL_MINOR=5 
diff --git a/redhat/self-test/data/fedora-a5e13c6df0e4.el7 b/redhat/self-test/data/fedora-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=rawhide 
-RHDISTGIT_TMP=/tmp 
 RHDISTGIT_USER="shadowman" 
 RHEL_MAJOR=9 
 RHEL_MINOR=5 
diff --git a/redhat/self-test/data/fedora-a5e13c6df0e4.fc25 b/redhat/self-test/data/fedora-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=rawhide 
-RHDISTGIT_TMP=/tmp 
 RHDISTGIT_USER="shadowman" 
 RHEL_MAJOR=9 
 RHEL_MINOR=5 
diff --git a/redhat/self-test/data/fedora-edc9dd1e3c31.el7 b/redhat/self-test/data/fedora-edc9dd1e3c31.el7
@@ -46,7 +46,6 @@ PROCESS_CONFIGS_OPTS=-n -w -c
 REDHAT=../redhat 
 RELEASETAG=kernel-5.12.0-6.test 
 RHDISTGIT_BRANCH=rawhide 
-RHDISTGIT_TMP=/tmp 
 RHDISTGIT_USER="shadowman" 
 RHEL_MAJOR=9 
 RHEL_MINOR=5 
diff --git a/redhat/self-test/data/fedora-edc9dd1e3c31.fc25 b/redhat/self-test/data/fedora-edc9dd1e3c31.fc25
@@ -46,7 +46,6 @@ PROCESS_CONFIGS_OPTS=-n -w -c
 REDHAT=../redhat 
 RELEASETAG=kernel-5.12.0-6.test 
 RHDISTGIT_BRANCH=rawhide 
-RHDISTGIT_TMP=/tmp 
 RHDISTGIT_USER="shadowman" 
 RHEL_MAJOR=9 
 RHEL_MINOR=5 
diff --git a/redhat/self-test/data/rhel-6161a435c191.el7 b/redhat/self-test/data/rhel-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=rhel-9.5.0 
-RHDISTGIT_TMP=/tmp 
 RHDISTGIT_USER="shadowman" 
 RHEL_MAJOR=9 
 RHEL_MINOR=5 
diff --git a/redhat/self-test/data/rhel-6161a435c191.fc25 b/redhat/self-test/data/rhel-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=rhel-9.5.0 
-RHDISTGIT_TMP=/tmp 
 RHDISTGIT_USER="shadowman" 
 RHEL_MAJOR=9 
 RHEL_MINOR=5 
diff --git a/redhat/self-test/data/rhel-9f4ad9e425a1.el7 b/redhat/self-test/data/rhel-9f4ad9e425a1.el7
@@ -46,7 +46,6 @@ PROCESS_CONFIGS_OPTS=-n -w -c
 REDHAT=../redhat 
 RELEASETAG=kernel-5.12.0-6.test 
 RHDISTGIT_BRANCH=rhel-9.5.0 
-RHDISTGIT_TMP=/tmp 
 RHDISTGIT_USER="shadowman" 
 RHEL_MAJOR=9 
 RHEL_MINOR=5 
diff --git a/redhat/self-test/data/rhel-9f4ad9e425a1.fc25 b/redhat/self-test/data/rhel-9f4ad9e425a1.fc25
@@ -46,7 +46,6 @@ PROCESS_CONFIGS_OPTS=-n -w -c
 REDHAT=../redhat 
 RELEASETAG=kernel-5.12.0-6.test 
 RHDISTGIT_BRANCH=rhel-9.5.0 
-RHDISTGIT_TMP=/tmp 
 RHDISTGIT_USER="shadowman" 
 RHEL_MAJOR=9 
 RHEL_MINOR=5 
diff --git a/redhat/self-test/data/rhel-a5e13c6df0e4.el7 b/redhat/self-test/data/rhel-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=rhel-9.5.0 
-RHDISTGIT_TMP=/tmp 
 RHDISTGIT_USER="shadowman" 
 RHEL_MAJOR=9 
 RHEL_MINOR=5 
diff --git a/redhat/self-test/data/rhel-a5e13c6df0e4.fc25 b/redhat/self-test/data/rhel-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=rhel-9.5.0 
-RHDISTGIT_TMP=/tmp 
 RHDISTGIT_USER="shadowman" 
 RHEL_MAJOR=9 
 RHEL_MINOR=5 
diff --git a/redhat/self-test/data/rhel-edc9dd1e3c31.el7 b/redhat/self-test/data/rhel-edc9dd1e3c31.el7
@@ -46,7 +46,6 @@ PROCESS_CONFIGS_OPTS=-n -w -c
 REDHAT=../redhat 
 RELEASETAG=kernel-5.12.0-6.test 
 RHDISTGIT_BRANCH=rhel-9.5.0 
-RHDISTGIT_TMP=/tmp 
 RHDISTGIT_USER="shadowman" 
 RHEL_MAJOR=9 
 RHEL_MINOR=5 
diff --git a/redhat/self-test/data/rhel-edc9dd1e3c31.fc25 b/redhat/self-test/data/rhel-edc9dd1e3c31.fc25
@@ -46,7 +46,6 @@ PROCESS_CONFIGS_OPTS=-n -w -c
 REDHAT=../redhat 
 RELEASETAG=kernel-5.12.0-6.test 
 RHDISTGIT_BRANCH=rhel-9.5.0 
-RHDISTGIT_TMP=/tmp 
 RHDISTGIT_USER="shadowman" 
 RHEL_MAJOR=9 
 RHEL_MINOR=5 
