From: Prarit Bhargava <pra...@redhat.com>
redhat/Makefile: Move SPECRELEASE to genspec.sh
Move SPECRELEASE to genspec.sh. It is the only place it is used.
Signed-off-by: Prarit Bhargava <pra...@redhat.com>
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -234,7 +234,6 @@
SPECVERSION:=$(SPECKVERSION).$(SPECKPATCHLEVEL).$(SPECKSUBLEVEL)
RPMVERSION:=$(SPECVERSION)-$(SPECBUILD)
RELEASETAG=$(PACKAGE_NAME)-$(RPMVERSION)
SRPM:=$(SRPMS)/$(RELEASETAG)$(DIST).src.rpm
-SPECRELEASE:=$(PREBUILD)$(BUILD)%{?buildid}%{?dist}
# kabi variables
KABI_TARBALL:=$(SOURCES)/kernel-abi-stablelists-$(RPMVERSION).tar.bz2
diff --git a/redhat/genspec.sh b/redhat/genspec.sh
index blahblah..blahblah 100755
--- a/redhat/genspec.sh
+++ b/redhat/genspec.sh
@@ -56,6 +56,8 @@ if [ "$PATCHLIST_URL" != "none" ]; then
SPECPATCHLIST_CHANGELOG=1
fi
+SPECRELEASE="${PREBUILD}""${BUILD}""%{?buildid}%{?dist}"
+
# self-test begin
test -f "$SOURCES/$SPECFILE" &&
sed -i -e "
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
@@ -61,7 +61,6 @@ SPECKEXTRAVERSION=-rc5
SPECKPATCHLEVEL=16
SPECKSUBLEVEL=0
SPECKVERSION=5
-SPECRELEASE=0.rc5.6%{?buildid}%{?dist}
SPECRELEASED_KERNEL=0
SPECTARFILE_RELEASE=5.16.0-0.rc5.6.test
SPECVERSION=5.16.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
@@ -61,7 +61,6 @@ SPECKEXTRAVERSION=-rc5
SPECKPATCHLEVEL=16
SPECKSUBLEVEL=0
SPECKVERSION=5
-SPECRELEASE=0.rc5.6%{?buildid}%{?dist}
SPECRELEASED_KERNEL=0
SPECTARFILE_RELEASE=5.16.0-0.rc5.6.test
SPECVERSION=5.16.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
@@ -61,7 +61,6 @@ SPECKEXTRAVERSION=
SPECKPATCHLEVEL=17
SPECKSUBLEVEL=0
SPECKVERSION=5
-SPECRELEASE=0.rc0.78e36f3b0dae586.6%{?buildid}%{?dist}
SPECRELEASED_KERNEL=0
SPECTARFILE_RELEASE=5.17.0-0.rc0.78e36f3b0dae586.6.test
SPECVERSION=5.17.0
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
@@ -61,7 +61,6 @@ SPECKEXTRAVERSION=
SPECKPATCHLEVEL=17
SPECKSUBLEVEL=0
SPECKVERSION=5
-SPECRELEASE=0.rc0.78e36f3b0dae586.6%{?buildid}%{?dist}
SPECRELEASED_KERNEL=0
SPECTARFILE_RELEASE=5.17.0-0.rc0.78e36f3b0dae586.6.test
SPECVERSION=5.17.0
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
@@ -61,7 +61,6 @@ SPECKEXTRAVERSION=
SPECKPATCHLEVEL=16
SPECKSUBLEVEL=0
SPECKVERSION=5
-SPECRELEASE=6%{?buildid}%{?dist}
SPECRELEASED_KERNEL=0
SPECTARFILE_RELEASE=5.16.0-6.test
SPECVERSION=5.16.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
@@ -61,7 +61,6 @@ SPECKEXTRAVERSION=
SPECKPATCHLEVEL=16
SPECKSUBLEVEL=0
SPECKVERSION=5
-SPECRELEASE=6%{?buildid}%{?dist}
SPECRELEASED_KERNEL=0
SPECTARFILE_RELEASE=5.16.0-6.test
SPECVERSION=5.16.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
@@ -61,7 +61,6 @@ SPECKEXTRAVERSION=-rc5
SPECKPATCHLEVEL=16
SPECKSUBLEVEL=0
SPECKVERSION=5
-SPECRELEASE=0.rc5.fce15c45d3fbd9f.6%{?buildid}%{?dist}
SPECRELEASED_KERNEL=0
SPECTARFILE_RELEASE=5.16.0-0.rc5.fce15c45d3fbd9f.6.test
SPECVERSION=5.16.0
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
@@ -61,7 +61,6 @@ SPECKEXTRAVERSION=-rc5
SPECKPATCHLEVEL=16
SPECKSUBLEVEL=0
SPECKVERSION=5
-SPECRELEASE=0.rc5.fce15c45d3fbd9f.6%{?buildid}%{?dist}
SPECRELEASED_KERNEL=0
SPECTARFILE_RELEASE=5.16.0-0.rc5.fce15c45d3fbd9f.6.test
SPECVERSION=5.16.0
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
@@ -59,7 +59,6 @@ SPECKEXTRAVERSION=-rc5
SPECKPATCHLEVEL=16
SPECKSUBLEVEL=0
SPECKVERSION=5
-SPECRELEASE=0.rc5.6%{?buildid}%{?dist}
SPECRELEASED_KERNEL=0
SPECTARFILE_RELEASE=5.16-rc5
SPECVERSION=5.16.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
@@ -59,7 +59,6 @@ SPECKEXTRAVERSION=-rc5
SPECKPATCHLEVEL=16
SPECKSUBLEVEL=0
SPECKVERSION=5
-SPECRELEASE=0.rc5.6%{?buildid}%{?dist}
SPECRELEASED_KERNEL=0
SPECTARFILE_RELEASE=5.16-rc5
SPECVERSION=5.16.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
@@ -59,7 +59,6 @@ SPECKEXTRAVERSION=
SPECKPATCHLEVEL=17
SPECKSUBLEVEL=0
SPECKVERSION=5
-SPECRELEASE=0.rc0.78e36f3b0dae586.6%{?buildid}%{?dist}
SPECRELEASED_KERNEL=0
SPECTARFILE_RELEASE=5.16-11523-g78e36f3b0dae586
SPECVERSION=5.17.0
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
@@ -59,7 +59,6 @@ SPECKEXTRAVERSION=
SPECKPATCHLEVEL=17
SPECKSUBLEVEL=0
SPECKVERSION=5
-SPECRELEASE=0.rc0.78e36f3b0dae586.6%{?buildid}%{?dist}
SPECRELEASED_KERNEL=0
SPECTARFILE_RELEASE=5.16-11523-g78e36f3b0dae586
SPECVERSION=5.17.0
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
@@ -59,7 +59,6 @@ SPECKEXTRAVERSION=
SPECKPATCHLEVEL=16
SPECKSUBLEVEL=0
SPECKVERSION=5
-SPECRELEASE=6%{?buildid}%{?dist}
SPECRELEASED_KERNEL=0
SPECTARFILE_RELEASE=5.16
SPECVERSION=5.16.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
@@ -59,7 +59,6 @@ SPECKEXTRAVERSION=
SPECKPATCHLEVEL=16
SPECKSUBLEVEL=0
SPECKVERSION=5
-SPECRELEASE=6%{?buildid}%{?dist}
SPECRELEASED_KERNEL=0
SPECTARFILE_RELEASE=5.16
SPECVERSION=5.16.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
@@ -59,7 +59,6 @@ SPECKEXTRAVERSION=-rc5
SPECKPATCHLEVEL=16
SPECKSUBLEVEL=0
SPECKVERSION=5
-SPECRELEASE=0.rc5.fce15c45d3fbd9f.6%{?buildid}%{?dist}
SPECRELEASED_KERNEL=0
SPECTARFILE_RELEASE=5.16-rc5-1-gfce15c45d3fbd9f
SPECVERSION=5.16.0
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
@@ -59,7 +59,6 @@ SPECKEXTRAVERSION=-rc5
SPECKPATCHLEVEL=16
SPECKSUBLEVEL=0
SPECKVERSION=5
-SPECRELEASE=0.rc5.fce15c45d3fbd9f.6%{?buildid}%{?dist}
SPECRELEASED_KERNEL=0
SPECTARFILE_RELEASE=5.16-rc5-1-gfce15c45d3fbd9f
SPECVERSION=5.16.0
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
@@ -59,7 +59,6 @@ SPECKEXTRAVERSION=-rc5
SPECKPATCHLEVEL=16
SPECKSUBLEVEL=0
SPECKVERSION=5
-SPECRELEASE=0.rc5.6%{?buildid}%{?dist}
SPECRELEASED_KERNEL=0
SPECTARFILE_RELEASE=5.16.0-0.rc5.6.test
SPECVERSION=5.16.0
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
@@ -59,7 +59,6 @@ SPECKEXTRAVERSION=-rc5
SPECKPATCHLEVEL=16
SPECKSUBLEVEL=0
SPECKVERSION=5
-SPECRELEASE=0.rc5.6%{?buildid}%{?dist}
SPECRELEASED_KERNEL=0
SPECTARFILE_RELEASE=5.16.0-0.rc5.6.test
SPECVERSION=5.16.0
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1757
_______________________________________________
kernel mailing list -- kernel@lists.fedoraproject.org
To unsubscribe send an email to kernel-le...@lists.fedoraproject.org
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@lists.fedoraproject.org
Do not reply to spam on the list, report it:
https://pagure.io/fedora-infrastructure
