From: Jan Stancek <[email protected]> redhat: allow to override VERSION_ON_UPSTREAM from command line
For CKI pipelines we already set a lengthy BUILDID, and don't really need the extra hash there as well. Signed-off-by: Jan Stancek <[email protected]> diff --git a/redhat/Makefile.variables b/redhat/Makefile.variables index blahblah..blahblah 100644 --- a/redhat/Makefile.variables +++ b/redhat/Makefile.variables @@ -147,9 +147,9 @@ UPSTREAM_BRANCH ?= master # on a branch tracking upstream. This allows for generating rpms # based on untagged releases. ifeq ($(SPECGEMINI),0) - VERSION_ON_UPSTREAM:=1 + VERSION_ON_UPSTREAM ?= 1 else - VERSION_ON_UPSTREAM:=0 + VERSION_ON_UPSTREAM ?= 0 endif # Builds may include a s390x+zfcpdump arch build, which results in the build -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3452 -- _______________________________________________ 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, report it: https://pagure.io/fedora-infrastructure/new_issue
