[OS-BUILD PATCH 14/18] redhat/Makefile: Rename TARFILE_RELEASE to SPECTARFILE_RELEASE

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



From: Prarit Bhargava <prarit@xxxxxxxxxx>

redhat/Makefile: Rename TARFILE_RELEASE to SPECTARFILE_RELEASE

Change TARFILE_RELEASE to SPECTARFILE_RELEASE so that readers
understand it is passed into the spec file.

Rename TARFILE_RELEASE to SPECTARFILE_RELEASE.

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
@@ -220,7 +220,7 @@ SRPM:=$(SRPMS)/$(PACKAGE_NAME)-$(RPMVERSION)$(DIST).src.rpm
 #
 ifeq ("$(DISTRO)", "fedora")
   SINGLE_TARBALL:=0
-  TARFILE_RELEASE:=$(UPSTREAM_TARBALL_NAME)
+  SPECTARFILE_RELEASE:=$(UPSTREAM_TARBALL_NAME)
   RHDISTGIT_BRANCH:=rawhide
   ifndef BUILD_SCRATCH_TARGET
     BUILD_SCRATCH_TARGET:=temp-ark-rhel-8-test
@@ -234,21 +234,21 @@ else ifeq ("$(DISTRO)", "centos")
   ifndef BUILD_SCRATCH_TARGET
     BUILD_SCRATCH_TARGET:=c$(RHEL_MAJOR)s-candidate
   endif
-  TARFILE_RELEASE:=$(RPMVERSION)
+  SPECTARFILE_RELEASE:=$(RPMVERSION)
 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
-  TARFILE_RELEASE:=$(RPMVERSION)
+  SPECTARFILE_RELEASE:=$(RPMVERSION)
 endif
 
 ifndef BUILD_TARGET
   BUILD_TARGET:=--scratch $(BUILD_SCRATCH_TARGET)
 endif
 
-TARFILE:=linux-$(TARFILE_RELEASE).tar.xz
+TARFILE:=linux-$(SPECTARFILE_RELEASE).tar.xz
 TARBALL:=$(REDHAT)/$(TARFILE)
 
 include Makefile.rhpkg
diff --git a/redhat/genspec.sh b/redhat/genspec.sh
index blahblah..blahblah 100755
--- a/redhat/genspec.sh
+++ b/redhat/genspec.sh
@@ -72,7 +72,7 @@ test -f "$SOURCES/$SPECFILE" &&
 	s/%%INCLUDE_RHEL_FILES%%/$INCLUDE_RHEL_FILES/
 	s/%%SPECPATCHLIST_CHANGELOG%%/$SPECPATCHLIST_CHANGELOG/
 	s/%%SPECVERSION%%/$SPECVERSION/
-	s/%%TARFILE_RELEASE%%/$TARFILE_RELEASE/" "$SOURCES/$SPECFILE"
+	s/%%SPECTARFILE_RELEASE%%/$SPECTARFILE_RELEASE/" "$SOURCES/$SPECFILE"
 
 # We depend on work splitting of BUILDOPTS
 # shellcheck disable=SC2086
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
@@ -692,7 +692,7 @@ BuildRequires: lld
 # exact git commit you can run
 #
 # xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-%%TARFILE_RELEASE%%.tar.xz
+Source0: linux-%%SPECTARFILE_RELEASE%%.tar.xz
 
 Source1: Makefile.rhelver
 
@@ -1384,8 +1384,8 @@ ApplyOptionalPatch()
   fi
 }
 
-%setup -q -n kernel-%%TARFILE_RELEASE%% -c
-mv linux-%%TARFILE_RELEASE%% linux-%{KVERREL}
+%setup -q -n kernel-%%SPECTARFILE_RELEASE%% -c
+mv linux-%%SPECTARFILE_RELEASE%% linux-%{KVERREL}
 
 cd linux-%{KVERREL}
 cp -a %{SOURCE1} .
