From: Prarit Bhargava <prarit(a)redhat.com>
redhat/Makefile: Set BUILD_TARGET for dist-brew
The 'dist-brew' target should always be rhel-9-scratch. Future proof this
value by using $RHEL_MAJOR.
Fix the brew target for the dist-brew Makefile target.
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
@@ -262,7 +262,7 @@ else
SINGLE_TARBALL:=1
RHDISTGIT_BRANCH:=rhel-$(RHEL_MAJOR).$(RHEL_MINOR).0
ifndef BUILD_TARGET
- BUILD_TARGET:=rhel-$(RHEL_MAJOR).$(RHEL_MINOR).0-test-pesign
+ BUILD_TARGET:=rhel-$(RHEL_MAJOR)-scratch
endif
SPECTARFILE_RELEASE:=$(BASEVERSION)
SPECKABIVERSION:=$(BASEVERSION)
@@ -634,13 +634,13 @@ dist-vr-check:
dist-brew: DIST=.el9
dist-brew: DISTRO=rhel
-dist-brew: BUILD_TARGET=rhel-$(RHEL_MAJOR).1.0-test-pesign
+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).1.0-test-pesign
+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
@@ -6,7 +6,7 @@ BASEVERSION=5.16.0-0.rc5.6.test
BUILD=6
BUILD_FLAGS=
BUILD_PROFILE=
-BUILD_TARGET=rhel-9.99.0-test-pesign
+BUILD_TARGET=rhel-9-scratch
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
@@ -6,7 +6,7 @@ BASEVERSION=5.16.0-0.rc5.6.test
BUILD=6
BUILD_FLAGS=
BUILD_PROFILE=
-BUILD_TARGET=rhel-9.99.0-test-pesign
+BUILD_TARGET=rhel-9-scratch
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
@@ -6,7 +6,7 @@ BASEVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test
BUILD=6
BUILD_FLAGS=
BUILD_PROFILE=
-BUILD_TARGET=rhel-9.99.0-test-pesign
+BUILD_TARGET=rhel-9-scratch
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
@@ -6,7 +6,7 @@ BASEVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test
BUILD=6
BUILD_FLAGS=
BUILD_PROFILE=
-BUILD_TARGET=rhel-9.99.0-test-pesign
+BUILD_TARGET=rhel-9-scratch
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
@@ -6,7 +6,7 @@ BASEVERSION=5.16.0-6.test
BUILD=6
BUILD_FLAGS=
BUILD_PROFILE=
-BUILD_TARGET=rhel-9.99.0-test-pesign
+BUILD_TARGET=rhel-9-scratch
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
@@ -6,7 +6,7 @@ BASEVERSION=5.16.0-6.test
BUILD=6
BUILD_FLAGS=
BUILD_PROFILE=
-BUILD_TARGET=rhel-9.99.0-test-pesign
+BUILD_TARGET=rhel-9-scratch
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
@@ -6,7 +6,7 @@ BASEVERSION=5.16.0-0.rc5.fce15c45d3fb.6.test
BUILD=6
BUILD_FLAGS=
BUILD_PROFILE=
-BUILD_TARGET=rhel-9.99.0-test-pesign
+BUILD_TARGET=rhel-9-scratch
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
@@ -6,7 +6,7 @@ BASEVERSION=5.16.0-0.rc5.fce15c45d3fb.6.test
BUILD=6
BUILD_FLAGS=
BUILD_PROFILE=
-BUILD_TARGET=rhel-9.99.0-test-pesign
+BUILD_TARGET=rhel-9-scratch
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/1913