From: Prarit Bhargava <pra...@redhat.com> redhat/Makefile: Move PREBUILD_GIT_ONLY to Makefile.variables
Move PREBUILD_GIT_ONLY to Makefile.variables. Signed-off-by: Prarit Bhargava <pra...@redhat.com> diff --git a/redhat/Makefile b/redhat/Makefile index blahblah..blahblah 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -79,10 +79,12 @@ ifeq ($(SNAPSHOT),1) PREBUILD:=0$(KEXTRAVERSION). RPMKPATCHLEVEL:=$(shell expr $(RPMKPATCHLEVEL) + 1) endif - ifneq ($(filter $(MAKECMDGOALS),dist-git-test dist-git),) - PREBUILD_GIT_ONLY ?= 0 - else - PREBUILD_GIT_ONLY ?= 1 + ifndef PREBUILD_GIT_ONLY + ifneq ($(filter $(MAKECMDGOALS),dist-git-test dist-git),) + PREBUILD_GIT_ONLY:=0 + else + PREBUILD_GIT_ONLY:=1 + endif endif ifeq ($(PREBUILD_GIT_ONLY),1) PREBUILD:=$(PREBUILD)$(MARKER). diff --git a/redhat/Makefile.variables b/redhat/Makefile.variables index blahblah..blahblah 100644 --- a/redhat/Makefile.variables +++ b/redhat/Makefile.variables @@ -90,3 +90,9 @@ BUILD_FLAGS ?= # This sets the incremental build version value in the rpm NVR. If unset, this # defaults to RHEL_RELEASE from Makefile.rhelver BUILD ?= + +# Builds may include a s390x+zfcpdump arch build, which results in the build +# failing because the UTS_RELEASE field exceeded 64 chars. This variable can +# be set to 1 to decrease the kernel UTS_RELEASE and PKGRELEASE by 11 characters +# (YYYYMMDDgit). +PREBUILD_GIT_ONLY ?= -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1641 _______________________________________________ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org 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/kernel@lists.fedoraproject.org Do not reply to spam on the list, report it: https://pagure.io/fedora-infrastructure