diff --git a/redhat/scripts/create-tarball.sh b/redhat/scripts/create-tarball.sh
index blahblah..blahblah 100755
--- a/redhat/scripts/create-tarball.sh
+++ b/redhat/scripts/create-tarball.sh
@@ -27,4 +27,4 @@ trap 'rm -vf "$TARBALL"' INT
 # XZ_OPTIONS and XZ_THREADS DEPEND on word splitting, so don't disable it here:
 # shellcheck disable=SC2086
 cd ../ &&
-  git archive --prefix="linux-$TARFILE_RELEASE"/ --format=tar "$_GITID" | xz $XZ_OPTIONS $XZ_THREADS > "$TARBALL";
+  git archive --prefix="linux-$SPECTARFILE_RELEASE"/ --format=tar "$_GITID" | xz $XZ_OPTIONS $XZ_THREADS > "$TARBALL";
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,12 +61,12 @@ SPECKPATCHLEVEL=16
 SPECKSUBLEVEL=0 
 SPECKVERSION=5 
 SPECRELEASE=0.rc5.6%{?buildid}%{?dist} 
+SPECTARFILE_RELEASE=5.16.0-0.rc5.6.test 
 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 
-TARFILE_RELEASE=5.16.0-0.rc5.6.test 
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
 UPSTREAM_TARBALL_NAME=5.16-rc5 
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,12 +61,12 @@ SPECKPATCHLEVEL=16
 SPECKSUBLEVEL=0 
 SPECKVERSION=5 
 SPECRELEASE=0.rc5.6%{?buildid}%{?dist} 
+SPECTARFILE_RELEASE=5.16.0-0.rc5.6.test 
 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 
-TARFILE_RELEASE=5.16.0-0.rc5.6.test 
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
 UPSTREAM_TARBALL_NAME=5.16-rc5 
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,12 +61,12 @@ SPECKPATCHLEVEL=17
 SPECKSUBLEVEL=0 
 SPECKVERSION=5 
 SPECRELEASE=0.rc0.78e36f3b0dae586.6%{?buildid}%{?dist} 
+SPECTARFILE_RELEASE=5.17.0-0.rc0.78e36f3b0dae586.6.test 
 SPECVERSION=5.17.0 
 SRPM=../redhat/rpm/SRPMS/kernel-5.17.0-0.rc0.78e36f3b0dae586.6.test.el7.src.rpm 
 SRPMS=../redhat/rpm/SRPMS 
 TARBALL=../redhat/linux-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.xz 
 TARFILE=linux-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.xz 
-TARFILE_RELEASE=5.17.0-0.rc0.78e36f3b0dae586.6.test 
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
 UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae586 
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,12 +61,12 @@ SPECKPATCHLEVEL=17
 SPECKSUBLEVEL=0 
 SPECKVERSION=5 
 SPECRELEASE=0.rc0.78e36f3b0dae586.6%{?buildid}%{?dist} 
+SPECTARFILE_RELEASE=5.17.0-0.rc0.78e36f3b0dae586.6.test 
 SPECVERSION=5.17.0 
 SRPM=../redhat/rpm/SRPMS/kernel-5.17.0-0.rc0.78e36f3b0dae586.6.test.fc25.src.rpm 
 SRPMS=../redhat/rpm/SRPMS 
 TARBALL=../redhat/linux-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.xz 
 TARFILE=linux-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.xz 
-TARFILE_RELEASE=5.17.0-0.rc0.78e36f3b0dae586.6.test 
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
 UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae586 
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,12 +61,12 @@ SPECKPATCHLEVEL=16
 SPECKSUBLEVEL=0 
 SPECKVERSION=5 
 SPECRELEASE=6%{?buildid}%{?dist} 
+SPECTARFILE_RELEASE=5.16.0-6.test 
 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 
-TARFILE_RELEASE=5.16.0-6.test 
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
 UPSTREAM_TARBALL_NAME=5.16 
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,12 +61,12 @@ SPECKPATCHLEVEL=16
 SPECKSUBLEVEL=0 
 SPECKVERSION=5 
 SPECRELEASE=6%{?buildid}%{?dist} 
