From: Prarit Bhargava <[email protected]> redhat/Makefile: Move BUILD_FLAGS to Makefile.variables.
Move BUILD_FLAGS to Makefile.variables. Signed-off-by: Prarit Bhargava <[email protected]> diff --git a/redhat/Makefile b/redhat/Makefile index blahblah..blahblah 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -229,6 +229,16 @@ RHJOBS?=$(shell j=$$(echo $(MAKEFLAGS) | grep -Eo "\ -j[0-9]*" | xargs ); \ [ -z "$${j}" ] && nproc --all || echo $${j}; \ fi) +ifndef BUILD_FLAGS + ifeq ($(filter $(MAKECMDGOALS),dist-brew distg-brew),) + BUILD_FLAGS := $(BREW_FLAGS) + endif + ifeq ($(filter $(MAKECMDGOALS),dist-koji distg-koji),) + BUILD_FLAGS := $(KOJI_FLAGS) + endif + BUILD_FLAGS += $(TEST_FLAGS) +endif + default: dist-help dist-python-check: @@ -559,12 +569,6 @@ dist-fedora-release: git-tree-check dist-fedora-release-push: export DIST_PUSH="1" dist-fedora-release-push: dist-fedora-release -.PHONY: dist-brew dist-koji -dist-brew : BUILD_FLAGS ?= $(BREW_FLAGS) $(TEST_FLAGS) -dist-koji : BUILD_FLAGS ?= $(KOJI_FLAGS) $(TEST_FLAGS) -distg-brew: BUILD_FLAGS ?= $(BREW_FLAGS) $(TEST_FLAGS) -distg-koji: BUILD_FLAGS ?= $(KOJI_FLAGS) $(TEST_FLAGS) - dist-vr-check: @# builds may include a s390x+zfcpdump arch build. UTS_RELEASE can only have a @# version-release string with max 64 chars. The version-release for s390x+zfcpdump diff --git a/redhat/Makefile.variables b/redhat/Makefile.variables index blahblah..blahblah 100644 --- a/redhat/Makefile.variables +++ b/redhat/Makefile.variables @@ -82,3 +82,7 @@ BUILD_TARGET ?= # This sets the koji/brew configuration profile variable. BUILD_PROFILE ?= + +# This sets the koji|brew build flags for the dist[g]-koji|brew targets. These +# options are passed directly to the brew and koji commands in those targets. +BUILD_FLAGS ?= -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1641 _______________________________________________ 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
