From: Herton R. Krzesinski herton@redhat.com

redhat: add support for different profiles with dist*-brew

Right now there is no way dist-brew/dist-koji can build against the CentOS koji instance. Add support so that if DISTRO=centos is given on the command line, dist-brew/koji will use the stream profile and build against CentOS koji (this requires centpkg to be installed in the system).

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

diff --git a/redhat/Makefile b/redhat/Makefile index blahblah..blahblah 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -386,10 +386,10 @@ distg-brew: BUILD_FLAGS ?= $(BREW_FLAGS) $(TEST_FLAGS) distg-koji: BUILD_FLAGS ?= $(KOJI_FLAGS) $(TEST_FLAGS)

dist-brew dist-koji: dist-%: dist-srpm - $* build $(BUILD_FLAGS) $(BUILD_TARGET) $(SRPMS)/$(PACKAGE_NAME)-$(KVERSION)-$(PKGRELEASE)$(DIST).src.rpm $(OUTPUT_FILE) + $* $(BUILD_PROFILE) build $(BUILD_FLAGS) $(BUILD_TARGET) $(SRPMS)/$(PACKAGE_NAME)-$(KVERSION)-$(PKGRELEASE)$(DIST).src.rpm $(OUTPUT_FILE)

distg-brew distg-koji: distg-%: - $* build $(BUILD_FLAGS) $(BUILD_TARGET) "$(RHGITURL)?redhat/koji#$(RHGITCOMMIT)" + $* $(BUILD_PROFILE) build $(BUILD_FLAGS) $(BUILD_TARGET) "$(RHGITURL)?redhat/koji#$(RHGITCOMMIT)"

.PHONY: $(REDHAT)/rpm/SOURCES/$(PACKAGE_NAME).spec $(REDHAT)/rpm/SOURCES/$(PACKAGE_NAME).spec: diff --git a/redhat/Makefile.common b/redhat/Makefile.common index blahblah..blahblah 100644 --- a/redhat/Makefile.common +++ b/redhat/Makefile.common @@ -159,6 +159,7 @@ ifeq ("$(DIST)", ".elrdy") else ifeq ("$(DISTRO)", "fedora") BUILD_SCRATCH_TARGET ?= temp-ark-rhel-8-test else ifeq ("$(DISTRO)", "centos") + BUILD_PROFILE ?= -p stream BUILD_SCRATCH_TARGET ?= c$(RHEL_MAJOR)s-candidate else BUILD_SCRATCH_TARGET ?= rhel-$(RHEL_MAJOR).$(RHEL_MINOR).0-test-pesign

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