+SPECTARFILE_RELEASE=5.16.0-6.test 
 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 
-TARFILE_RELEASE=5.16.0-6.test 
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
 UPSTREAM_TARBALL_NAME=5.16 
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,12 +61,12 @@ SPECKPATCHLEVEL=16
 SPECKSUBLEVEL=0 
 SPECKVERSION=5 
 SPECRELEASE=0.rc5.fce15c45d3fbd9f.6%{?buildid}%{?dist} 
+SPECTARFILE_RELEASE=5.16.0-0.rc5.fce15c45d3fbd9f.6.test 
 SPECVERSION=5.16.0 
 SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.el7.src.rpm 
 SRPMS=../redhat/rpm/SRPMS 
 TARBALL=../redhat/linux-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.tar.xz 
 TARFILE=linux-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.tar.xz 
-TARFILE_RELEASE=5.16.0-0.rc5.fce15c45d3fbd9f.6.test 
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
 UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fbd9f 
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,12 +61,12 @@ SPECKPATCHLEVEL=16
 SPECKSUBLEVEL=0 
 SPECKVERSION=5 
 SPECRELEASE=0.rc5.fce15c45d3fbd9f.6%{?buildid}%{?dist} 
+SPECTARFILE_RELEASE=5.16.0-0.rc5.fce15c45d3fbd9f.6.test 
 SPECVERSION=5.16.0 
 SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.fc25.src.rpm 
 SRPMS=../redhat/rpm/SRPMS 
 TARBALL=../redhat/linux-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.tar.xz 
 TARFILE=linux-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.tar.xz 
-TARFILE_RELEASE=5.16.0-0.rc5.fce15c45d3fbd9f.6.test 
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
 UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fbd9f 
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,12 +59,12 @@ SPECKPATCHLEVEL=16
 SPECKSUBLEVEL=0 
 SPECKVERSION=5 
 SPECRELEASE=0.rc5.6%{?buildid}%{?dist} 
+SPECTARFILE_RELEASE=5.16-rc5 
 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-rc5.tar.xz 
 TARFILE=linux-5.16-rc5.tar.xz 
-TARFILE_RELEASE=5.16-rc5 
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
 UPSTREAM_TARBALL_NAME=5.16-rc5 
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,12 +59,12 @@ SPECKPATCHLEVEL=16
 SPECKSUBLEVEL=0 
 SPECKVERSION=5 
 SPECRELEASE=0.rc5.6%{?buildid}%{?dist} 
+SPECTARFILE_RELEASE=5.16-rc5 
 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-rc5.tar.xz 
 TARFILE=linux-5.16-rc5.tar.xz 
-TARFILE_RELEASE=5.16-rc5 
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
 UPSTREAM_TARBALL_NAME=5.16-rc5 
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,12 +59,12 @@ SPECKPATCHLEVEL=17
 SPECKSUBLEVEL=0 
 SPECKVERSION=5 
 SPECRELEASE=0.rc0.78e36f3b0dae586.6%{?buildid}%{?dist} 
+SPECTARFILE_RELEASE=5.16-11523-g78e36f3b0dae586 
 SPECVERSION=5.17.0 
 SRPM=../redhat/rpm/SRPMS/kernel-5.17.0-0.rc0.78e36f3b0dae586.6.test.el7.src.rpm 
 SRPMS=../redhat/rpm/SRPMS 
 TARBALL=../redhat/linux-5.16-11523-g78e36f3b0dae586.tar.xz 
 TARFILE=linux-5.16-11523-g78e36f3b0dae586.tar.xz 
-TARFILE_RELEASE=5.16-11523-g78e36f3b0dae586 
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
 UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae586 
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,12 +59,12 @@ SPECKPATCHLEVEL=17
 SPECKSUBLEVEL=0 
 SPECKVERSION=5 
 SPECRELEASE=0.rc0.78e36f3b0dae586.6%{?buildid}%{?dist} 
