From: Herton R. Krzesinski herton@redhat.com

redhat: rename usage of .rhel8git.mk to .rhpkg.mk

We do not need to use the rhel version in the file name to look for the RHDISTGIT_CACHE value. Usually this file is used by the maintainers for configuring the location of the dist-git cache (the dist-git repo can be big so this saves time in the dist-git sync operation). But having the version in the name means bumping/changing the major each release, we do not need to do it: if the maintainer has to maintain different majors in the same stream, he will use the same dist-git repo/cache for it. In the case different dist-git repos are needed or the dist-git repos differ (are not synced between them), the .rhpkg.mk can have if statements to single out the repos.

Signed-off-by: Herton R. Krzesinski herton@redhat.com

diff --git a/redhat/Makefile.rhpkg b/redhat/Makefile.rhpkg index blahblah..blahblah 100644 --- a/redhat/Makefile.rhpkg +++ b/redhat/Makefile.rhpkg @@ -1,4 +1,4 @@ -# variables that can be overrided by ~/.rhel8git.mk or $(TOPDIR)/.rhel8git.mk +# variables that can be overrided by ~/.rhpkg.mk or $(TOPDIR)/.rhpkg.mk #

# Command to invoke rhpkg @@ -21,11 +21,11 @@ RHDISTGIT_BRANCH:=${RHPRODUCT}

# load configuration, starting with home directory then local ifeq ("$(RHDISTGIT_CACHE)", "") - ifneq ("$(wildcard ${HOME}/.rhel8git.mk)", "") - include ${HOME}/.rhel8git.mk + ifneq ("$(wildcard ${HOME}/.rhpkg.mk)", "") + include ${HOME}/.rhpkg.mk endif - ifneq ("$(wildcard $(TOPDIR)/.rhel8git.mk)", "") - include $(TOPDIR)/.rhel8git.mk + ifneq ("$(wildcard $(TOPDIR)/.rhpkg.mk)", "") + include $(TOPDIR)/.rhpkg.mk endif endif

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