From: Prarit Bhargava <prarit@xxxxxxxxxx>
redhat/self-test/data: Cleanup data
There have been some additional redhat/Makefile changes that modified
variables. Run 'make dist-self-test-data' to clean these changes up.
Signed-off-by: Prarit Bhargava <prarit@xxxxxxxxxx>
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
@@ -1,5 +1,5 @@
.DEFAULT_GOAL=dist-cross-download
-.SHELLSTATUS=0
+.SHELLSTATUS=1
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
BUILD=6
@@ -12,7 +12,6 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_b
CURARCH=x86_64
DIST=.el7
DISTRO=centos
-DISTRO_BUILD=0.rc5.6
EARLY_YBUILD=
EARLY_YRELEASE=
FLAVOR=
@@ -23,8 +22,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.tar.bz2
-KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.tar.bz2
+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
KEXTRAVERSION=.rc5
LANG=C
LOCVERFILE=../localversion
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
@@ -87,8 +87,6 @@ Summary: The Linux kernel
# the --with-release option overrides this setting.)
%define debugbuildsenabled 1
-%global distro_build 0.rc5.6
-
%if 0%{?fedora}
%define secure_boot_arch x86_64
%else
@@ -828,8 +826,8 @@ Source211: Module.kabi_dup_ppc64le
Source212: Module.kabi_dup_s390x
Source213: Module.kabi_dup_x86_64
-Source300: kernel-abi-stablelists-%{specversion}-%{distro_build}.tar.bz2
-Source301: kernel-kabi-dw-%{specversion}-%{distro_build}.tar.bz2
+Source300: kernel-abi-stablelists-%{specversion}-%{pkgrelease}.tar.bz2
+Source301: kernel-kabi-dw-%{specversion}-%{pkgrelease}.tar.bz2
# Sources for kernel-tools
Source2000: cpupower.service
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
@@ -1,5 +1,5 @@
.DEFAULT_GOAL=dist-cross-download
-.SHELLSTATUS=0
+.SHELLSTATUS=1
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
BUILD=6
@@ -12,7 +12,6 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_b
CURARCH=x86_64
DIST=.fc25
DISTRO=centos
-DISTRO_BUILD=0.rc5.6
EARLY_YBUILD=
EARLY_YRELEASE=
FLAVOR=
@@ -23,8 +22,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.tar.bz2
-KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.tar.bz2
+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
KEXTRAVERSION=.rc5
LANG=C
LOCVERFILE=../localversion
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
@@ -87,8 +87,6 @@ Summary: The Linux kernel
# the --with-release option overrides this setting.)
%define debugbuildsenabled 1
-%global distro_build 0.rc5.6
-
%if 0%{?fedora}
%define secure_boot_arch x86_64
%else
@@ -828,8 +826,8 @@ Source211: Module.kabi_dup_ppc64le
Source212: Module.kabi_dup_s390x
Source213: Module.kabi_dup_x86_64
-Source300: kernel-abi-stablelists-%{specversion}-%{distro_build}.tar.bz2
-Source301: kernel-kabi-dw-%{specversion}-%{distro_build}.tar.bz2
+Source300: kernel-abi-stablelists-%{specversion}-%{pkgrelease}.tar.bz2
+Source301: kernel-kabi-dw-%{specversion}-%{pkgrelease}.tar.bz2
# Sources for kernel-tools
Source2000: cpupower.service
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
@@ -12,7 +12,6 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_b
CURARCH=x86_64
DIST=.el7
DISTRO=centos
-DISTRO_BUILD=0.rc0.78e36f3b0dae586.6
EARLY_YBUILD=
EARLY_YRELEASE=
FLAVOR=
@@ -23,8 +22,8 @@ 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.78e36f3b0dae586.6.tar.bz2
-KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae586.6.tar.bz2
+KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.bz2
+KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.bz2
KEXTRAVERSION=.rc0
LANG=C
LOCVERFILE=../localversion
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
@@ -87,8 +87,6 @@ Summary: The Linux kernel
# the --with-release option overrides this setting.)
%define debugbuildsenabled 0
-%global distro_build 0.rc0.78e36f3b0dae586.6
-
%if 0%{?fedora}
%define secure_boot_arch x86_64
%else
@@ -828,8 +826,8 @@ Source211: Module.kabi_dup_ppc64le
Source212: Module.kabi_dup_s390x
Source213: Module.kabi_dup_x86_64
-Source300: kernel-abi-stablelists-%{specversion}-%{distro_build}.tar.bz2
-Source301: kernel-kabi-dw-%{specversion}-%{distro_build}.tar.bz2
+Source300: kernel-abi-stablelists-%{specversion}-%{pkgrelease}.tar.bz2
+Source301: kernel-kabi-dw-%{specversion}-%{pkgrelease}.tar.bz2
# Sources for kernel-tools
Source2000: cpupower.service
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
@@ -12,7 +12,6 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_b
CURARCH=x86_64
DIST=.fc25
DISTRO=centos
-DISTRO_BUILD=0.rc0.78e36f3b0dae586.6
EARLY_YBUILD=
EARLY_YRELEASE=
FLAVOR=
@@ -23,8 +22,8 @@ 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.78e36f3b0dae586.6.tar.bz2
-KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae586.6.tar.bz2
+KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.bz2
+KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.bz2
KEXTRAVERSION=.rc0
LANG=C
LOCVERFILE=../localversion
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
@@ -87,8 +87,6 @@ Summary: The Linux kernel
# the --with-release option overrides this setting.)
%define debugbuildsenabled 0
-%global distro_build 0.rc0.78e36f3b0dae586.6
-
%if 0%{?fedora}
%define secure_boot_arch x86_64
%else
@@ -828,8 +826,8 @@ Source211: Module.kabi_dup_ppc64le
Source212: Module.kabi_dup_s390x
Source213: Module.kabi_dup_x86_64
-Source300: kernel-abi-stablelists-%{specversion}-%{distro_build}.tar.bz2
-Source301: kernel-kabi-dw-%{specversion}-%{distro_build}.tar.bz2
+Source300: kernel-abi-stablelists-%{specversion}-%{pkgrelease}.tar.bz2
+Source301: kernel-kabi-dw-%{specversion}-%{pkgrelease}.tar.bz2
# Sources for kernel-tools
Source2000: cpupower.service
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
@@ -1,5 +1,5 @@
.DEFAULT_GOAL=dist-cross-download
-.SHELLSTATUS=0
+.SHELLSTATUS=1
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
BUILD=6
@@ -12,7 +12,6 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_b
CURARCH=x86_64
DIST=.el7
DISTRO=centos
-DISTRO_BUILD=6
EARLY_YBUILD=
EARLY_YRELEASE=
FLAVOR=
@@ -23,8 +22,8 @@ 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.tar.bz2
-KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-6.tar.bz2
+KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-6.test.tar.bz2
+KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-6.test.tar.bz2
KEXTRAVERSION=
LANG=C
LOCVERFILE=../localversion
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
@@ -87,8 +87,6 @@ Summary: The Linux kernel
# the --with-release option overrides this setting.)
%define debugbuildsenabled 1
-%global distro_build 6
-
%if 0%{?fedora}
%define secure_boot_arch x86_64
%else
@@ -828,8 +826,8 @@ Source211: Module.kabi_dup_ppc64le
Source212: Module.kabi_dup_s390x
Source213: Module.kabi_dup_x86_64
-Source300: kernel-abi-stablelists-%{specversion}-%{distro_build}.tar.bz2
-Source301: kernel-kabi-dw-%{specversion}-%{distro_build}.tar.bz2
+Source300: kernel-abi-stablelists-%{specversion}-%{pkgrelease}.tar.bz2
+Source301: kernel-kabi-dw-%{specversion}-%{pkgrelease}.tar.bz2
# Sources for kernel-tools
Source2000: cpupower.service
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
@@ -1,5 +1,5 @@
.DEFAULT_GOAL=dist-cross-download
-.SHELLSTATUS=0
+.SHELLSTATUS=1
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
BUILD=6
@@ -12,7 +12,6 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_b
CURARCH=x86_64
DIST=.fc25
DISTRO=centos
-DISTRO_BUILD=6
EARLY_YBUILD=
EARLY_YRELEASE=
FLAVOR=
@@ -23,8 +22,8 @@ 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.tar.bz2
-KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-6.tar.bz2
+KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-6.test.tar.bz2
+KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-6.test.tar.bz2
KEXTRAVERSION=
LANG=C
LOCVERFILE=../localversion
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
@@ -87,8 +87,6 @@ Summary: The Linux kernel
# the --with-release option overrides this setting.)
%define debugbuildsenabled 1
-%global distro_build 6
-
%if 0%{?fedora}
%define secure_boot_arch x86_64
%else
@@ -828,8 +826,8 @@ Source211: Module.kabi_dup_ppc64le
Source212: Module.kabi_dup_s390x
Source213: Module.kabi_dup_x86_64
-Source300: kernel-abi-stablelists-%{specversion}-%{distro_build}.tar.bz2
-Source301: kernel-kabi-dw-%{specversion}-%{distro_build}.tar.bz2
+Source300: kernel-abi-stablelists-%{specversion}-%{pkgrelease}.tar.bz2
+Source301: kernel-kabi-dw-%{specversion}-%{pkgrelease}.tar.bz2
# Sources for kernel-tools
Source2000: cpupower.service
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
@@ -12,7 +12,6 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_b
CURARCH=x86_64
DIST=.el7
DISTRO=centos
-DISTRO_BUILD=0.rc5.fce15c45d3fbd9f.6
EARLY_YBUILD=
EARLY_YRELEASE=
FLAVOR=
@@ -23,8 +22,8 @@ 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.fce15c45d3fbd9f.6.tar.bz2
-KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.fce15c45d3fbd9f.6.tar.bz2
+KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.tar.bz2
+KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.tar.bz2
KEXTRAVERSION=.rc5
LANG=C
LOCVERFILE=../localversion
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
@@ -87,8 +87,6 @@ Summary: The Linux kernel
# the --with-release option overrides this setting.)
%define debugbuildsenabled 0
-%global distro_build 0.rc5.fce15c45d3fbd9f.6
-
%if 0%{?fedora}
%define secure_boot_arch x86_64
%else
@@ -828,8 +826,8 @@ Source211: Module.kabi_dup_ppc64le
Source212: Module.kabi_dup_s390x
Source213: Module.kabi_dup_x86_64
-Source300: kernel-abi-stablelists-%{specversion}-%{distro_build}.tar.bz2
-Source301: kernel-kabi-dw-%{specversion}-%{distro_build}.tar.bz2
+Source300: kernel-abi-stablelists-%{specversion}-%{pkgrelease}.tar.bz2
+Source301: kernel-kabi-dw-%{specversion}-%{pkgrelease}.tar.bz2
# Sources for kernel-tools
Source2000: cpupower.service
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
@@ -12,7 +12,6 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_b
CURARCH=x86_64
DIST=.fc25
DISTRO=centos
-DISTRO_BUILD=0.rc5.fce15c45d3fbd9f.6
EARLY_YBUILD=
EARLY_YRELEASE=
FLAVOR=
@@ -23,8 +22,8 @@ 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.fce15c45d3fbd9f.6.tar.bz2
-KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.fce15c45d3fbd9f.6.tar.bz2
+KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.tar.bz2
+KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.tar.bz2
KEXTRAVERSION=.rc5
LANG=C
LOCVERFILE=../localversion
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
@@ -87,8 +87,6 @@ Summary: The Linux kernel
# the --with-release option overrides this setting.)
%define debugbuildsenabled 0
-%global distro_build 0.rc5.fce15c45d3fbd9f.6
-
%if 0%{?fedora}
%define secure_boot_arch x86_64
%else
@@ -828,8 +826,8 @@ Source211: Module.kabi_dup_ppc64le
Source212: Module.kabi_dup_s390x
Source213: Module.kabi_dup_x86_64
-Source300: kernel-abi-stablelists-%{specversion}-%{distro_build}.tar.bz2
-Source301: kernel-kabi-dw-%{specversion}-%{distro_build}.tar.bz2
+Source300: kernel-abi-stablelists-%{specversion}-%{pkgrelease}.tar.bz2
+Source301: kernel-kabi-dw-%{specversion}-%{pkgrelease}.tar.bz2
# Sources for kernel-tools
Source2000: cpupower.service
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
@@ -1,5 +1,5 @@
.DEFAULT_GOAL=dist-cross-download
-.SHELLSTATUS=0
+.SHELLSTATUS=1
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
BUILD=6
@@ -11,7 +11,6 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_b
CURARCH=x86_64
DIST=.el7
DISTRO=fedora
-DISTRO_BUILD=0.rc5.6
EARLY_YBUILD=
EARLY_YRELEASE=
FLAVOR=
@@ -21,8 +20,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.tar.bz2
-KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.tar.bz2
+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
KEXTRAVERSION=.rc5
LANG=C
LOCVERFILE=../localversion
diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.el7.spec b/redhat/self-test/data/fedora-2585cf9dfaad.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-2585cf9dfaad.el7.spec
+++ b/redhat/self-test/data/fedora-2585cf9dfaad.el7.spec
@@ -87,8 +87,6 @@ Summary: The Linux kernel
# the --with-release option overrides this setting.)
%define debugbuildsenabled 1
-%global distro_build 0.rc5.6
-
%if 0%{?fedora}
%define secure_boot_arch x86_64
%else
@@ -828,8 +826,8 @@ Source211: Module.kabi_dup_ppc64le
Source212: Module.kabi_dup_s390x
Source213: Module.kabi_dup_x86_64
-Source300: kernel-abi-stablelists-%{specversion}-%{distro_build}.tar.bz2
-Source301: kernel-kabi-dw-%{specversion}-%{distro_build}.tar.bz2
+Source300: kernel-abi-stablelists-%{specversion}-%{pkgrelease}.tar.bz2
+Source301: kernel-kabi-dw-%{specversion}-%{pkgrelease}.tar.bz2
# Sources for kernel-tools
Source2000: cpupower.service
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
@@ -1,5 +1,5 @@
.DEFAULT_GOAL=dist-cross-download
-.SHELLSTATUS=0
+.SHELLSTATUS=1
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
BUILD=6
@@ -11,7 +11,6 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_b
CURARCH=x86_64
DIST=.fc25
DISTRO=fedora
-DISTRO_BUILD=0.rc5.6
EARLY_YBUILD=
EARLY_YRELEASE=
FLAVOR=
@@ -21,8 +20,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.tar.bz2
-KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.tar.bz2
+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
KEXTRAVERSION=.rc5
LANG=C
LOCVERFILE=../localversion
diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec b/redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec
+++ b/redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec
@@ -87,8 +87,6 @@ Summary: The Linux kernel
# the --with-release option overrides this setting.)
%define debugbuildsenabled 1
-%global distro_build 0.rc5.6
-
%if 0%{?fedora}
%define secure_boot_arch x86_64
%else
@@ -828,8 +826,8 @@ Source211: Module.kabi_dup_ppc64le
Source212: Module.kabi_dup_s390x
Source213: Module.kabi_dup_x86_64
-Source300: kernel-abi-stablelists-%{specversion}-%{distro_build}.tar.bz2
-Source301: kernel-kabi-dw-%{specversion}-%{distro_build}.tar.bz2
+Source300: kernel-abi-stablelists-%{specversion}-%{pkgrelease}.tar.bz2
+Source301: kernel-kabi-dw-%{specversion}-%{pkgrelease}.tar.bz2
# Sources for kernel-tools
Source2000: cpupower.service
--
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
