From: Prarit Bhargava <prarit@xxxxxxxxxx>
redhat/Makefile: Add DIST to git tags for RHEL
Bugzilla: INTERNAL
Upstream Status: RHEL only
RHEL repositories may have an extended DIST tag, such as .el9_0. Users
looking for builds need a complete tag in dist-git and source-git in order
to find a build's source tag.
Add DIST to the git tags for RHEL.
Signed-off-by: Frantisek Hrbata <fhrbata@xxxxxxxxxx>
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
@@ -242,6 +242,8 @@ ifeq ("$(DISTRO)", "fedora")
# without changing anything else in the specfile.
SPECTARFILE_RELEASE:=$(UPSTREAM_TARBALL_NAME)
SPECKABIVERSION:=$(SPECVERSION)
+ DISTRELEASETAG:=$(RELEASETAG)
+ DISTBASEVERSION:=$(BASEVERSION)
RHPKG_BIN:=fedpkg
else ifeq ("$(DISTRO)", "centos")
RHDISTGIT_BRANCH:=c$(RHEL_MAJOR)s
@@ -251,8 +253,10 @@ else ifeq ("$(DISTRO)", "centos")
ifndef BUILD_TARGET
BUILD_TARGET:=c$(RHEL_MAJOR)s-candidate
endif
- SPECTARFILE_RELEASE:=$(BASEVERSION)
- SPECKABIVERSION:=$(BASEVERSION)
+ SPECTARFILE_RELEASE:=$(BASEVERSION)$(DIST)
+ SPECKABIVERSION:=$(BASEVERSION)$(DIST)
+ DISTRELEASETAG:=$(RELEASETAG)$(DIST)
+ DISTBASEVERSION:=$(BASEVERSION)$(DIST)
PATCHLIST_URL:=none
RHPKG_BIN:=centpkg
else
@@ -264,8 +268,17 @@ else
BUILD_TARGET:=rhel-$(RHEL_MAJOR)-scratch
endif
endif
- SPECTARFILE_RELEASE:=$(BASEVERSION)
- SPECKABIVERSION:=$(BASEVERSION)
+ ifeq ("$(DIST)", ".eln)
+ DISTRELEASETAG:=$(RELEASETAG)
+ DISTBASEVERSION:=$(BASEVERSION)
+ SPECTARFILE_RELEASE:=$(BASEVERSION)
+ SPECKABIVERSION:=$(BASEVERSION)
+ else
+ DISTRELEASETAG:=$(RELEASETAG)$(DIST)
+ DISTBASEVERSION:=$(BASEVERSION)$(DIST)
+ SPECTARFILE_RELEASE:=$(BASEVERSION)$(DIST)
+ SPECKABIVERSION:=$(BASEVERSION)$(DIST)
+ endif
PATCHLIST_URL:=none
RHPKG_BIN:=rhpkg
endif
@@ -687,7 +700,7 @@ dist-release-finish: setup-source
@echo $(MARKER) > $(REDHAT)/marker
@$(GIT) add $(REDHAT)/$(SPECCHANGELOG)
@$(GIT) add $(REDHAT)/marker
- @$(GIT) commit -s ../Makefile.rhelver $(REDHAT)/marker $(REDHAT)/$(SPECCHANGELOG) $(SPECFILE).template -m "[redhat] $(RELEASETAG)"
+ @$(GIT) commit -s ../Makefile.rhelver $(REDHAT)/marker $(REDHAT)/$(SPECCHANGELOG) $(SPECFILE).template -m "[redhat] $(DISTRELEASETAG)"
dist-release-changed:
@CLOGF="$$(mktemp)"; \
trap 'rm -f "$$CLOGF"' SIGHUP SIGINT SIGTERM EXIT; \
@@ -704,7 +717,7 @@ dist-release: dist-clean-sources
@$(MAKE) dist-release-changed
dist-release-tag:
- @$(GIT) tag -a -m "$(RELEASETAG)" $(RELEASETAG)
+ @$(GIT) tag -a -m "$(DISTRELEASETAG)" $(DISTRELEASETAG)
git-tree-check:
@if test -n "$(DIST_PUSH)" && test -z "$(shell $(GIT) remote get-url gitlab 2>/dev/null)"; then \
diff --git a/redhat/genlog.sh b/redhat/genlog.sh
index blahblah..blahblah 100755
--- a/redhat/genlog.sh
+++ b/redhat/genlog.sh
@@ -28,7 +28,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="[$BASEVERSION]";
+cversion="[$DISTBASEVERSION]";
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
@@ -58,7 +58,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}-${BASEVERSION}\n" > "$tmpdir"/changelog
+echo -e "${PACKAGE_NAME}-${DISTBASEVERSION}\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
@@ -14,6 +14,8 @@ CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static
CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .el7"
CURARCH=x86_64
DIST=.el7
+DISTBASEVERSION=5.16.0-0.rc5.6.test.el7
+DISTRELEASETAG=kernel-5.16.0-0.rc5.6.test.el7
DISTRO=centos
DIST_BRANCH="os-build"
EARLY_YBUILD=
@@ -26,12 +28,12 @@ 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
+KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.test.el7.tar.bz2
KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu- /usr/bin/s390x-linux-gnu-
KABI_CROSS_COMPILE_PREFIX=/usr/bin/
KABI_CROSS_COMPILE_SUFFIX=-linux-gnu-
KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64
-KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.test.tar.bz2
+KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.test.el7.tar.bz2
LANG=C
LOCVERFILE=../localversion
MACH=x86_64
@@ -65,19 +67,19 @@ SPECCHANGELOG=kernel.changelog-9.99
SPECFILE=kernel.spec
SPECINCLUDE_FEDORA_FILES=1
SPECINCLUDE_RHEL_FILES=1
-SPECKABIVERSION=5.16.0-0.rc5.6.test
+SPECKABIVERSION=5.16.0-0.rc5.6.test.el7
SPECKEXTRAVERSION=-rc5
SPECKPATCHLEVEL=16
SPECKSUBLEVEL=0
SPECKVERSION=5
SPECRELEASED_KERNEL=0
SPECSELFTESTS_MUST_BUILD=0
-SPECTARFILE_RELEASE=5.16.0-0.rc5.6.test
+SPECTARFILE_RELEASE=5.16.0-0.rc5.6.test.el7
SPECVERSION=5.16.0
SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.6.test.el7.src.rpm
SRPMS=../redhat/rpm/SRPMS
-TARBALL=../redhat/linux-5.16.0-0.rc5.6.test.tar.xz
-TARFILE=linux-5.16.0-0.rc5.6.test.tar.xz
+TARBALL=../redhat/linux-5.16.0-0.rc5.6.test.el7.tar.xz
+TARFILE=linux-5.16.0-0.rc5.6.test.el7.tar.xz
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
UPSTREAMBUILD=0.rc5.
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
@@ -7,9 +7,9 @@
%define patchversion 5.16
%define pkgrelease 0.rc5.6.test
%define kversion 5
-%define tarfile_release 5.16.0-0.rc5.6.test
+%define tarfile_release 5.16.0-0.rc5.6.test.el7
%define patchlevel 16
%define specrelease 0.rc5.6%{?buildid}%{?dist}
-%define kabiversion 5.16.0-0.rc5.6.test
+%define kabiversion 5.16.0-0.rc5.6.test.el7
%define selftests_must_build 0
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
@@ -14,6 +14,8 @@ CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static
CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .fc25"
CURARCH=x86_64
DIST=.fc25
+DISTBASEVERSION=5.16.0-0.rc5.6.test.fc25
+DISTRELEASETAG=kernel-5.16.0-0.rc5.6.test.fc25
DISTRO=centos
DIST_BRANCH="os-build"
EARLY_YBUILD=
@@ -26,12 +28,12 @@ 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
+KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.test.fc25.tar.bz2
KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu- /usr/bin/s390x-linux-gnu-
KABI_CROSS_COMPILE_PREFIX=/usr/bin/
KABI_CROSS_COMPILE_SUFFIX=-linux-gnu-
KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64
-KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.test.tar.bz2
+KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.test.fc25.tar.bz2
LANG=C
LOCVERFILE=../localversion
MACH=x86_64
@@ -65,19 +67,19 @@ SPECCHANGELOG=kernel.changelog-9.99
SPECFILE=kernel.spec
SPECINCLUDE_FEDORA_FILES=1
SPECINCLUDE_RHEL_FILES=1
-SPECKABIVERSION=5.16.0-0.rc5.6.test
+SPECKABIVERSION=5.16.0-0.rc5.6.test.fc25
SPECKEXTRAVERSION=-rc5
SPECKPATCHLEVEL=16
SPECKSUBLEVEL=0
SPECKVERSION=5
SPECRELEASED_KERNEL=0
SPECSELFTESTS_MUST_BUILD=0
-SPECTARFILE_RELEASE=5.16.0-0.rc5.6.test
+SPECTARFILE_RELEASE=5.16.0-0.rc5.6.test.fc25
SPECVERSION=5.16.0
SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.6.test.fc25.src.rpm
SRPMS=../redhat/rpm/SRPMS
-TARBALL=../redhat/linux-5.16.0-0.rc5.6.test.tar.xz
-TARFILE=linux-5.16.0-0.rc5.6.test.tar.xz
+TARBALL=../redhat/linux-5.16.0-0.rc5.6.test.fc25.tar.xz
+TARFILE=linux-5.16.0-0.rc5.6.test.fc25.tar.xz
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
UPSTREAMBUILD=0.rc5.
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
@@ -7,9 +7,9 @@
%define patchversion 5.16
%define pkgrelease 0.rc5.6.test
%define kversion 5
-%define tarfile_release 5.16.0-0.rc5.6.test
+%define tarfile_release 5.16.0-0.rc5.6.test.fc25
%define patchlevel 16
%define specrelease 0.rc5.6%{?buildid}%{?dist}
-%define kabiversion 5.16.0-0.rc5.6.test
+%define kabiversion 5.16.0-0.rc5.6.test.fc25
%define selftests_must_build 0
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
@@ -14,6 +14,8 @@ CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static
CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .el7"
CURARCH=x86_64
DIST=.el7
+DISTBASEVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test.el7
+DISTRELEASETAG=kernel-5.17.0-0.rc0.78e36f3b0dae.6.test.el7
DISTRO=centos
DIST_BRANCH="os-build"
EARLY_YBUILD=
@@ -26,12 +28,12 @@ HEAD=78e36f3b0dae
INCLUDE_FEDORA_FILES=1
INCLUDE_RHEL_FILES=1
KABIDW=../redhat/kabi-dwarf
-KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae.6.test.tar.bz2
+KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae.6.test.el7.tar.bz2
KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu- /usr/bin/s390x-linux-gnu-
KABI_CROSS_COMPILE_PREFIX=/usr/bin/
KABI_CROSS_COMPILE_SUFFIX=-linux-gnu-
KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64
-KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.test.tar.bz2
+KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.test.el7.tar.bz2
LANG=C
LOCVERFILE=../localversion
MACH=x86_64
@@ -65,19 +67,19 @@ 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
+SPECKABIVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test.el7
SPECKEXTRAVERSION=
SPECKPATCHLEVEL=17
SPECKSUBLEVEL=0
SPECKVERSION=5
SPECRELEASED_KERNEL=0
SPECSELFTESTS_MUST_BUILD=0
-SPECTARFILE_RELEASE=5.17.0-0.rc0.78e36f3b0dae.6.test
+SPECTARFILE_RELEASE=5.17.0-0.rc0.78e36f3b0dae.6.test.el7
SPECVERSION=5.17.0
SRPM=../redhat/rpm/SRPMS/kernel-5.17.0-0.rc0.78e36f3b0dae.6.test.el7.src.rpm
SRPMS=../redhat/rpm/SRPMS
-TARBALL=../redhat/linux-5.17.0-0.rc0.78e36f3b0dae.6.test.tar.xz
-TARFILE=linux-5.17.0-0.rc0.78e36f3b0dae.6.test.tar.xz
+TARBALL=../redhat/linux-5.17.0-0.rc0.78e36f3b0dae.6.test.el7.tar.xz
+TARFILE=linux-5.17.0-0.rc0.78e36f3b0dae.6.test.el7.tar.xz
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
UPSTREAMBUILD=0.rc0.78e36f3b0dae.
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
@@ -8,9 +8,9 @@
%define patchversion 5.17
%define pkgrelease 0.rc0.78e36f3b0dae.6.test
%define kversion 5
-%define tarfile_release 5.17.0-0.rc0.78e36f3b0dae.6.test
+%define tarfile_release 5.17.0-0.rc0.78e36f3b0dae.6.test.el7
%define patchlevel 17
%define specrelease 0.rc0.78e36f3b0dae.6%{?buildid}%{?dist}
-%define kabiversion 5.17.0-0.rc0.78e36f3b0dae.6.test
+%define kabiversion 5.17.0-0.rc0.78e36f3b0dae.6.test.el7
%define selftests_must_build 0
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
@@ -14,6 +14,8 @@ CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static
CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .fc25"
CURARCH=x86_64
DIST=.fc25
+DISTBASEVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test.fc25
+DISTRELEASETAG=kernel-5.17.0-0.rc0.78e36f3b0dae.6.test.fc25
DISTRO=centos
DIST_BRANCH="os-build"
EARLY_YBUILD=
@@ -26,12 +28,12 @@ HEAD=78e36f3b0dae
INCLUDE_FEDORA_FILES=1
INCLUDE_RHEL_FILES=1
KABIDW=../redhat/kabi-dwarf
-KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae.6.test.tar.bz2
+KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae.6.test.fc25.tar.bz2
KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu- /usr/bin/s390x-linux-gnu-
KABI_CROSS_COMPILE_PREFIX=/usr/bin/
KABI_CROSS_COMPILE_SUFFIX=-linux-gnu-
KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64
-KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.test.tar.bz2
+KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.test.fc25.tar.bz2
LANG=C
LOCVERFILE=../localversion
MACH=x86_64
@@ -65,19 +67,19 @@ 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
+SPECKABIVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test.fc25
SPECKEXTRAVERSION=
SPECKPATCHLEVEL=17
SPECKSUBLEVEL=0
SPECKVERSION=5
SPECRELEASED_KERNEL=0
SPECSELFTESTS_MUST_BUILD=0
-SPECTARFILE_RELEASE=5.17.0-0.rc0.78e36f3b0dae.6.test
+SPECTARFILE_RELEASE=5.17.0-0.rc0.78e36f3b0dae.6.test.fc25
SPECVERSION=5.17.0
SRPM=../redhat/rpm/SRPMS/kernel-5.17.0-0.rc0.78e36f3b0dae.6.test.fc25.src.rpm
SRPMS=../redhat/rpm/SRPMS
-TARBALL=../redhat/linux-5.17.0-0.rc0.78e36f3b0dae.6.test.tar.xz
-TARFILE=linux-5.17.0-0.rc0.78e36f3b0dae.6.test.tar.xz
+TARBALL=../redhat/linux-5.17.0-0.rc0.78e36f3b0dae.6.test.fc25.tar.xz
+TARFILE=linux-5.17.0-0.rc0.78e36f3b0dae.6.test.fc25.tar.xz
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
UPSTREAMBUILD=0.rc0.78e36f3b0dae.
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
@@ -8,9 +8,9 @@
%define patchversion 5.17
%define pkgrelease 0.rc0.78e36f3b0dae.6.test
%define kversion 5
-%define tarfile_release 5.17.0-0.rc0.78e36f3b0dae.6.test
+%define tarfile_release 5.17.0-0.rc0.78e36f3b0dae.6.test.fc25
%define patchlevel 17
%define specrelease 0.rc0.78e36f3b0dae.6%{?buildid}%{?dist}
-%define kabiversion 5.17.0-0.rc0.78e36f3b0dae.6.test
+%define kabiversion 5.17.0-0.rc0.78e36f3b0dae.6.test.fc25
%define selftests_must_build 0
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
@@ -14,6 +14,8 @@ CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static
CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .el7"
CURARCH=x86_64
DIST=.el7
+DISTBASEVERSION=5.16.0-6.test.el7
+DISTRELEASETAG=kernel-5.16.0-6.test.el7
DISTRO=centos
DIST_BRANCH="os-build"
EARLY_YBUILD=
@@ -26,12 +28,12 @@ HEAD=df0cc57e057f
INCLUDE_FEDORA_FILES=1
INCLUDE_RHEL_FILES=1
KABIDW=../redhat/kabi-dwarf
-KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-6.test.tar.bz2
+KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-6.test.el7.tar.bz2
KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu- /usr/bin/s390x-linux-gnu-
KABI_CROSS_COMPILE_PREFIX=/usr/bin/
KABI_CROSS_COMPILE_SUFFIX=-linux-gnu-
KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64
-KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-6.test.tar.bz2
+KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-6.test.el7.tar.bz2
LANG=C
LOCVERFILE=../localversion
MACH=x86_64
@@ -65,19 +67,19 @@ SPECCHANGELOG=kernel.changelog-9.99
SPECFILE=kernel.spec
SPECINCLUDE_FEDORA_FILES=1
SPECINCLUDE_RHEL_FILES=1
-SPECKABIVERSION=5.16.0-6.test
+SPECKABIVERSION=5.16.0-6.test.el7
SPECKEXTRAVERSION=
SPECKPATCHLEVEL=16
SPECKSUBLEVEL=0
SPECKVERSION=5
SPECRELEASED_KERNEL=0
SPECSELFTESTS_MUST_BUILD=0
-SPECTARFILE_RELEASE=5.16.0-6.test
+SPECTARFILE_RELEASE=5.16.0-6.test.el7
SPECVERSION=5.16.0
SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-6.test.el7.src.rpm
SRPMS=../redhat/rpm/SRPMS
-TARBALL=../redhat/linux-5.16.0-6.test.tar.xz
-TARFILE=linux-5.16.0-6.test.tar.xz
+TARBALL=../redhat/linux-5.16.0-6.test.el7.tar.xz
+TARFILE=linux-5.16.0-6.test.el7.tar.xz
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
UPSTREAMBUILD=
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
@@ -7,9 +7,9 @@
%define patchversion 5.16
%define pkgrelease 6.test
%define kversion 5
-%define tarfile_release 5.16.0-6.test
+%define tarfile_release 5.16.0-6.test.el7
%define patchlevel 16
%define specrelease 6%{?buildid}%{?dist}
-%define kabiversion 5.16.0-6.test
+%define kabiversion 5.16.0-6.test.el7
%define selftests_must_build 0
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
@@ -14,6 +14,8 @@ CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static
CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .fc25"
CURARCH=x86_64
DIST=.fc25
+DISTBASEVERSION=5.16.0-6.test.fc25
+DISTRELEASETAG=kernel-5.16.0-6.test.fc25
DISTRO=centos
DIST_BRANCH="os-build"
EARLY_YBUILD=
@@ -26,12 +28,12 @@ HEAD=df0cc57e057f
INCLUDE_FEDORA_FILES=1
INCLUDE_RHEL_FILES=1
KABIDW=../redhat/kabi-dwarf
-KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-6.test.tar.bz2
+KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-6.test.fc25.tar.bz2
KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu- /usr/bin/s390x-linux-gnu-
KABI_CROSS_COMPILE_PREFIX=/usr/bin/
KABI_CROSS_COMPILE_SUFFIX=-linux-gnu-
KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64
-KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-6.test.tar.bz2
+KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-6.test.fc25.tar.bz2
LANG=C
LOCVERFILE=../localversion
MACH=x86_64
@@ -65,19 +67,19 @@ SPECCHANGELOG=kernel.changelog-9.99
SPECFILE=kernel.spec
SPECINCLUDE_FEDORA_FILES=1
SPECINCLUDE_RHEL_FILES=1
-SPECKABIVERSION=5.16.0-6.test
+SPECKABIVERSION=5.16.0-6.test.fc25
SPECKEXTRAVERSION=
SPECKPATCHLEVEL=16
SPECKSUBLEVEL=0
SPECKVERSION=5
SPECRELEASED_KERNEL=0
SPECSELFTESTS_MUST_BUILD=0
-SPECTARFILE_RELEASE=5.16.0-6.test
+SPECTARFILE_RELEASE=5.16.0-6.test.fc25
SPECVERSION=5.16.0
SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-6.test.fc25.src.rpm
SRPMS=../redhat/rpm/SRPMS
-TARBALL=../redhat/linux-5.16.0-6.test.tar.xz
-TARFILE=linux-5.16.0-6.test.tar.xz
+TARBALL=../redhat/linux-5.16.0-6.test.fc25.tar.xz
+TARFILE=linux-5.16.0-6.test.fc25.tar.xz
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
UPSTREAMBUILD=
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
@@ -7,9 +7,9 @@
%define patchversion 5.16
%define pkgrelease 6.test
%define kversion 5
-%define tarfile_release 5.16.0-6.test
+%define tarfile_release 5.16.0-6.test.fc25
%define patchlevel 16
%define specrelease 6%{?buildid}%{?dist}
-%define kabiversion 5.16.0-6.test
+%define kabiversion 5.16.0-6.test.fc25
%define selftests_must_build 0
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
@@ -14,6 +14,8 @@ CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static
CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .el7"
CURARCH=x86_64
DIST=.el7
+DISTBASEVERSION=5.16.0-0.rc5.fce15c45d3fb.6.test.el7
+DISTRELEASETAG=kernel-5.16.0-0.rc5.fce15c45d3fb.6.test.el7
DISTRO=centos
DIST_BRANCH="os-build"
EARLY_YBUILD=
@@ -26,12 +28,12 @@ HEAD=fce15c45d3fb
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.fce15c45d3fb.6.test.tar.bz2
+KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.fce15c45d3fb.6.test.el7.tar.bz2
KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu- /usr/bin/s390x-linux-gnu-
KABI_CROSS_COMPILE_PREFIX=/usr/bin/
KABI_CROSS_COMPILE_SUFFIX=-linux-gnu-
KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64
-KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.fce15c45d3fb.6.test.tar.bz2
+KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.fce15c45d3fb.6.test.el7.tar.bz2
LANG=C
LOCVERFILE=../localversion
MACH=x86_64
@@ -65,19 +67,19 @@ 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
+SPECKABIVERSION=5.16.0-0.rc5.fce15c45d3fb.6.test.el7
SPECKEXTRAVERSION=-rc5
SPECKPATCHLEVEL=16
SPECKSUBLEVEL=0
SPECKVERSION=5
SPECRELEASED_KERNEL=0
SPECSELFTESTS_MUST_BUILD=0
-SPECTARFILE_RELEASE=5.16.0-0.rc5.fce15c45d3fb.6.test
+SPECTARFILE_RELEASE=5.16.0-0.rc5.fce15c45d3fb.6.test.el7
SPECVERSION=5.16.0
SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.fce15c45d3fb.6.test.el7.src.rpm
SRPMS=../redhat/rpm/SRPMS
-TARBALL=../redhat/linux-5.16.0-0.rc5.fce15c45d3fb.6.test.tar.xz
-TARFILE=linux-5.16.0-0.rc5.fce15c45d3fb.6.test.tar.xz
+TARBALL=../redhat/linux-5.16.0-0.rc5.fce15c45d3fb.6.test.el7.tar.xz
+TARFILE=linux-5.16.0-0.rc5.fce15c45d3fb.6.test.el7.tar.xz
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
UPSTREAMBUILD=0.rc5.fce15c45d3fb.
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
@@ -8,9 +8,9 @@
%define patchversion 5.16
%define pkgrelease 0.rc5.fce15c45d3fb.6.test
%define kversion 5
-%define tarfile_release 5.16.0-0.rc5.fce15c45d3fb.6.test
+%define tarfile_release 5.16.0-0.rc5.fce15c45d3fb.6.test.el7
%define patchlevel 16
%define specrelease 0.rc5.fce15c45d3fb.6%{?buildid}%{?dist}
-%define kabiversion 5.16.0-0.rc5.fce15c45d3fb.6.test
+%define kabiversion 5.16.0-0.rc5.fce15c45d3fb.6.test.el7
%define selftests_must_build 0
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
@@ -14,6 +14,8 @@ CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static
CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .fc25"
CURARCH=x86_64
DIST=.fc25
+DISTBASEVERSION=5.16.0-0.rc5.fce15c45d3fb.6.test.fc25
+DISTRELEASETAG=kernel-5.16.0-0.rc5.fce15c45d3fb.6.test.fc25
DISTRO=centos
DIST_BRANCH="os-build"
EARLY_YBUILD=
@@ -26,12 +28,12 @@ HEAD=fce15c45d3fb
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.fce15c45d3fb.6.test.tar.bz2
+KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.fce15c45d3fb.6.test.fc25.tar.bz2
KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu- /usr/bin/s390x-linux-gnu-
KABI_CROSS_COMPILE_PREFIX=/usr/bin/
KABI_CROSS_COMPILE_SUFFIX=-linux-gnu-
KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64
-KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.fce15c45d3fb.6.test.tar.bz2
+KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.fce15c45d3fb.6.test.fc25.tar.bz2
LANG=C
LOCVERFILE=../localversion
MACH=x86_64
@@ -65,19 +67,19 @@ 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
+SPECKABIVERSION=5.16.0-0.rc5.fce15c45d3fb.6.test.fc25
SPECKEXTRAVERSION=-rc5
SPECKPATCHLEVEL=16
SPECKSUBLEVEL=0
SPECKVERSION=5
SPECRELEASED_KERNEL=0
SPECSELFTESTS_MUST_BUILD=0
-SPECTARFILE_RELEASE=5.16.0-0.rc5.fce15c45d3fb.6.test
+SPECTARFILE_RELEASE=5.16.0-0.rc5.fce15c45d3fb.6.test.fc25
SPECVERSION=5.16.0
SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.fce15c45d3fb.6.test.fc25.src.rpm
SRPMS=../redhat/rpm/SRPMS
-TARBALL=../redhat/linux-5.16.0-0.rc5.fce15c45d3fb.6.test.tar.xz
-TARFILE=linux-5.16.0-0.rc5.fce15c45d3fb.6.test.tar.xz
+TARBALL=../redhat/linux-5.16.0-0.rc5.fce15c45d3fb.6.test.fc25.tar.xz
+TARFILE=linux-5.16.0-0.rc5.fce15c45d3fb.6.test.fc25.tar.xz
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
UPSTREAMBUILD=0.rc5.fce15c45d3fb.
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
@@ -8,9 +8,9 @@
%define patchversion 5.16
%define pkgrelease 0.rc5.fce15c45d3fb.6.test
%define kversion 5
-%define tarfile_release 5.16.0-0.rc5.fce15c45d3fb.6.test
+%define tarfile_release 5.16.0-0.rc5.fce15c45d3fb.6.test.fc25
%define patchlevel 16
%define specrelease 0.rc5.fce15c45d3fb.6%{?buildid}%{?dist}
-%define kabiversion 5.16.0-0.rc5.fce15c45d3fb.6.test
+%define kabiversion 5.16.0-0.rc5.fce15c45d3fb.6.test.fc25
%define selftests_must_build 0
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
@@ -14,6 +14,8 @@ CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static
CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .el7"
CURARCH=x86_64
DIST=.el7
+DISTBASEVERSION=5.16.0-0.rc5.6.test
+DISTRELEASETAG=kernel-5.16.0-0.rc5.6.test
DISTRO=fedora
DIST_BRANCH="os-build"
EARLY_YBUILD=
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2039
_______________________________________________
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, report it: https://pagure.io/fedora-infrastructure/new_issue
