[OS-BUILD PATCH] redhat/Makefile: Use new BUILD_TARGET for RHEL
dist[g]-brew
target
by Prarit Bhargava (via Email Bridge)
From: Prarit Bhargava <prarit(a)redhat.com>
redhat/Makefile: Use new BUILD_TARGET for RHEL dist[g]-brew target
A new generic build target, rhel-9-newest-test-pesign, has been added to
brew. This target points to the newest RHEL9 pesign build image.
As a result of this change,
'make DIST=.el9 dist-brew' results in
brew build --scratch rhel-9-newest-test-pesign /home/prarit/git-kernel/kernel-ark/redhat/rpm/SRPMS/kernel-6.1.0-0.rc2.20.test.el9.src.rpm
'make DIST=.eln dist-brew' results in
brew build --scratch eln /home/prarit/git-kernel/kernel-ark/redhat/rpm/SRPMS/kernel-6.1.0-0.rc2.20.test.eln.src.rpm
'make DIST=.fc37 dist-brew' results in
brew build --scratch rawhide /home/prarit/git-kernel/kernel-ark/redhat/rpm/SRPMS/kernel-6.1.0-0.rc2.20.test.fc37.src.rpm
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -265,7 +265,9 @@ else
ifeq ("$(DIST)", ".eln")
BUILD_TARGET:=eln
else
- BUILD_TARGET:=rhel-$(RHEL_MAJOR)-scratch
+ # This value is used by the dist[g]-targets. Changing this value has significant
+ # consequences for all of RHEL kernel engineering.
+ BUILD_TARGET:=rhel-$(RHEL_MAJOR)-newest-test-pesign
endif
endif
ifeq ("$(DIST)", ".eln)
@@ -759,13 +761,11 @@ dist-vr-check:
dist-brew: DIST=.el9
dist-brew: DISTRO=rhel
-dist-brew: BUILD_TARGET:=rhel-$(RHEL_MAJOR)-scratch
dist-brew dist-koji: dist-%: dist-vr-check dist-srpm
$* $(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:=rhel-$(RHEL_MAJOR)-scratch
distg-brew distg-koji: distg-%: dist-vr-check
$* $(BUILD_PROFILE) build $(BUILD_FLAGS) --scratch $(BUILD_TARGET) "$(RHGITURL)?redhat/koji#$(RHGITCOMMIT)"
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 @@ BASEVERSION=5.16.0-0.rc5.6.test
BUILD=6
BUILD_FLAGS=
BUILD_PROFILE=
-BUILD_TARGET=rhel-9-scratch
+BUILD_TARGET=rhel-9-newest-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 @@ BASEVERSION=5.16.0-0.rc5.6.test
BUILD=6
BUILD_FLAGS=
BUILD_PROFILE=
-BUILD_TARGET=rhel-9-scratch
+BUILD_TARGET=rhel-9-newest-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 @@ BASEVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test
BUILD=6
BUILD_FLAGS=
BUILD_PROFILE=
-BUILD_TARGET=rhel-9-scratch
+BUILD_TARGET=rhel-9-newest-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.fc25 b/redhat/self-test/data/rhel-78e36f3b0dae.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/rhel-78e36f3b0dae.fc25
+++ b/redhat/self-test/data/rhel-78e36f3b0dae.fc25
@@ -7,7 +7,7 @@ BASEVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test
BUILD=6
BUILD_FLAGS=
BUILD_PROFILE=
-BUILD_TARGET=rhel-9-scratch
+BUILD_TARGET=rhel-9-newest-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-df0cc57e057f.el7 b/redhat/self-test/data/rhel-df0cc57e057f.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/rhel-df0cc57e057f.el7
+++ b/redhat/self-test/data/rhel-df0cc57e057f.el7
@@ -7,7 +7,7 @@ BASEVERSION=5.16.0-6.test
BUILD=6
BUILD_FLAGS=
BUILD_PROFILE=
-BUILD_TARGET=rhel-9-scratch
+BUILD_TARGET=rhel-9-newest-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-df0cc57e057f.fc25 b/redhat/self-test/data/rhel-df0cc57e057f.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/rhel-df0cc57e057f.fc25
+++ b/redhat/self-test/data/rhel-df0cc57e057f.fc25
@@ -7,7 +7,7 @@ BASEVERSION=5.16.0-6.test
BUILD=6
BUILD_FLAGS=
BUILD_PROFILE=
-BUILD_TARGET=rhel-9-scratch
+BUILD_TARGET=rhel-9-newest-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-fce15c45d3fb.el7 b/redhat/self-test/data/rhel-fce15c45d3fb.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/rhel-fce15c45d3fb.el7
+++ b/redhat/self-test/data/rhel-fce15c45d3fb.el7
@@ -7,7 +7,7 @@ BASEVERSION=5.16.0-0.rc5.fce15c45d3fb.6.test
BUILD=6
BUILD_FLAGS=
BUILD_PROFILE=
-BUILD_TARGET=rhel-9-scratch
+BUILD_TARGET=rhel-9-newest-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-fce15c45d3fb.fc25 b/redhat/self-test/data/rhel-fce15c45d3fb.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/rhel-fce15c45d3fb.fc25
+++ b/redhat/self-test/data/rhel-fce15c45d3fb.fc25
@@ -7,7 +7,7 @@ BASEVERSION=5.16.0-0.rc5.fce15c45d3fb.6.test
BUILD=6
BUILD_FLAGS=
BUILD_PROFILE=
-BUILD_TARGET=rhel-9-scratch
+BUILD_TARGET=rhel-9-newest-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/2119