From: Prarit Bhargava <prarit@xxxxxxxxxx>
redhat/Makefile: Add SPECKABIVERSION variable
Empty kabi tarballs are uploaded to dist-git everytime an .eln build is
completed. These empty kabi tarballs waste disk space. In addition to
this, new users that recompile the kernel often attempt to update the
specversion or other strings in order to generate a new NVR. These types
of builds fail because the kabi tarballs will not be found.
For DISTRO="fedora" builds, the kabi tarball names only need to be tagged
with SPECVERSION since the file does not change. By removing the
SPECBUILD string (relative to the existing BASEVERSION string), this
results in the empty tarballs being uploaded only once into dist-git and
also resolves the kernel recompile issue for .eln builds.
Add a SPECKABIVERSION variable that sets the kabi tarballs to SPECVERSION
for fedora builds, and BASEVERSION for rhel and centos.
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
@@ -251,11 +251,6 @@ BASEVERSION:=$(SPECVERSION)-$(SPECBUILD)
RELEASETAG:=$(PACKAGE_NAME)-$(BASEVERSION)
SRPM:=$(SRPMS)/$(RELEASETAG)$(DIST).src.rpm
-# kabi variables
-KABI_TARBALL:=$(SOURCES)/kernel-abi-stablelists-$(BASEVERSION).tar.bz2
-KABIDW := $(REDHAT)/kabi-dwarf
-KABIDW_TARBALL:=$(SOURCES)/kernel-kabi-dw-$(BASEVERSION).tar.bz2
-
#
# This conditional statement is where fedora, centos, and other (aka RHEL)
# specific values should be set.
@@ -270,6 +265,7 @@ ifeq ("$(DISTRO)", "fedora")
# replace the tarball from one with upstream, rebuild, and then deploy
# without changing anything else in the specfile.
SPECTARFILE_RELEASE:=$(UPSTREAM_TARBALL_NAME)
+ SPECKABIVERSION:=$(SPECVERSION)
else ifeq ("$(DISTRO)", "centos")
SINGLE_TARBALL:=1
RHDISTGIT_BRANCH:=c$(RHEL_MAJOR)s
@@ -280,6 +276,7 @@ else ifeq ("$(DISTRO)", "centos")
BUILD_SCRATCH_TARGET:=c$(RHEL_MAJOR)s-candidate
endif
SPECTARFILE_RELEASE:=$(BASEVERSION)
+ SPECKABIVERSION:=$(BASEVERSION)
else
SINGLE_TARBALL:=1
RHDISTGIT_BRANCH:=rhel-$(RHEL_MAJOR).$(RHEL_MINOR).0
@@ -287,6 +284,7 @@ else
BUILD_SCRATCH_TARGET:=rhel-$(RHEL_MAJOR).$(RHEL_MINOR).0-test-pesign
endif
SPECTARFILE_RELEASE:=$(BASEVERSION)
+ SPECKABIVERSION:=$(BASEVERSION)
endif
ifndef BUILD_TARGET
@@ -296,6 +294,10 @@ endif
TARFILE:=linux-$(SPECTARFILE_RELEASE).tar.xz
TARBALL:=$(REDHAT)/$(TARFILE)
+KABI_TARBALL:=$(SOURCES)/kernel-abi-stablelists-$(SPECKABIVERSION).tar.bz2
+KABIDW := $(REDHAT)/kabi-dwarf
+KABIDW_TARBALL:=$(SOURCES)/kernel-kabi-dw-$(SPECKABIVERSION).tar.bz2
+
include Makefile.rhpkg
ifeq ("$(ZSTREAM)", "yes")
diff --git a/redhat/genspec.sh b/redhat/genspec.sh
index blahblah..blahblah 100755
--- a/redhat/genspec.sh
+++ b/redhat/genspec.sh
@@ -74,6 +74,7 @@ test -f "$SOURCES/$SPECFILE" &&
s/%%SPECINCLUDE_RHEL_FILES%%/$SPECINCLUDE_RHEL_FILES/
s/%%SPECPATCHLIST_CHANGELOG%%/$SPECPATCHLIST_CHANGELOG/
s/%%SPECVERSION%%/$SPECVERSION/
+ s/%%SPECKABIVERSION%%/$SPECKABIVERSION/
s/%%SPECTARFILE_RELEASE%%/$SPECTARFILE_RELEASE/" "$SOURCES/$SPECFILE"
test -n "$RHSELFTESTDATA" && test -f "$SOURCES/$SPECFILE" && sed -i -e "
/%%SPECCHANGELOG%%/r $SOURCES/$SPECCHANGELOG
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100755
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -129,8 +129,10 @@ Summary: The Linux kernel
%define tarfile_release %%SPECTARFILE_RELEASE%%
# This is needed to do merge window version magic
%define patchlevel %%SPECKPATCHLEVEL%%
-# allow pkg_release to have configurable %%{?dist} tag
+# This allows pkg_release to have configurable %%{?dist} tag
%define specrelease %%SPECRELEASE%%
+# This defines the kabi tarball version
+%define kabiversion %%SPECKABIVERSION%%
#
# End of genspec.sh variables
@@ -829,8 +831,8 @@ Source211: Module.kabi_dup_ppc64le
Source212: Module.kabi_dup_s390x
Source213: Module.kabi_dup_x86_64
-Source300: kernel-abi-stablelists-%{specversion}-%{pkgrelease}.tar.bz2
-Source301: kernel-kabi-dw-%{specversion}-%{pkgrelease}.tar.bz2
+Source300: kernel-abi-stablelists-%{kabiversion}.tar.bz2
+Source301: kernel-kabi-dw-%{kabiversion}.tar.bz2
# Sources for kernel-tools
Source2000: cpupower.service
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
@@ -64,6 +64,7 @@ SPECCHANGELOG=kernel.changelog-9.99
SPECFILE=kernel.spec
SPECINCLUDE_FEDORA_FILES=1
SPECINCLUDE_RHEL_FILES=1
+SPECKABIVERSION=5.16.0-0.rc5.6.test
SPECKEXTRAVERSION=-rc5
SPECKPATCHLEVEL=16
SPECKSUBLEVEL=0
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.el7.spec b/redhat/self-test/data/centos-2585cf9dfaad.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-2585cf9dfaad.el7.spec
+++ b/redhat/self-test/data/centos-2585cf9dfaad.el7.spec
@@ -10,4 +10,5 @@
%define tarfile_release 5.16.0-0.rc5.6.test
%define patchlevel 16
%define specrelease 0.rc5.6%{?buildid}%{?dist}
+%define kabiversion 5.16.0-0.rc5.6.test
Mon Mar 28 2022 Fedora Kernel Team <kernel-team@xxxxxxxxxxxxxxxxx> [5.16.0-0.rc5.6.test]
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
@@ -64,6 +64,7 @@ SPECCHANGELOG=kernel.changelog-9.99
SPECFILE=kernel.spec
SPECINCLUDE_FEDORA_FILES=1
SPECINCLUDE_RHEL_FILES=1
+SPECKABIVERSION=5.16.0-0.rc5.6.test
SPECKEXTRAVERSION=-rc5
SPECKPATCHLEVEL=16
SPECKSUBLEVEL=0
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec b/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec
+++ b/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec
@@ -10,4 +10,5 @@
%define tarfile_release 5.16.0-0.rc5.6.test
%define patchlevel 16
%define specrelease 0.rc5.6%{?buildid}%{?dist}
+%define kabiversion 5.16.0-0.rc5.6.test
Mon Mar 28 2022 Fedora Kernel Team <kernel-team@xxxxxxxxxxxxxxxxx> [5.16.0-0.rc5.6.test]
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
@@ -64,6 +64,7 @@ SPECCHANGELOG=kernel.changelog-9.99
SPECFILE=kernel.spec
SPECINCLUDE_FEDORA_FILES=1
SPECINCLUDE_RHEL_FILES=1
+SPECKABIVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test
SPECKEXTRAVERSION=
SPECKPATCHLEVEL=17
SPECKSUBLEVEL=0
diff --git a/redhat/self-test/data/centos-78e36f3b0dae.el7.spec b/redhat/self-test/data/centos-78e36f3b0dae.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-78e36f3b0dae.el7.spec
+++ b/redhat/self-test/data/centos-78e36f3b0dae.el7.spec
@@ -11,4 +11,5 @@
%define tarfile_release 5.17.0-0.rc0.78e36f3b0dae.6.test
%define patchlevel 17
%define specrelease 0.rc0.78e36f3b0dae.6%{?buildid}%{?dist}
+%define kabiversion 5.17.0-0.rc0.78e36f3b0dae.6.test
Mon Mar 28 2022 Fedora Kernel Team <kernel-team@xxxxxxxxxxxxxxxxx> [5.17.0-0.rc0.78e36f3b0dae.6.test]
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
@@ -64,6 +64,7 @@ SPECCHANGELOG=kernel.changelog-9.99
SPECFILE=kernel.spec
SPECINCLUDE_FEDORA_FILES=1
SPECINCLUDE_RHEL_FILES=1
+SPECKABIVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test
SPECKEXTRAVERSION=
SPECKPATCHLEVEL=17
SPECKSUBLEVEL=0
diff --git a/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec b/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec
+++ b/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec
@@ -11,4 +11,5 @@
%define tarfile_release 5.17.0-0.rc0.78e36f3b0dae.6.test
%define patchlevel 17
%define specrelease 0.rc0.78e36f3b0dae.6%{?buildid}%{?dist}
+%define kabiversion 5.17.0-0.rc0.78e36f3b0dae.6.test
Mon Mar 28 2022 Fedora Kernel Team <kernel-team@xxxxxxxxxxxxxxxxx> [5.17.0-0.rc0.78e36f3b0dae.6.test]
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
@@ -64,6 +64,7 @@ SPECCHANGELOG=kernel.changelog-9.99
SPECFILE=kernel.spec
SPECINCLUDE_FEDORA_FILES=1
SPECINCLUDE_RHEL_FILES=1
+SPECKABIVERSION=5.16.0-6.test
SPECKEXTRAVERSION=
SPECKPATCHLEVEL=16
SPECKSUBLEVEL=0
diff --git a/redhat/self-test/data/centos-df0cc57e057f.el7.spec b/redhat/self-test/data/centos-df0cc57e057f.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-df0cc57e057f.el7.spec
+++ b/redhat/self-test/data/centos-df0cc57e057f.el7.spec
@@ -10,4 +10,5 @@
%define tarfile_release 5.16.0-6.test
%define patchlevel 16
%define specrelease 6%{?buildid}%{?dist}
+%define kabiversion 5.16.0-6.test
Mon Mar 28 2022 Fedora Kernel Team <kernel-team@xxxxxxxxxxxxxxxxx> [5.16.0-6.test]
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
@@ -64,6 +64,7 @@ SPECCHANGELOG=kernel.changelog-9.99
SPECFILE=kernel.spec
SPECINCLUDE_FEDORA_FILES=1
SPECINCLUDE_RHEL_FILES=1
+SPECKABIVERSION=5.16.0-6.test
SPECKEXTRAVERSION=
SPECKPATCHLEVEL=16
SPECKSUBLEVEL=0
diff --git a/redhat/self-test/data/centos-df0cc57e057f.fc25.spec b/redhat/self-test/data/centos-df0cc57e057f.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-df0cc57e057f.fc25.spec
+++ b/redhat/self-test/data/centos-df0cc57e057f.fc25.spec
@@ -10,4 +10,5 @@
%define tarfile_release 5.16.0-6.test
%define patchlevel 16
%define specrelease 6%{?buildid}%{?dist}
+%define kabiversion 5.16.0-6.test
Mon Mar 28 2022 Fedora Kernel Team <kernel-team@xxxxxxxxxxxxxxxxx> [5.16.0-6.test]
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
@@ -64,6 +64,7 @@ SPECCHANGELOG=kernel.changelog-9.99
SPECFILE=kernel.spec
SPECINCLUDE_FEDORA_FILES=1
SPECINCLUDE_RHEL_FILES=1
+SPECKABIVERSION=5.16.0-0.rc5.fce15c45d3fb.6.test
SPECKEXTRAVERSION=-rc5
SPECKPATCHLEVEL=16
SPECKSUBLEVEL=0
diff --git a/redhat/self-test/data/centos-fce15c45d3fb.el7.spec b/redhat/self-test/data/centos-fce15c45d3fb.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-fce15c45d3fb.el7.spec
+++ b/redhat/self-test/data/centos-fce15c45d3fb.el7.spec
@@ -11,4 +11,5 @@
%define tarfile_release 5.16.0-0.rc5.fce15c45d3fb.6.test
%define patchlevel 16
%define specrelease 0.rc5.fce15c45d3fb.6%{?buildid}%{?dist}
+%define kabiversion 5.16.0-0.rc5.fce15c45d3fb.6.test
Mon Mar 28 2022 Fedora Kernel Team <kernel-team@xxxxxxxxxxxxxxxxx> [5.16.0-0.rc5.fce15c45d3fb.6.test]
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
@@ -64,6 +64,7 @@ SPECCHANGELOG=kernel.changelog-9.99
SPECFILE=kernel.spec
SPECINCLUDE_FEDORA_FILES=1
SPECINCLUDE_RHEL_FILES=1
+SPECKABIVERSION=5.16.0-0.rc5.fce15c45d3fb.6.test
SPECKEXTRAVERSION=-rc5
SPECKPATCHLEVEL=16
SPECKSUBLEVEL=0
diff --git a/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec b/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec
+++ b/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec
@@ -11,4 +11,5 @@
%define tarfile_release 5.16.0-0.rc5.fce15c45d3fb.6.test
%define patchlevel 16
%define specrelease 0.rc5.fce15c45d3fb.6%{?buildid}%{?dist}
+%define kabiversion 5.16.0-0.rc5.fce15c45d3fb.6.test
Mon Mar 28 2022 Fedora Kernel Team <kernel-team@xxxxxxxxxxxxxxxxx> [5.16.0-0.rc5.fce15c45d3fb.6.test]
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
@@ -26,8 +26,8 @@ HEAD=2585cf9dfaad
INCLUDE_FEDORA_FILES=1
INCLUDE_RHEL_FILES=1
KABIDW=../redhat/kabi-dwarf
-KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.test.tar.bz2
-KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.test.tar.bz2
+KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0.tar.bz2
+KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0.tar.bz2
LANG=C
LOCVERFILE=../localversion
MACH=x86_64
@@ -63,6 +63,7 @@ SPECCHANGELOG=kernel.changelog-9.99
SPECFILE=kernel.spec
SPECINCLUDE_FEDORA_FILES=1
SPECINCLUDE_RHEL_FILES=1
+SPECKABIVERSION=5.16.0
SPECKEXTRAVERSION=-rc5
SPECKPATCHLEVEL=16
SPECKSUBLEVEL=0
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1801
_______________________________________________
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
