From: Prarit Bhargava <[email protected]> redhat/Makefile: Remove --scratch from BUILD_TARGET
jforbes noticed that --scratch is applied to every BUILD_TARGET variable assignment, and can be applied when the BUILD_TARGET variable is used in make commands. Remove --scratch from BUILD_TARGET. Suggested-by: Justin Forbes <[email protected]> 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 @@ -290,7 +290,7 @@ else endif ifndef BUILD_TARGET - BUILD_TARGET:=--scratch $(BUILD_SCRATCH_TARGET) + BUILD_TARGET:=$(BUILD_SCRATCH_TARGET) endif TARFILE:=linux-$(SPECTARFILE_RELEASE).tar.xz @@ -674,15 +674,15 @@ dist-vr-check: dist-brew: DIST=.el9 dist-brew: DISTRO=rhel -dist-brew: BUILD_TARGET=--scratch rhel-$(RHEL_MAJOR).1.0-test-pesign +dist-brew: BUILD_TARGET=rhel-$(RHEL_MAJOR).1.0-test-pesign dist-brew dist-koji: dist-%: dist-vr-check dist-srpm - $* $(BUILD_PROFILE) build $(BUILD_FLAGS) $(BUILD_TARGET) $(SRPMS)/$(RELEASETAG)$(DIST).src.rpm $(OUTPUT_FILE) + $* $(BUILD_PROFILE) build $(BUILD_FLAGS) --scratch $(BUILD_TARGET) $(SRPMS)/$(RELEASETAG)$(DIST).src.rpm $(OUTPUT_FILE) distg-brew: DIST=.el9 distg-brew: DISTRO=rhel -distg-brew: BUILD_TARGET=--scratch rhel-$(RHEL_MAJOR).1.0-test-pesign +distg-brew: BUILD_TARGET=rhel-$(RHEL_MAJOR).1.0-test-pesign distg-brew distg-koji: distg-%: dist-vr-check - $* $(BUILD_PROFILE) build $(BUILD_FLAGS) $(BUILD_TARGET) "$(RHGITURL)?redhat/koji#$(RHGITCOMMIT)" + $* $(BUILD_PROFILE) build $(BUILD_FLAGS) --scratch $(BUILD_TARGET) "$(RHGITURL)?redhat/koji#$(RHGITCOMMIT)" .PHONY: $(REDHAT)/rpm/SOURCES/$(SPECFILE) $(REDHAT)/rpm/SOURCES/$(SPECFILE): diff --git a/redhat/self-test/data/centos-2585cf9dfaad.el7 b/redhat/self-test/data/centos-2585cf9dfaad.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-2585cf9dfaad.el7 +++ b/redhat/self-test/data/centos-2585cf9dfaad.el7 @@ -7,7 +7,7 @@ BUILD=6 BUILD_FLAGS= BUILD_PROFILE=-p stream BUILD_SCRATCH_TARGET=c9s-candidate -BUILD_TARGET=--scratch c9s-candidate +BUILD_TARGET=c9s-candidate BUMP_RELEASE=yes CHANGELOG_PREV=kernel.changelog-9.98 CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu diff --git a/redhat/self-test/data/centos-2585cf9dfaad.fc25 b/redhat/self-test/data/centos-2585cf9dfaad.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-2585cf9dfaad.fc25 +++ b/redhat/self-test/data/centos-2585cf9dfaad.fc25 @@ -7,7 +7,7 @@ BUILD=6 BUILD_FLAGS= BUILD_PROFILE=-p stream BUILD_SCRATCH_TARGET=c9s-candidate -BUILD_TARGET=--scratch c9s-candidate +BUILD_TARGET=c9s-candidate BUMP_RELEASE=yes CHANGELOG_PREV=kernel.changelog-9.98 CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu diff --git a/redhat/self-test/data/centos-78e36f3b0dae.el7 b/redhat/self-test/data/centos-78e36f3b0dae.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-78e36f3b0dae.el7 +++ b/redhat/self-test/data/centos-78e36f3b0dae.el7 @@ -7,7 +7,7 @@ BUILD=6 BUILD_FLAGS= BUILD_PROFILE=-p stream BUILD_SCRATCH_TARGET=c9s-candidate -BUILD_TARGET=--scratch c9s-candidate +BUILD_TARGET=c9s-candidate BUMP_RELEASE=yes CHANGELOG_PREV=kernel.changelog-9.98 CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu diff --git a/redhat/self-test/data/centos-78e36f3b0dae.fc25 b/redhat/self-test/data/centos-78e36f3b0dae.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-78e36f3b0dae.fc25 +++ b/redhat/self-test/data/centos-78e36f3b0dae.fc25 @@ -7,7 +7,7 @@ BUILD=6 BUILD_FLAGS= BUILD_PROFILE=-p stream BUILD_SCRATCH_TARGET=c9s-candidate -BUILD_TARGET=--scratch c9s-candidate +BUILD_TARGET=c9s-candidate BUMP_RELEASE=yes CHANGELOG_PREV=kernel.changelog-9.98 CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu diff --git a/redhat/self-test/data/centos-df0cc57e057f.el7 b/redhat/self-test/data/centos-df0cc57e057f.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-df0cc57e057f.el7 +++ b/redhat/self-test/data/centos-df0cc57e057f.el7 @@ -7,7 +7,7 @@ BUILD=6 BUILD_FLAGS= BUILD_PROFILE=-p stream BUILD_SCRATCH_TARGET=c9s-candidate -BUILD_TARGET=--scratch c9s-candidate +BUILD_TARGET=c9s-candidate BUMP_RELEASE=yes CHANGELOG_PREV=kernel.changelog-9.98 CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu diff --git a/redhat/self-test/data/centos-df0cc57e057f.fc25 b/redhat/self-test/data/centos-df0cc57e057f.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-df0cc57e057f.fc25 +++ b/redhat/self-test/data/centos-df0cc57e057f.fc25 @@ -7,7 +7,7 @@ BUILD=6 BUILD_FLAGS= BUILD_PROFILE=-p stream BUILD_SCRATCH_TARGET=c9s-candidate -BUILD_TARGET=--scratch c9s-candidate +BUILD_TARGET=c9s-candidate BUMP_RELEASE=yes CHANGELOG_PREV=kernel.changelog-9.98 CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu diff --git a/redhat/self-test/data/centos-fce15c45d3fb.el7 b/redhat/self-test/data/centos-fce15c45d3fb.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-fce15c45d3fb.el7 +++ b/redhat/self-test/data/centos-fce15c45d3fb.el7 @@ -7,7 +7,7 @@ BUILD=6 BUILD_FLAGS= BUILD_PROFILE=-p stream BUILD_SCRATCH_TARGET=c9s-candidate -BUILD_TARGET=--scratch c9s-candidate +BUILD_TARGET=c9s-candidate BUMP_RELEASE=yes CHANGELOG_PREV=kernel.changelog-9.98 CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu diff --git a/redhat/self-test/data/centos-fce15c45d3fb.fc25 b/redhat/self-test/data/centos-fce15c45d3fb.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-fce15c45d3fb.fc25 +++ b/redhat/self-test/data/centos-fce15c45d3fb.fc25 @@ -7,7 +7,7 @@ BUILD=6 BUILD_FLAGS= BUILD_PROFILE=-p stream BUILD_SCRATCH_TARGET=c9s-candidate -BUILD_TARGET=--scratch c9s-candidate +BUILD_TARGET=c9s-candidate BUMP_RELEASE=yes CHANGELOG_PREV=kernel.changelog-9.98 CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.el7 b/redhat/self-test/data/fedora-2585cf9dfaad.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/fedora-2585cf9dfaad.el7 +++ b/redhat/self-test/data/fedora-2585cf9dfaad.el7 @@ -7,7 +7,7 @@ BUILD=6 BUILD_FLAGS= BUILD_PROFILE= BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test -BUILD_TARGET=--scratch temp-ark-rhel-8-test +BUILD_TARGET=temp-ark-rhel-8-test BUMP_RELEASE=yes CHANGELOG_PREV=kernel.changelog-9.98 CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.fc25 b/redhat/self-test/data/fedora-2585cf9dfaad.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/fedora-2585cf9dfaad.fc25 +++ b/redhat/self-test/data/fedora-2585cf9dfaad.fc25 @@ -7,7 +7,7 @@ BUILD=6 BUILD_FLAGS= BUILD_PROFILE= BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test -BUILD_TARGET=--scratch temp-ark-rhel-8-test +BUILD_TARGET=temp-ark-rhel-8-test BUMP_RELEASE=yes CHANGELOG_PREV=kernel.changelog-9.98 CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu diff --git a/redhat/self-test/data/fedora-78e36f3b0dae.el7 b/redhat/self-test/data/fedora-78e36f3b0dae.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/fedora-78e36f3b0dae.el7 +++ b/redhat/self-test/data/fedora-78e36f3b0dae.el7 @@ -7,7 +7,7 @@ BUILD=6 BUILD_FLAGS= BUILD_PROFILE= BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test -BUILD_TARGET=--scratch temp-ark-rhel-8-test +BUILD_TARGET=temp-ark-rhel-8-test BUMP_RELEASE=yes CHANGELOG_PREV=kernel.changelog-9.98 CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu diff --git a/redhat/self-test/data/fedora-78e36f3b0dae.fc25 b/redhat/self-test/data/fedora-78e36f3b0dae.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/fedora-78e36f3b0dae.fc25 +++ b/redhat/self-test/data/fedora-78e36f3b0dae.fc25 @@ -7,7 +7,7 @@ BUILD=6 BUILD_FLAGS= BUILD_PROFILE= BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test -BUILD_TARGET=--scratch temp-ark-rhel-8-test +BUILD_TARGET=temp-ark-rhel-8-test BUMP_RELEASE=yes CHANGELOG_PREV=kernel.changelog-9.98 CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu diff --git a/redhat/self-test/data/fedora-df0cc57e057f.el7 b/redhat/self-test/data/fedora-df0cc57e057f.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/fedora-df0cc57e057f.el7 +++ b/redhat/self-test/data/fedora-df0cc57e057f.el7 @@ -7,7 +7,7 @@ BUILD=6 BUILD_FLAGS= BUILD_PROFILE= BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test -BUILD_TARGET=--scratch temp-ark-rhel-8-test +BUILD_TARGET=temp-ark-rhel-8-test BUMP_RELEASE=yes CHANGELOG_PREV=kernel.changelog-9.98 CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu diff --git a/redhat/self-test/data/fedora-df0cc57e057f.fc25 b/redhat/self-test/data/fedora-df0cc57e057f.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/fedora-df0cc57e057f.fc25 +++ b/redhat/self-test/data/fedora-df0cc57e057f.fc25 @@ -7,7 +7,7 @@ BUILD=6 BUILD_FLAGS= BUILD_PROFILE= BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test -BUILD_TARGET=--scratch temp-ark-rhel-8-test +BUILD_TARGET=temp-ark-rhel-8-test BUMP_RELEASE=yes CHANGELOG_PREV=kernel.changelog-9.98 CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu diff --git a/redhat/self-test/data/fedora-fce15c45d3fb.el7 b/redhat/self-test/data/fedora-fce15c45d3fb.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/fedora-fce15c45d3fb.el7 +++ b/redhat/self-test/data/fedora-fce15c45d3fb.el7 @@ -7,7 +7,7 @@ BUILD=6 BUILD_FLAGS= BUILD_PROFILE= BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test -BUILD_TARGET=--scratch temp-ark-rhel-8-test +BUILD_TARGET=temp-ark-rhel-8-test BUMP_RELEASE=yes CHANGELOG_PREV=kernel.changelog-9.98 CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu diff --git a/redhat/self-test/data/fedora-fce15c45d3fb.fc25 b/redhat/self-test/data/fedora-fce15c45d3fb.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/fedora-fce15c45d3fb.fc25 +++ b/redhat/self-test/data/fedora-fce15c45d3fb.fc25 @@ -7,7 +7,7 @@ BUILD=6 BUILD_FLAGS= BUILD_PROFILE= BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test -BUILD_TARGET=--scratch temp-ark-rhel-8-test +BUILD_TARGET=temp-ark-rhel-8-test BUMP_RELEASE=yes CHANGELOG_PREV=kernel.changelog-9.98 CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu diff --git a/redhat/self-test/data/rhel-2585cf9dfaad.el7 b/redhat/self-test/data/rhel-2585cf9dfaad.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/rhel-2585cf9dfaad.el7 +++ b/redhat/self-test/data/rhel-2585cf9dfaad.el7 @@ -7,7 +7,7 @@ BUILD=6 BUILD_FLAGS= BUILD_PROFILE= BUILD_SCRATCH_TARGET=rhel-9.99.0-test-pesign -BUILD_TARGET=--scratch rhel-9.99.0-test-pesign +BUILD_TARGET=rhel-9.99.0-test-pesign BUMP_RELEASE=yes CHANGELOG_PREV=kernel.changelog-9.98 CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu diff --git a/redhat/self-test/data/rhel-2585cf9dfaad.fc25 b/redhat/self-test/data/rhel-2585cf9dfaad.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/rhel-2585cf9dfaad.fc25 +++ b/redhat/self-test/data/rhel-2585cf9dfaad.fc25 @@ -7,7 +7,7 @@ BUILD=6 BUILD_FLAGS= BUILD_PROFILE= BUILD_SCRATCH_TARGET=rhel-9.99.0-test-pesign -BUILD_TARGET=--scratch rhel-9.99.0-test-pesign +BUILD_TARGET=rhel-9.99.0-test-pesign BUMP_RELEASE=yes CHANGELOG_PREV=kernel.changelog-9.98 CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu diff --git a/redhat/self-test/data/rhel-78e36f3b0dae.el7 b/redhat/self-test/data/rhel-78e36f3b0dae.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/rhel-78e36f3b0dae.el7 +++ b/redhat/self-test/data/rhel-78e36f3b0dae.el7 @@ -7,7 +7,7 @@ BUILD=6 BUILD_FLAGS= BUILD_PROFILE= BUILD_SCRATCH_TARGET=rhel-9.99.0-test-pesign -BUILD_TARGET=--scratch rhel-9.99.0-test-pesign +BUILD_TARGET=rhel-9.99.0-test-pesign BUMP_RELEASE=yes CHANGELOG_PREV=kernel.changelog-9.98 CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1894 _______________________________________________ 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
