From: Andrea Claudi <[email protected]> redhat: fix make {distg-brew,distg-koji}
When Makefile.common is included from makefiles other than the main one, the GIT macro is not defined, resulting in build fail. This commit moves the GIT macro definition to the Makefile.common itself, thus making it defined for each makefile including it. As a bonus, let's use the GIT macro in koji/Makefile, too. Co-developed-by: Timothy Redaelli <[email protected]> Signed-off-by: Andrea Claudi <[email protected]> diff --git a/redhat/Makefile b/redhat/Makefile index blahblah..blahblah 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -1,4 +1,3 @@ -GIT ?= git include Makefile.common include Makefile.rhpkg diff --git a/redhat/Makefile.common b/redhat/Makefile.common index blahblah..blahblah 100644 --- a/redhat/Makefile.common +++ b/redhat/Makefile.common @@ -1,3 +1,4 @@ +GIT ?= git TOPDIR:=$(shell $(GIT) rev-parse --show-toplevel) REDHAT:=$(TOPDIR)/redhat include $(TOPDIR)/Makefile.rhelver diff --git a/redhat/koji/Makefile b/redhat/koji/Makefile index blahblah..blahblah 100644 --- a/redhat/koji/Makefile +++ b/redhat/koji/Makefile @@ -20,7 +20,7 @@ include ../Makefile.common notes: - git fetch --force origin refs/notes/*:refs/notes/* + $(GIT) fetch --force origin refs/notes/*:refs/notes/* buildid: notes $(eval BUILDID := $(shell git notes --ref buildid show HEAD || echo .test)) -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1607 _______________________________________________ kernel mailing list -- [email protected] To unsubscribe send an email to [email protected] Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/[email protected] Do not reply to spam on the list, report it: https://pagure.io/fedora-infrastructure
