From: Prarit Bhargava <prarit@xxxxxxxxxx>
redhat/Makefile: Rename RPMVERSION to BASEVERSION
RPMVERSION is the rpm NVR without the dist tag. It is not the RPM
version so RPMVERSION is not an accurate name for this field.
Rename RPMVERSION to BASEVERSION.
Signed-off-by: Prarit Bhargava <prarit@xxxxxxxxxx>
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -226,19 +226,19 @@ endif
#
# $(PACKAGE_NAME)-$(SPECKVERSION).$(SPECKPATCHLEVEL).$(SPECKSUBLEVEL)-$(SPECBUILD) $(DIST)
# $(PACKAGE_NAME)-$(SPECVERSION) -$(SPECBUILD) $(DIST)
-# $(PACKAGE_NAME)-$(RPMVERSION) $(DIST)
+# $(PACKAGE_NAME)-$(BASEVERSION) $(DIST)
# $(RELEASETAG) $(DIST)
#
SPECBUILD:=$(PREBUILD)$(BUILD)$(BUILDID)
SPECVERSION:=$(SPECKVERSION).$(SPECKPATCHLEVEL).$(SPECKSUBLEVEL)
-RPMVERSION:=$(SPECVERSION)-$(SPECBUILD)
-RELEASETAG:=$(PACKAGE_NAME)-$(RPMVERSION)
+BASEVERSION:=$(SPECVERSION)-$(SPECBUILD)
+RELEASETAG:=$(PACKAGE_NAME)-$(BASEVERSION)
SRPM:=$(SRPMS)/$(RELEASETAG)$(DIST).src.rpm
# kabi variables
-KABI_TARBALL:=$(SOURCES)/kernel-abi-stablelists-$(RPMVERSION).tar.bz2
+KABI_TARBALL:=$(SOURCES)/kernel-abi-stablelists-$(BASEVERSION).tar.bz2
KABIDW := $(REDHAT)/kabi-dwarf
-KABIDW_TARBALL:=$(SOURCES)/kernel-kabi-dw-$(RPMVERSION).tar.bz2
+KABIDW_TARBALL:=$(SOURCES)/kernel-kabi-dw-$(BASEVERSION).tar.bz2
#
# This conditional statement is where fedora, centos, and other (aka RHEL)
@@ -260,14 +260,14 @@ else ifeq ("$(DISTRO)", "centos")
ifndef BUILD_SCRATCH_TARGET
BUILD_SCRATCH_TARGET:=c$(RHEL_MAJOR)s-candidate
endif
- SPECTARFILE_RELEASE:=$(RPMVERSION)
+ SPECTARFILE_RELEASE:=$(BASEVERSION)
else
SINGLE_TARBALL:=1
RHDISTGIT_BRANCH:=rhel-$(RHEL_MAJOR).$(RHEL_MINOR).0
ifndef BUILD_SCRATCH_TARGET
BUILD_SCRATCH_TARGET:=rhel-$(RHEL_MAJOR).$(RHEL_MINOR).0-test-pesign
endif
- SPECTARFILE_RELEASE:=$(RPMVERSION)
+ SPECTARFILE_RELEASE:=$(BASEVERSION)
endif
ifndef BUILD_TARGET
@@ -450,12 +450,12 @@ dist-tarball: $(TARBALL)
dist-kernelrelease:
# deprecated at 5.17.0
@echo "WARNING: This target will be deprecated in a future release."
- @echo $(PACKAGE_NAME)-$(RPMVERSION)
+ @echo $(PACKAGE_NAME)-$(BASEVERSION)
dist-kernelversion:
# deprecated at 5.17.0
@echo "WARNING: This target will be deprecated in a future release."
- @echo $(RPMVERSION)
+ @echo $(BASEVERSION)
dist-specfile: setup-source
# deprecated at 5.17.0
@@ -492,7 +492,7 @@ setup-source: dist-git-version-check dist-clean-sources
@if [ -z "$(RHSELFTESTDATA)" ]; then \
cp $(REDHAT)/$(SPECCHANGELOG) $(SOURCES)/$(SPECCHANGELOG); \
else \
- echo "Mon Mar 28 2022 Fedora Kernel Team <kernel-team@xxxxxxxxxxxxxxxxx> [$(RPMVERSION)]" > $(SOURCES)/$(SPECCHANGELOG); \
+ echo "Mon Mar 28 2022 Fedora Kernel Team <kernel-team@xxxxxxxxxxxxxxxxx> [$(BASEVERSION)]" > $(SOURCES)/$(SPECCHANGELOG); \
fi
@if [ -z "$(PATCHLIST_URL)" ]; then \
echo "Error: PATCHLIST_URL must be set (to 'none' or any URL)"; \
diff --git a/redhat/genspec.sh b/redhat/genspec.sh
index blahblah..blahblah 100755
--- a/redhat/genspec.sh
+++ b/redhat/genspec.sh
@@ -113,7 +113,7 @@ echo "Gathering new log entries since $lasttag"
cname="$(git var GIT_COMMITTER_IDENT |sed 's/>.*/>/')"
cdate="$(LC_ALL=C date +"%a %b %d %Y")"
-cversion="[$RPMVERSION]";
+cversion="[$BASEVERSION]";
echo "* $cdate $cname $cversion" > "$clogf"
git log --topo-order --no-merges -z "$GIT_NOTES" "$GIT_FORMAT" \
diff --git a/redhat/scripts/rh-dist-git.sh b/redhat/scripts/rh-dist-git.sh
index blahblah..blahblah 100755
--- a/redhat/scripts/rh-dist-git.sh
+++ b/redhat/scripts/rh-dist-git.sh
@@ -52,7 +52,7 @@ diff -X "$REDHAT"/git/dontdiff -upr "$tmpdir/$PACKAGE_NAME" "$REDHAT"/rpm/SOURCE
# creating the changelog file
# changelog has been created by genspec.sh, including Resolves line, just copy it here
-echo -e "${PACKAGE_NAME}-${RPMVERSION}\n" > "$tmpdir"/changelog
+echo -e "${PACKAGE_NAME}-${BASEVERSION}\n" > "$tmpdir"/changelog
awk '1;/^Resolves: /{exit};' "$REDHAT"/"$SPECCHANGELOG" >> "$tmpdir"/changelog
# all done
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
@@ -2,6 +2,7 @@
.SHELLSTATUS=1
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
+BASEVERSION=5.16.0-0.rc5.6.test
BUILD=6
BUILD_FLAGS=
BUILD_PROFILE=-p stream
@@ -47,7 +48,6 @@ RHPKG_BIN=centpkg
RHSELFTESTDATA=1
RPM=../redhat/rpm
RPMBUILD=rpmbuild
-RPMVERSION=5.16.0-0.rc5.6.test
SHELL=/bin/sh
SINGLE_TARBALL=1
SNAPSHOT=0
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
@@ -2,6 +2,7 @@
.SHELLSTATUS=1
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
+BASEVERSION=5.16.0-0.rc5.6.test
BUILD=6
BUILD_FLAGS=
BUILD_PROFILE=-p stream
@@ -47,7 +48,6 @@ RHPKG_BIN=centpkg
RHSELFTESTDATA=1
RPM=../redhat/rpm
RPMBUILD=rpmbuild
-RPMVERSION=5.16.0-0.rc5.6.test
SHELL=/bin/sh
SINGLE_TARBALL=1
SNAPSHOT=0
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
@@ -2,6 +2,7 @@
.SHELLSTATUS=0
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
+BASEVERSION=5.17.0-0.rc0.78e36f3b0dae586.6.test
BUILD=6
BUILD_FLAGS=
BUILD_PROFILE=-p stream
@@ -47,7 +48,6 @@ RHPKG_BIN=centpkg
RHSELFTESTDATA=1
RPM=../redhat/rpm
RPMBUILD=rpmbuild
-RPMVERSION=5.17.0-0.rc0.78e36f3b0dae586.6.test
SHELL=/bin/sh
SINGLE_TARBALL=1
SNAPSHOT=1
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
@@ -2,6 +2,7 @@
.SHELLSTATUS=0
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
+BASEVERSION=5.17.0-0.rc0.78e36f3b0dae586.6.test
BUILD=6
BUILD_FLAGS=
BUILD_PROFILE=-p stream
@@ -47,7 +48,6 @@ RHPKG_BIN=centpkg
RHSELFTESTDATA=1
RPM=../redhat/rpm
RPMBUILD=rpmbuild
-RPMVERSION=5.17.0-0.rc0.78e36f3b0dae586.6.test
SHELL=/bin/sh
SINGLE_TARBALL=1
SNAPSHOT=1
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
@@ -2,6 +2,7 @@
.SHELLSTATUS=1
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
+BASEVERSION=5.16.0-6.test
BUILD=6
BUILD_FLAGS=
BUILD_PROFILE=-p stream
@@ -47,7 +48,6 @@ RHPKG_BIN=centpkg
RHSELFTESTDATA=1
RPM=../redhat/rpm
RPMBUILD=rpmbuild
-RPMVERSION=5.16.0-6.test
SHELL=/bin/sh
SINGLE_TARBALL=1
SNAPSHOT=0
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
@@ -2,6 +2,7 @@
.SHELLSTATUS=1
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
+BASEVERSION=5.16.0-6.test
BUILD=6
BUILD_FLAGS=
BUILD_PROFILE=-p stream
@@ -47,7 +48,6 @@ RHPKG_BIN=centpkg
RHSELFTESTDATA=1
RPM=../redhat/rpm
RPMBUILD=rpmbuild
-RPMVERSION=5.16.0-6.test
SHELL=/bin/sh
SINGLE_TARBALL=1
SNAPSHOT=0
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
@@ -2,6 +2,7 @@
.SHELLSTATUS=0
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
+BASEVERSION=5.16.0-0.rc5.fce15c45d3fbd9f.6.test
BUILD=6
BUILD_FLAGS=
BUILD_PROFILE=-p stream
@@ -47,7 +48,6 @@ RHPKG_BIN=centpkg
RHSELFTESTDATA=1
RPM=../redhat/rpm
RPMBUILD=rpmbuild
-RPMVERSION=5.16.0-0.rc5.fce15c45d3fbd9f.6.test
SHELL=/bin/sh
SINGLE_TARBALL=1
SNAPSHOT=1
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
@@ -2,6 +2,7 @@
.SHELLSTATUS=0
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
+BASEVERSION=5.16.0-0.rc5.fce15c45d3fbd9f.6.test
BUILD=6
BUILD_FLAGS=
BUILD_PROFILE=-p stream
@@ -47,7 +48,6 @@ RHPKG_BIN=centpkg
RHSELFTESTDATA=1
RPM=../redhat/rpm
RPMBUILD=rpmbuild
-RPMVERSION=5.16.0-0.rc5.fce15c45d3fbd9f.6.test
SHELL=/bin/sh
SINGLE_TARBALL=1
SNAPSHOT=1
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
@@ -2,6 +2,7 @@
.SHELLSTATUS=1
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
+BASEVERSION=5.16.0-0.rc5.6.test
BUILD=6
BUILD_FLAGS=
BUMP_RELEASE=yes
@@ -45,7 +46,6 @@ RHPKG_BIN=fedpkg
RHSELFTESTDATA=1
RPM=../redhat/rpm
RPMBUILD=rpmbuild
-RPMVERSION=5.16.0-0.rc5.6.test
SHELL=/bin/sh
SINGLE_TARBALL=0
SNAPSHOT=0
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
@@ -2,6 +2,7 @@
.SHELLSTATUS=1
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
+BASEVERSION=5.16.0-0.rc5.6.test
BUILD=6
BUILD_FLAGS=
BUMP_RELEASE=yes
@@ -45,7 +46,6 @@ RHPKG_BIN=fedpkg
RHSELFTESTDATA=1
RPM=../redhat/rpm
RPMBUILD=rpmbuild
-RPMVERSION=5.16.0-0.rc5.6.test
SHELL=/bin/sh
SINGLE_TARBALL=0
SNAPSHOT=0
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
@@ -2,6 +2,7 @@
.SHELLSTATUS=0
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
+BASEVERSION=5.17.0-0.rc0.78e36f3b0dae586.6.test
BUILD=6
BUILD_FLAGS=
BUMP_RELEASE=yes
@@ -45,7 +46,6 @@ RHPKG_BIN=fedpkg
RHSELFTESTDATA=1
RPM=../redhat/rpm
RPMBUILD=rpmbuild
-RPMVERSION=5.17.0-0.rc0.78e36f3b0dae586.6.test
SHELL=/bin/sh
SINGLE_TARBALL=0
SNAPSHOT=1
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
@@ -2,6 +2,7 @@
.SHELLSTATUS=0
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
+BASEVERSION=5.17.0-0.rc0.78e36f3b0dae586.6.test
BUILD=6
BUILD_FLAGS=
BUMP_RELEASE=yes
@@ -45,7 +46,6 @@ RHPKG_BIN=fedpkg
RHSELFTESTDATA=1
RPM=../redhat/rpm
RPMBUILD=rpmbuild
-RPMVERSION=5.17.0-0.rc0.78e36f3b0dae586.6.test
SHELL=/bin/sh
SINGLE_TARBALL=0
SNAPSHOT=1
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
@@ -2,6 +2,7 @@
.SHELLSTATUS=1
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
+BASEVERSION=5.16.0-6.test
BUILD=6
BUILD_FLAGS=
BUMP_RELEASE=yes
@@ -45,7 +46,6 @@ RHPKG_BIN=fedpkg
RHSELFTESTDATA=1
RPM=../redhat/rpm
RPMBUILD=rpmbuild
-RPMVERSION=5.16.0-6.test
SHELL=/bin/sh
SINGLE_TARBALL=0
SNAPSHOT=0
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
@@ -2,6 +2,7 @@
.SHELLSTATUS=1
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
+BASEVERSION=5.16.0-6.test
BUILD=6
BUILD_FLAGS=
BUMP_RELEASE=yes
@@ -45,7 +46,6 @@ RHPKG_BIN=fedpkg
RHSELFTESTDATA=1
RPM=../redhat/rpm
RPMBUILD=rpmbuild
-RPMVERSION=5.16.0-6.test
SHELL=/bin/sh
SINGLE_TARBALL=0
SNAPSHOT=0
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
@@ -2,6 +2,7 @@
.SHELLSTATUS=0
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
+BASEVERSION=5.16.0-0.rc5.fce15c45d3fbd9f.6.test
BUILD=6
BUILD_FLAGS=
BUMP_RELEASE=yes
@@ -45,7 +46,6 @@ RHPKG_BIN=fedpkg
RHSELFTESTDATA=1
RPM=../redhat/rpm
RPMBUILD=rpmbuild
-RPMVERSION=5.16.0-0.rc5.fce15c45d3fbd9f.6.test
SHELL=/bin/sh
SINGLE_TARBALL=0
SNAPSHOT=1
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
@@ -2,6 +2,7 @@
.SHELLSTATUS=0
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
+BASEVERSION=5.16.0-0.rc5.fce15c45d3fbd9f.6.test
BUILD=6
BUILD_FLAGS=
BUMP_RELEASE=yes
@@ -45,7 +46,6 @@ RHPKG_BIN=fedpkg
RHSELFTESTDATA=1
RPM=../redhat/rpm
RPMBUILD=rpmbuild
-RPMVERSION=5.16.0-0.rc5.fce15c45d3fbd9f.6.test
SHELL=/bin/sh
SINGLE_TARBALL=0
SNAPSHOT=1
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
@@ -2,6 +2,7 @@
.SHELLSTATUS=1
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
+BASEVERSION=5.16.0-0.rc5.6.test
BUILD=6
BUILD_FLAGS=
BUMP_RELEASE=yes
@@ -45,7 +46,6 @@ RHPKG_BIN=rhpkg
RHSELFTESTDATA=1
RPM=../redhat/rpm
RPMBUILD=rpmbuild
-RPMVERSION=5.16.0-0.rc5.6.test
SHELL=/bin/sh
SINGLE_TARBALL=1
SNAPSHOT=0
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1757
_______________________________________________
kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx
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/kernel@xxxxxxxxxxxxxxxxxxxxxxx
Do not reply to spam on the list, report it: https://pagure.io/fedora-infrastructure