+SPECTARFILE_RELEASE=5.16-11523-g78e36f3b0dae586 
 SPECVERSION=5.17.0 
 SRPM=../redhat/rpm/SRPMS/kernel-5.17.0-0.rc0.78e36f3b0dae586.6.test.fc25.src.rpm 
 SRPMS=../redhat/rpm/SRPMS 
 TARBALL=../redhat/linux-5.16-11523-g78e36f3b0dae586.tar.xz 
 TARFILE=linux-5.16-11523-g78e36f3b0dae586.tar.xz 
-TARFILE_RELEASE=5.16-11523-g78e36f3b0dae586 
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
 UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae586 
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,12 +59,12 @@ SPECKPATCHLEVEL=16
 SPECKSUBLEVEL=0 
 SPECKVERSION=5 
 SPECRELEASE=6%{?buildid}%{?dist} 
+SPECTARFILE_RELEASE=5.16 
 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.tar.xz 
 TARFILE=linux-5.16.tar.xz 
-TARFILE_RELEASE=5.16 
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
 UPSTREAM_TARBALL_NAME=5.16 
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,12 +59,12 @@ SPECKPATCHLEVEL=16
 SPECKSUBLEVEL=0 
 SPECKVERSION=5 
 SPECRELEASE=6%{?buildid}%{?dist} 
+SPECTARFILE_RELEASE=5.16 
 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.tar.xz 
 TARFILE=linux-5.16.tar.xz 
-TARFILE_RELEASE=5.16 
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
 UPSTREAM_TARBALL_NAME=5.16 
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,12 +59,12 @@ SPECKPATCHLEVEL=16
 SPECKSUBLEVEL=0 
 SPECKVERSION=5 
 SPECRELEASE=0.rc5.fce15c45d3fbd9f.6%{?buildid}%{?dist} 
+SPECTARFILE_RELEASE=5.16-rc5-1-gfce15c45d3fbd9f 
 SPECVERSION=5.16.0 
 SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.el7.src.rpm 
 SRPMS=../redhat/rpm/SRPMS 
 TARBALL=../redhat/linux-5.16-rc5-1-gfce15c45d3fbd9f.tar.xz 
 TARFILE=linux-5.16-rc5-1-gfce15c45d3fbd9f.tar.xz 
-TARFILE_RELEASE=5.16-rc5-1-gfce15c45d3fbd9f 
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
 UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fbd9f 
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,12 +59,12 @@ SPECKPATCHLEVEL=16
 SPECKSUBLEVEL=0 
 SPECKVERSION=5 
 SPECRELEASE=0.rc5.fce15c45d3fbd9f.6%{?buildid}%{?dist} 
+SPECTARFILE_RELEASE=5.16-rc5-1-gfce15c45d3fbd9f 
 SPECVERSION=5.16.0 
 SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.fc25.src.rpm 
 SRPMS=../redhat/rpm/SRPMS 
 TARBALL=../redhat/linux-5.16-rc5-1-gfce15c45d3fbd9f.tar.xz 
 TARFILE=linux-5.16-rc5-1-gfce15c45d3fbd9f.tar.xz 
-TARFILE_RELEASE=5.16-rc5-1-gfce15c45d3fbd9f 
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
 UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fbd9f 

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1728
_______________________________________________
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




[Index of Archives]     [Fedora General Discussion]     [Older Fedora Users Archive]     [Fedora Advisory Board]     [Fedora Security]     [Fedora Devel Java]     [Fedora Legacy]     [Fedora Desktop]     [ATA RAID]     [Fedora Marketing]     [Fedora Mentors]     [Fedora Package Announce]     [Fedora Package Review]     [Fedora Music]     [Fedora Packaging]     [Centos]     [Fedora SELinux]     [Coolkey]     [Yum Users]     [Tux]     [Yosemite News]     [KDE Users]     [Fedora Art]     [Fedora Docs]     [USB]     [Asterisk PBX]

  Powered by Linux