[OS-BUILD PATCH 2/3] redhat: update the self-test-data

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

 



From: Patrick Talbert <ptalbert@xxxxxxxxxx>

redhat: update the self-test-data

The data needs to be regenerated after the dist-dump-variables fix.

Signed-off-by: Patrick Talbert <ptalbert@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,106 +1,106 @@
-.DEFAULT_GOAL=dist-cross-download 
-.SHELLSTATUS=0 
-ADD_COMMITID_TO_VERSION= 
-ARCHCONFIG=X86_64 
-ARCH_LIST=aarch64 ppc64le s390x x86_64 
-BASEVERSION=5.16.0-0.rc5.6.test 
-BUILD=6 
-BUILD_FLAGS= 
-BUILD_PROFILE=-p stream 
-BUILD_PROFILE_USERDEF= 
-BUILD_TARGET=c9s-candidate 
-BUILD_TARGET_USERDEF= 
-BUMP_RELEASE=yes 
-CHANGELOG_EXT=changelog-9.99 
-CHANGELOG_PREV_EXT=changelog-9.98 
-CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu 
-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 
-DISTRO_USERDEF=centos 
-DIST_BRANCH="os-build" 
-DIST_USERDEF=.el7 
-EARLY_YBUILD= 
-EARLY_YRELEASE= 
-ENABLE_WERROR= 
-FLAVOR= 
-GIT=git 
-GITID=2585cf9dfaaddf00b069673f27bb3f8530e2039c 
-GNUMAKEFLAGS= 
-HEAD=2585cf9dfaad 
-INCLUDE_FEDORA_FILES=1 
-INCLUDE_RHEL_FILES=1 
-INCLUDE_RT_FILES=1 
-KABIDW=../redhat/kabi-dwarf 
-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.el7.tar.bz2 
-LANG=C 
-LOCVERFILE=../localversion 
-MACH=x86_64 
-MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.cross 
-MAKEFLAGS= -- HEAD=2585cf9dfaad DISTRO=centos DIST=.el7 RHSELFTESTDATA=1 
-MARKER=v5.16-rc5 
-MERGE_BASE=2585cf9dfaaddf00b069673f27bb3f8530e2039c 
-NO_CONFIGCHECKS= 
-PATCHLIST_URL=none 
-PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
-PROCESS_CONFIGS_OPTS=-n -w -c 
-REDHAT=../redhat 
-RELEASED_KERNEL=0 
-RELEASETAG=kernel-5.16.0-0.rc5.6.test 
-RHDISTGIT_BRANCH=c9s 
-RHDISTGIT_CACHE= 
-RHDISTGIT_TMP=/tmp 
-RHEL_MAJOR=9 
-RHEL_MINOR=99 
-RHEL_REBASE_NUM=1 
-RHGITCOMMIT=2585cf9dfaad 
-RHJOBS=1 
-RHPKG_BIN=centpkg 
-RHSELFTESTDATA=1 
-RPM=../redhat/rpm 
-RPMBUILD=rpmbuild 
-SNAPSHOT=0 
-SOURCES=../redhat/rpm/SOURCES 
-SPECBUILD=0.rc5.6.test 
-SPECCHANGELOG=kernel.changelog-9.99 
-SPECFILE=kernel.spec 
-SPECGEMINI=0 
-SPECINCLUDE_FEDORA_FILES=1 
-SPECINCLUDE_RHEL_FILES=1 
-SPECINCLUDE_RT_FILES=1 
-SPECKABIVERSION=5.16.0-0.rc5.6.test.el7 
-SPECKEXTRAVERSION=-rc5 
-SPECKPATCHLEVEL=16 
-SPECKSUBLEVEL=0 
-SPECKVERSION=5 
-SPECPACKAGE_NAME=kernel 
-SPECRELEASED_KERNEL=0 
-SPECRPATCHLEVEL=1 
-SPECRPMVERSION=5.16.0 
-SPECRVERSION=0 
-SPECSELFTESTS_MUST_BUILD=0 
-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.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. 
-UPSTREAMBUILD_GIT_ONLY= 
-UPSTREAM_BRANCH=master 
-UPSTREAM_TARBALL_NAME=5.16-rc5 
-VERSION_ON_UPSTREAM=1 
-YSTREAM_FLAG=yes 
-ZSTREAM_FLAG=no 
-_OUTPUT=.. 
-_TAG=v5.16-rc5 
+.DEFAULT_GOAL=dist-cross-download
+.SHELLSTATUS=0
+ADD_COMMITID_TO_VERSION=
+ARCHCONFIG=X86_64
+ARCH_LIST=aarch64 ppc64le s390x x86_64
+BASEVERSION=5.16.0-0.rc5.6.test
+BUILD=6
+BUILD_FLAGS=
+BUILD_PROFILE=-p stream
+BUILD_PROFILE_USERDEF=
+BUILD_TARGET=c9s-candidate
+BUILD_TARGET_USERDEF=
+BUMP_RELEASE=yes
+CHANGELOG_EXT=changelog-9.99
+CHANGELOG_PREV_EXT=changelog-9.98
+CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu
+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
+DISTRO_USERDEF=centos
+DIST_BRANCH="os-build"
+DIST_USERDEF=.el7
+EARLY_YBUILD=
+EARLY_YRELEASE=
+ENABLE_WERROR=
+FLAVOR=
+GIT=git
+GITID=2585cf9dfaaddf00b069673f27bb3f8530e2039c
+GNUMAKEFLAGS=
+HEAD=2585cf9dfaad
+INCLUDE_FEDORA_FILES=1
+INCLUDE_RHEL_FILES=1
+INCLUDE_RT_FILES=1
+KABIDW=../redhat/kabi-dwarf
+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.el7.tar.bz2
+LANG=C
+LOCVERFILE=../localversion
+MACH=x86_64
+MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.cross
+MAKEFLAGS= -- HEAD=2585cf9dfaad DISTRO=centos DIST=.el7 RHSELFTESTDATA=1
+MARKER=v5.16-rc5
+MERGE_BASE=2585cf9dfaaddf00b069673f27bb3f8530e2039c
+NO_CONFIGCHECKS=
+PATCHLIST_URL=none
+PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
+PROCESS_CONFIGS_OPTS=-n -w -c
+REDHAT=../redhat
+RELEASED_KERNEL=0
+RELEASETAG=kernel-5.16.0-0.rc5.6.test
+RHDISTGIT_BRANCH=c9s
+RHDISTGIT_CACHE=
+RHDISTGIT_TMP=/tmp
+RHEL_MAJOR=9
+RHEL_MINOR=99
+RHEL_REBASE_NUM=1
+RHGITCOMMIT=2585cf9dfaad
+RHJOBS=1
+RHPKG_BIN=centpkg
+RHSELFTESTDATA=1
+RPM=../redhat/rpm
+RPMBUILD=rpmbuild
+SNAPSHOT=0
+SOURCES=../redhat/rpm/SOURCES
+SPECBUILD=0.rc5.6.test
+SPECCHANGELOG=kernel.changelog-9.99
+SPECFILE=kernel.spec
+SPECGEMINI=0
+SPECINCLUDE_FEDORA_FILES=1
+SPECINCLUDE_RHEL_FILES=1
+SPECINCLUDE_RT_FILES=1
+SPECKABIVERSION=5.16.0-0.rc5.6.test.el7
+SPECKEXTRAVERSION=-rc5
+SPECKPATCHLEVEL=16
+SPECKSUBLEVEL=0
+SPECKVERSION=5
+SPECPACKAGE_NAME=kernel
+SPECRELEASED_KERNEL=0
+SPECRPATCHLEVEL=1
+SPECRPMVERSION=5.16.0
+SPECRVERSION=0
+SPECSELFTESTS_MUST_BUILD=0
+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.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.
+UPSTREAMBUILD_GIT_ONLY=
+UPSTREAM_BRANCH=master
+UPSTREAM_TARBALL_NAME=5.16-rc5
+VERSION_ON_UPSTREAM=1
+YSTREAM_FLAG=yes
+ZSTREAM_FLAG=no
+_OUTPUT=..
+_TAG=v5.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
@@ -1,106 +1,106 @@
-.DEFAULT_GOAL=dist-cross-download 
-.SHELLSTATUS=0 
-ADD_COMMITID_TO_VERSION= 
-ARCHCONFIG=X86_64 
-ARCH_LIST=aarch64 ppc64le s390x x86_64 
-BASEVERSION=5.16.0-0.rc5.6.test 
-BUILD=6 
-BUILD_FLAGS= 
-BUILD_PROFILE=-p stream 
-BUILD_PROFILE_USERDEF= 
-BUILD_TARGET=c9s-candidate 
-BUILD_TARGET_USERDEF= 
-BUMP_RELEASE=yes 
-CHANGELOG_EXT=changelog-9.99 
-CHANGELOG_PREV_EXT=changelog-9.98 
-CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu 
-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 
-DISTRO_USERDEF=centos 
-DIST_BRANCH="os-build" 
-DIST_USERDEF=.fc25 
-EARLY_YBUILD= 
-EARLY_YRELEASE= 
-ENABLE_WERROR= 
-FLAVOR= 
-GIT=git 
-GITID=2585cf9dfaaddf00b069673f27bb3f8530e2039c 
-GNUMAKEFLAGS= 
-HEAD=2585cf9dfaad 
-INCLUDE_FEDORA_FILES=1 
-INCLUDE_RHEL_FILES=1 
-INCLUDE_RT_FILES=1 
-KABIDW=../redhat/kabi-dwarf 
-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.fc25.tar.bz2 
-LANG=C 
-LOCVERFILE=../localversion 
-MACH=x86_64 
-MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.cross 
-MAKEFLAGS= -- HEAD=2585cf9dfaad DISTRO=centos DIST=.fc25 RHSELFTESTDATA=1 
-MARKER=v5.16-rc5 
-MERGE_BASE=2585cf9dfaaddf00b069673f27bb3f8530e2039c 
-NO_CONFIGCHECKS= 
-PATCHLIST_URL=none 
-PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
-PROCESS_CONFIGS_OPTS=-n -w -c 
-REDHAT=../redhat 
-RELEASED_KERNEL=0 
-RELEASETAG=kernel-5.16.0-0.rc5.6.test 
-RHDISTGIT_BRANCH=c9s 
-RHDISTGIT_CACHE= 
-RHDISTGIT_TMP=/tmp 
-RHEL_MAJOR=9 
-RHEL_MINOR=99 
-RHEL_REBASE_NUM=1 
-RHGITCOMMIT=2585cf9dfaad 
-RHJOBS=1 
-RHPKG_BIN=centpkg 
-RHSELFTESTDATA=1 
-RPM=../redhat/rpm 
-RPMBUILD=rpmbuild 
-SNAPSHOT=0 
-SOURCES=../redhat/rpm/SOURCES 
-SPECBUILD=0.rc5.6.test 
-SPECCHANGELOG=kernel.changelog-9.99 
-SPECFILE=kernel.spec 
-SPECGEMINI=0 
-SPECINCLUDE_FEDORA_FILES=1 
-SPECINCLUDE_RHEL_FILES=1 
-SPECINCLUDE_RT_FILES=1 
-SPECKABIVERSION=5.16.0-0.rc5.6.test.fc25 
-SPECKEXTRAVERSION=-rc5 
-SPECKPATCHLEVEL=16 
-SPECKSUBLEVEL=0 
-SPECKVERSION=5 
-SPECPACKAGE_NAME=kernel 
-SPECRELEASED_KERNEL=0 
-SPECRPATCHLEVEL=1 
-SPECRPMVERSION=5.16.0 
-SPECRVERSION=0 
-SPECSELFTESTS_MUST_BUILD=0 
-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.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. 
-UPSTREAMBUILD_GIT_ONLY= 
-UPSTREAM_BRANCH=master 
-UPSTREAM_TARBALL_NAME=5.16-rc5 
-VERSION_ON_UPSTREAM=1 
-YSTREAM_FLAG=yes 
-ZSTREAM_FLAG=no 
-_OUTPUT=.. 
-_TAG=v5.16-rc5 
+.DEFAULT_GOAL=dist-cross-download
+.SHELLSTATUS=0
+ADD_COMMITID_TO_VERSION=
+ARCHCONFIG=X86_64
+ARCH_LIST=aarch64 ppc64le s390x x86_64
+BASEVERSION=5.16.0-0.rc5.6.test
+BUILD=6
+BUILD_FLAGS=
+BUILD_PROFILE=-p stream
+BUILD_PROFILE_USERDEF=
+BUILD_TARGET=c9s-candidate
+BUILD_TARGET_USERDEF=
+BUMP_RELEASE=yes
+CHANGELOG_EXT=changelog-9.99
+CHANGELOG_PREV_EXT=changelog-9.98
+CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu
+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
+DISTRO_USERDEF=centos
+DIST_BRANCH="os-build"
+DIST_USERDEF=.fc25
+EARLY_YBUILD=
+EARLY_YRELEASE=
+ENABLE_WERROR=
+FLAVOR=
+GIT=git
+GITID=2585cf9dfaaddf00b069673f27bb3f8530e2039c
+GNUMAKEFLAGS=
+HEAD=2585cf9dfaad
+INCLUDE_FEDORA_FILES=1
+INCLUDE_RHEL_FILES=1
+INCLUDE_RT_FILES=1
+KABIDW=../redhat/kabi-dwarf
+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.fc25.tar.bz2
+LANG=C
+LOCVERFILE=../localversion
+MACH=x86_64
+MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.cross
+MAKEFLAGS= -- HEAD=2585cf9dfaad DISTRO=centos DIST=.fc25 RHSELFTESTDATA=1
+MARKER=v5.16-rc5
+MERGE_BASE=2585cf9dfaaddf00b069673f27bb3f8530e2039c
+NO_CONFIGCHECKS=
+PATCHLIST_URL=none
+PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
+PROCESS_CONFIGS_OPTS=-n -w -c
+REDHAT=../redhat
+RELEASED_KERNEL=0
+RELEASETAG=kernel-5.16.0-0.rc5.6.test
+RHDISTGIT_BRANCH=c9s
+RHDISTGIT_CACHE=
+RHDISTGIT_TMP=/tmp
+RHEL_MAJOR=9
+RHEL_MINOR=99
+RHEL_REBASE_NUM=1
+RHGITCOMMIT=2585cf9dfaad
+RHJOBS=1
+RHPKG_BIN=centpkg
+RHSELFTESTDATA=1
+RPM=../redhat/rpm
+RPMBUILD=rpmbuild
+SNAPSHOT=0
+SOURCES=../redhat/rpm/SOURCES
+SPECBUILD=0.rc5.6.test
+SPECCHANGELOG=kernel.changelog-9.99
+SPECFILE=kernel.spec
+SPECGEMINI=0
+SPECINCLUDE_FEDORA_FILES=1
+SPECINCLUDE_RHEL_FILES=1
+SPECINCLUDE_RT_FILES=1
+SPECKABIVERSION=5.16.0-0.rc5.6.test.fc25
+SPECKEXTRAVERSION=-rc5
+SPECKPATCHLEVEL=16
+SPECKSUBLEVEL=0
+SPECKVERSION=5
+SPECPACKAGE_NAME=kernel
+SPECRELEASED_KERNEL=0
+SPECRPATCHLEVEL=1
+SPECRPMVERSION=5.16.0
+SPECRVERSION=0
+SPECSELFTESTS_MUST_BUILD=0
+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.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.
+UPSTREAMBUILD_GIT_ONLY=
+UPSTREAM_BRANCH=master
+UPSTREAM_TARBALL_NAME=5.16-rc5
+VERSION_ON_UPSTREAM=1
+YSTREAM_FLAG=yes
+ZSTREAM_FLAG=no
+_OUTPUT=..
+_TAG=v5.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
@@ -1,106 +1,106 @@
-.DEFAULT_GOAL=dist-cross-download 
-.SHELLSTATUS=0 
-ADD_COMMITID_TO_VERSION= 
-ARCHCONFIG=X86_64 
-ARCH_LIST=aarch64 ppc64le s390x x86_64 
-BASEVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test 
-BUILD=6 
-BUILD_FLAGS= 
-BUILD_PROFILE=-p stream 
-BUILD_PROFILE_USERDEF= 
-BUILD_TARGET=c9s-candidate 
-BUILD_TARGET_USERDEF= 
-BUMP_RELEASE=yes 
-CHANGELOG_EXT=changelog-9.99 
-CHANGELOG_PREV_EXT=changelog-9.98 
-CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu 
-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 
-DISTRO_USERDEF=centos 
-DIST_BRANCH="os-build" 
-DIST_USERDEF=.el7 
-EARLY_YBUILD= 
-EARLY_YRELEASE= 
-ENABLE_WERROR= 
-FLAVOR= 
-GIT=git 
-GITID=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1 
-GNUMAKEFLAGS= 
-HEAD=78e36f3b0dae 
-INCLUDE_FEDORA_FILES=1 
-INCLUDE_RHEL_FILES=1 
-INCLUDE_RT_FILES=1 
-KABIDW=../redhat/kabi-dwarf 
-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.el7.tar.bz2 
-LANG=C 
-LOCVERFILE=../localversion 
-MACH=x86_64 
-MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.cross 
-MAKEFLAGS= -- HEAD=78e36f3b0dae DISTRO=centos DIST=.el7 RHSELFTESTDATA=1 
-MARKER=78e36f3b0dae 
-MERGE_BASE=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1 
-NO_CONFIGCHECKS= 
-PATCHLIST_URL=none 
-PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
-PROCESS_CONFIGS_OPTS=-n -w -c 
-REDHAT=../redhat 
-RELEASED_KERNEL=0 
-RELEASETAG=kernel-5.17.0-0.rc0.78e36f3b0dae.6.test 
-RHDISTGIT_BRANCH=c9s 
-RHDISTGIT_CACHE= 
-RHDISTGIT_TMP=/tmp 
-RHEL_MAJOR=9 
-RHEL_MINOR=99 
-RHEL_REBASE_NUM=1 
-RHGITCOMMIT=78e36f3b0dae 
-RHJOBS=1 
-RHPKG_BIN=centpkg 
-RHSELFTESTDATA=1 
-RPM=../redhat/rpm 
-RPMBUILD=rpmbuild 
-SNAPSHOT=1 
-SOURCES=../redhat/rpm/SOURCES 
-SPECBUILD=0.rc0.78e36f3b0dae.6.test 
-SPECCHANGELOG=kernel.changelog-9.99 
-SPECFILE=kernel.spec 
-SPECGEMINI=0 
-SPECINCLUDE_FEDORA_FILES=1 
-SPECINCLUDE_RHEL_FILES=1 
-SPECINCLUDE_RT_FILES=1 
-SPECKABIVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test.el7 
-SPECKEXTRAVERSION= 
-SPECKPATCHLEVEL=17 
-SPECKSUBLEVEL=0 
-SPECKVERSION=5 
-SPECPACKAGE_NAME=kernel 
-SPECRELEASED_KERNEL=0 
-SPECRPATCHLEVEL=1 
-SPECRPMVERSION=5.17.0 
-SPECRVERSION=0 
-SPECSELFTESTS_MUST_BUILD=0 
-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.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. 
-UPSTREAMBUILD_GIT_ONLY=1 
-UPSTREAM_BRANCH=master 
-UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae 
-VERSION_ON_UPSTREAM=1 
-YSTREAM_FLAG=yes 
-ZSTREAM_FLAG=no 
-_OUTPUT=.. 
-_TAG=v5.16-11523-g78e36f3b0dae 
+.DEFAULT_GOAL=dist-cross-download
+.SHELLSTATUS=0
+ADD_COMMITID_TO_VERSION=
+ARCHCONFIG=X86_64
+ARCH_LIST=aarch64 ppc64le s390x x86_64
+BASEVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test
+BUILD=6
+BUILD_FLAGS=
+BUILD_PROFILE=-p stream
+BUILD_PROFILE_USERDEF=
+BUILD_TARGET=c9s-candidate
+BUILD_TARGET_USERDEF=
+BUMP_RELEASE=yes
+CHANGELOG_EXT=changelog-9.99
+CHANGELOG_PREV_EXT=changelog-9.98
+CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu
+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
+DISTRO_USERDEF=centos
+DIST_BRANCH="os-build"
+DIST_USERDEF=.el7
+EARLY_YBUILD=
+EARLY_YRELEASE=
+ENABLE_WERROR=
+FLAVOR=
+GIT=git
+GITID=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1
+GNUMAKEFLAGS=
+HEAD=78e36f3b0dae
+INCLUDE_FEDORA_FILES=1
+INCLUDE_RHEL_FILES=1
+INCLUDE_RT_FILES=1
+KABIDW=../redhat/kabi-dwarf
+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.el7.tar.bz2
+LANG=C
+LOCVERFILE=../localversion
+MACH=x86_64
+MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.cross
+MAKEFLAGS= -- HEAD=78e36f3b0dae DISTRO=centos DIST=.el7 RHSELFTESTDATA=1
+MARKER=78e36f3b0dae
+MERGE_BASE=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1
+NO_CONFIGCHECKS=
+PATCHLIST_URL=none
+PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
+PROCESS_CONFIGS_OPTS=-n -w -c
+REDHAT=../redhat
+RELEASED_KERNEL=0
+RELEASETAG=kernel-5.17.0-0.rc0.78e36f3b0dae.6.test
+RHDISTGIT_BRANCH=c9s
+RHDISTGIT_CACHE=
+RHDISTGIT_TMP=/tmp
+RHEL_MAJOR=9
+RHEL_MINOR=99
+RHEL_REBASE_NUM=1
+RHGITCOMMIT=78e36f3b0dae
+RHJOBS=1
+RHPKG_BIN=centpkg
+RHSELFTESTDATA=1
+RPM=../redhat/rpm
+RPMBUILD=rpmbuild
+SNAPSHOT=1
+SOURCES=../redhat/rpm/SOURCES
+SPECBUILD=0.rc0.78e36f3b0dae.6.test
+SPECCHANGELOG=kernel.changelog-9.99
+SPECFILE=kernel.spec
+SPECGEMINI=0
+SPECINCLUDE_FEDORA_FILES=1
+SPECINCLUDE_RHEL_FILES=1
+SPECINCLUDE_RT_FILES=1
+SPECKABIVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test.el7
+SPECKEXTRAVERSION=
+SPECKPATCHLEVEL=17
+SPECKSUBLEVEL=0
+SPECKVERSION=5
+SPECPACKAGE_NAME=kernel
+SPECRELEASED_KERNEL=0
+SPECRPATCHLEVEL=1
+SPECRPMVERSION=5.17.0
+SPECRVERSION=0
+SPECSELFTESTS_MUST_BUILD=0
+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.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.
+UPSTREAMBUILD_GIT_ONLY=1
+UPSTREAM_BRANCH=master
+UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae
+VERSION_ON_UPSTREAM=1
+YSTREAM_FLAG=yes
+ZSTREAM_FLAG=no
+_OUTPUT=..
+_TAG=v5.16-11523-g78e36f3b0dae
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
@@ -1,106 +1,106 @@
-.DEFAULT_GOAL=dist-cross-download 
-.SHELLSTATUS=0 
-ADD_COMMITID_TO_VERSION= 
-ARCHCONFIG=X86_64 
-ARCH_LIST=aarch64 ppc64le s390x x86_64 
-BASEVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test 
-BUILD=6 
-BUILD_FLAGS= 
-BUILD_PROFILE=-p stream 
-BUILD_PROFILE_USERDEF= 
-BUILD_TARGET=c9s-candidate 
-BUILD_TARGET_USERDEF= 
-BUMP_RELEASE=yes 
-CHANGELOG_EXT=changelog-9.99 
-CHANGELOG_PREV_EXT=changelog-9.98 
-CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu 
-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 
-DISTRO_USERDEF=centos 
-DIST_BRANCH="os-build" 
-DIST_USERDEF=.fc25 
-EARLY_YBUILD= 
-EARLY_YRELEASE= 
-ENABLE_WERROR= 
-FLAVOR= 
-GIT=git 
-GITID=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1 
-GNUMAKEFLAGS= 
-HEAD=78e36f3b0dae 
-INCLUDE_FEDORA_FILES=1 
-INCLUDE_RHEL_FILES=1 
-INCLUDE_RT_FILES=1 
-KABIDW=../redhat/kabi-dwarf 
-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.fc25.tar.bz2 
-LANG=C 
-LOCVERFILE=../localversion 
-MACH=x86_64 
-MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.cross 
-MAKEFLAGS= -- HEAD=78e36f3b0dae DISTRO=centos DIST=.fc25 RHSELFTESTDATA=1 
-MARKER=78e36f3b0dae 
-MERGE_BASE=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1 
-NO_CONFIGCHECKS= 
-PATCHLIST_URL=none 
-PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
-PROCESS_CONFIGS_OPTS=-n -w -c 
-REDHAT=../redhat 
-RELEASED_KERNEL=0 
-RELEASETAG=kernel-5.17.0-0.rc0.78e36f3b0dae.6.test 
-RHDISTGIT_BRANCH=c9s 
-RHDISTGIT_CACHE= 
-RHDISTGIT_TMP=/tmp 
-RHEL_MAJOR=9 
-RHEL_MINOR=99 
-RHEL_REBASE_NUM=1 
-RHGITCOMMIT=78e36f3b0dae 
-RHJOBS=1 
-RHPKG_BIN=centpkg 
-RHSELFTESTDATA=1 
-RPM=../redhat/rpm 
-RPMBUILD=rpmbuild 
-SNAPSHOT=1 
-SOURCES=../redhat/rpm/SOURCES 
-SPECBUILD=0.rc0.78e36f3b0dae.6.test 
-SPECCHANGELOG=kernel.changelog-9.99 
-SPECFILE=kernel.spec 
-SPECGEMINI=0 
-SPECINCLUDE_FEDORA_FILES=1 
-SPECINCLUDE_RHEL_FILES=1 
-SPECINCLUDE_RT_FILES=1 
-SPECKABIVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test.fc25 
-SPECKEXTRAVERSION= 
-SPECKPATCHLEVEL=17 
-SPECKSUBLEVEL=0 
-SPECKVERSION=5 
-SPECPACKAGE_NAME=kernel 
-SPECRELEASED_KERNEL=0 
-SPECRPATCHLEVEL=1 
-SPECRPMVERSION=5.17.0 
-SPECRVERSION=0 
-SPECSELFTESTS_MUST_BUILD=0 
-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.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. 
-UPSTREAMBUILD_GIT_ONLY=1 
-UPSTREAM_BRANCH=master 
-UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae 
-VERSION_ON_UPSTREAM=1 
-YSTREAM_FLAG=yes 
-ZSTREAM_FLAG=no 
-_OUTPUT=.. 
-_TAG=v5.16-11523-g78e36f3b0dae 
+.DEFAULT_GOAL=dist-cross-download
+.SHELLSTATUS=0
+ADD_COMMITID_TO_VERSION=
+ARCHCONFIG=X86_64
+ARCH_LIST=aarch64 ppc64le s390x x86_64
+BASEVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test
+BUILD=6
+BUILD_FLAGS=
+BUILD_PROFILE=-p stream
+BUILD_PROFILE_USERDEF=
+BUILD_TARGET=c9s-candidate
+BUILD_TARGET_USERDEF=
+BUMP_RELEASE=yes
+CHANGELOG_EXT=changelog-9.99
+CHANGELOG_PREV_EXT=changelog-9.98
+CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu
+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
+DISTRO_USERDEF=centos
+DIST_BRANCH="os-build"
+DIST_USERDEF=.fc25
+EARLY_YBUILD=
+EARLY_YRELEASE=
+ENABLE_WERROR=
+FLAVOR=
+GIT=git
+GITID=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1
+GNUMAKEFLAGS=
+HEAD=78e36f3b0dae
+INCLUDE_FEDORA_FILES=1
+INCLUDE_RHEL_FILES=1
+INCLUDE_RT_FILES=1
+KABIDW=../redhat/kabi-dwarf
+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.fc25.tar.bz2
+LANG=C
+LOCVERFILE=../localversion
+MACH=x86_64
+MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.cross
+MAKEFLAGS= -- HEAD=78e36f3b0dae DISTRO=centos DIST=.fc25 RHSELFTESTDATA=1
+MARKER=78e36f3b0dae
+MERGE_BASE=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1
+NO_CONFIGCHECKS=
+PATCHLIST_URL=none
+PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
+PROCESS_CONFIGS_OPTS=-n -w -c
+REDHAT=../redhat
+RELEASED_KERNEL=0
+RELEASETAG=kernel-5.17.0-0.rc0.78e36f3b0dae.6.test
+RHDISTGIT_BRANCH=c9s
+RHDISTGIT_CACHE=
+RHDISTGIT_TMP=/tmp
+RHEL_MAJOR=9
+RHEL_MINOR=99
+RHEL_REBASE_NUM=1
+RHGITCOMMIT=78e36f3b0dae
+RHJOBS=1
+RHPKG_BIN=centpkg
+RHSELFTESTDATA=1
+RPM=../redhat/rpm
+RPMBUILD=rpmbuild
+SNAPSHOT=1
+SOURCES=../redhat/rpm/SOURCES
+SPECBUILD=0.rc0.78e36f3b0dae.6.test
+SPECCHANGELOG=kernel.changelog-9.99
+SPECFILE=kernel.spec
+SPECGEMINI=0
+SPECINCLUDE_FEDORA_FILES=1
+SPECINCLUDE_RHEL_FILES=1
+SPECINCLUDE_RT_FILES=1
+SPECKABIVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test.fc25
+SPECKEXTRAVERSION=
+SPECKPATCHLEVEL=17
+SPECKSUBLEVEL=0
+SPECKVERSION=5
+SPECPACKAGE_NAME=kernel
+SPECRELEASED_KERNEL=0
+SPECRPATCHLEVEL=1
+SPECRPMVERSION=5.17.0
+SPECRVERSION=0
+SPECSELFTESTS_MUST_BUILD=0
+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.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.
+UPSTREAMBUILD_GIT_ONLY=1
+UPSTREAM_BRANCH=master
+UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae
+VERSION_ON_UPSTREAM=1
+YSTREAM_FLAG=yes
+ZSTREAM_FLAG=no
+_OUTPUT=..
+_TAG=v5.16-11523-g78e36f3b0dae
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,106 +1,106 @@
-.DEFAULT_GOAL=dist-cross-download 
-.SHELLSTATUS=0 
-ADD_COMMITID_TO_VERSION= 
-ARCHCONFIG=X86_64 
-ARCH_LIST=aarch64 ppc64le s390x x86_64 
-BASEVERSION=5.16.0-6.test 
-BUILD=6 
-BUILD_FLAGS= 
-BUILD_PROFILE=-p stream 
-BUILD_PROFILE_USERDEF= 
-BUILD_TARGET=c9s-candidate 
-BUILD_TARGET_USERDEF= 
-BUMP_RELEASE=yes 
-CHANGELOG_EXT=changelog-9.99 
-CHANGELOG_PREV_EXT=changelog-9.98 
-CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu 
-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 
-DISTRO_USERDEF=centos 
-DIST_BRANCH="os-build" 
-DIST_USERDEF=.el7 
-EARLY_YBUILD= 
-EARLY_YRELEASE= 
-ENABLE_WERROR= 
-FLAVOR= 
-GIT=git 
-GITID=df0cc57e057f18e44dac8e6c18aba47ab53202f9 
-GNUMAKEFLAGS= 
-HEAD=df0cc57e057f 
-INCLUDE_FEDORA_FILES=1 
-INCLUDE_RHEL_FILES=1 
-INCLUDE_RT_FILES=1 
-KABIDW=../redhat/kabi-dwarf 
-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.el7.tar.bz2 
-LANG=C 
-LOCVERFILE=../localversion 
-MACH=x86_64 
-MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.cross 
-MAKEFLAGS= -- HEAD=df0cc57e057f DISTRO=centos DIST=.el7 RHSELFTESTDATA=1 
-MARKER=v5.16 
-MERGE_BASE=df0cc57e057f18e44dac8e6c18aba47ab53202f9 
-NO_CONFIGCHECKS= 
-PATCHLIST_URL=none 
-PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
-PROCESS_CONFIGS_OPTS=-n -w -c 
-REDHAT=../redhat 
-RELEASED_KERNEL=0 
-RELEASETAG=kernel-5.16.0-6.test 
-RHDISTGIT_BRANCH=c9s 
-RHDISTGIT_CACHE= 
-RHDISTGIT_TMP=/tmp 
-RHEL_MAJOR=9 
-RHEL_MINOR=99 
-RHEL_REBASE_NUM=1 
-RHGITCOMMIT=df0cc57e057f 
-RHJOBS=1 
-RHPKG_BIN=centpkg 
-RHSELFTESTDATA=1 
-RPM=../redhat/rpm 
-RPMBUILD=rpmbuild 
-SNAPSHOT=0 
-SOURCES=../redhat/rpm/SOURCES 
-SPECBUILD=6.test 
-SPECCHANGELOG=kernel.changelog-9.99 
-SPECFILE=kernel.spec 
-SPECGEMINI=0 
-SPECINCLUDE_FEDORA_FILES=1 
-SPECINCLUDE_RHEL_FILES=1 
-SPECINCLUDE_RT_FILES=1 
-SPECKABIVERSION=5.16.0-6.test.el7 
-SPECKEXTRAVERSION= 
-SPECKPATCHLEVEL=16 
-SPECKSUBLEVEL=0 
-SPECKVERSION=5 
-SPECPACKAGE_NAME=kernel 
-SPECRELEASED_KERNEL=0 
-SPECRPATCHLEVEL=1 
-SPECRPMVERSION=5.16.0 
-SPECRVERSION=0 
-SPECSELFTESTS_MUST_BUILD=0 
-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.el7.tar.xz 
-TARFILE=linux-5.16.0-6.test.el7.tar.xz 
-TESTPATCH=../redhat/linux-kernel-test.patch 
-TOPDIR=.. 
-UPSTREAMBUILD= 
-UPSTREAMBUILD_GIT_ONLY= 
-UPSTREAM_BRANCH=master 
-UPSTREAM_TARBALL_NAME=5.16 
-VERSION_ON_UPSTREAM=1 
-YSTREAM_FLAG=yes 
-ZSTREAM_FLAG=no 
-_OUTPUT=.. 
-_TAG=v5.16 
+.DEFAULT_GOAL=dist-cross-download
+.SHELLSTATUS=0
+ADD_COMMITID_TO_VERSION=
+ARCHCONFIG=X86_64
+ARCH_LIST=aarch64 ppc64le s390x x86_64
+BASEVERSION=5.16.0-6.test
+BUILD=6
+BUILD_FLAGS=
+BUILD_PROFILE=-p stream
+BUILD_PROFILE_USERDEF=
+BUILD_TARGET=c9s-candidate
+BUILD_TARGET_USERDEF=
+BUMP_RELEASE=yes
+CHANGELOG_EXT=changelog-9.99
+CHANGELOG_PREV_EXT=changelog-9.98
+CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu
+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
+DISTRO_USERDEF=centos
+DIST_BRANCH="os-build"
+DIST_USERDEF=.el7
+EARLY_YBUILD=
+EARLY_YRELEASE=
+ENABLE_WERROR=
+FLAVOR=
+GIT=git
+GITID=df0cc57e057f18e44dac8e6c18aba47ab53202f9
+GNUMAKEFLAGS=
+HEAD=df0cc57e057f
+INCLUDE_FEDORA_FILES=1
+INCLUDE_RHEL_FILES=1
+INCLUDE_RT_FILES=1
+KABIDW=../redhat/kabi-dwarf
+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.el7.tar.bz2
+LANG=C
+LOCVERFILE=../localversion
+MACH=x86_64
+MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.cross
+MAKEFLAGS= -- HEAD=df0cc57e057f DISTRO=centos DIST=.el7 RHSELFTESTDATA=1
+MARKER=v5.16
+MERGE_BASE=df0cc57e057f18e44dac8e6c18aba47ab53202f9
+NO_CONFIGCHECKS=
+PATCHLIST_URL=none
+PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
+PROCESS_CONFIGS_OPTS=-n -w -c
+REDHAT=../redhat
+RELEASED_KERNEL=0
+RELEASETAG=kernel-5.16.0-6.test
+RHDISTGIT_BRANCH=c9s
+RHDISTGIT_CACHE=
+RHDISTGIT_TMP=/tmp
+RHEL_MAJOR=9
+RHEL_MINOR=99
+RHEL_REBASE_NUM=1
+RHGITCOMMIT=df0cc57e057f
+RHJOBS=1
+RHPKG_BIN=centpkg
+RHSELFTESTDATA=1
+RPM=../redhat/rpm
+RPMBUILD=rpmbuild
+SNAPSHOT=0
+SOURCES=../redhat/rpm/SOURCES
+SPECBUILD=6.test
+SPECCHANGELOG=kernel.changelog-9.99
+SPECFILE=kernel.spec
+SPECGEMINI=0
+SPECINCLUDE_FEDORA_FILES=1
+SPECINCLUDE_RHEL_FILES=1
+SPECINCLUDE_RT_FILES=1
+SPECKABIVERSION=5.16.0-6.test.el7
+SPECKEXTRAVERSION=
+SPECKPATCHLEVEL=16
+SPECKSUBLEVEL=0
+SPECKVERSION=5
+SPECPACKAGE_NAME=kernel
+SPECRELEASED_KERNEL=0
+SPECRPATCHLEVEL=1
+SPECRPMVERSION=5.16.0
+SPECRVERSION=0
+SPECSELFTESTS_MUST_BUILD=0
+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.el7.tar.xz
+TARFILE=linux-5.16.0-6.test.el7.tar.xz
+TESTPATCH=../redhat/linux-kernel-test.patch
+TOPDIR=..
+UPSTREAMBUILD=
+UPSTREAMBUILD_GIT_ONLY=
+UPSTREAM_BRANCH=master
+UPSTREAM_TARBALL_NAME=5.16
+VERSION_ON_UPSTREAM=1
+YSTREAM_FLAG=yes
+ZSTREAM_FLAG=no
+_OUTPUT=..
+_TAG=v5.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
@@ -1,106 +1,106 @@
-.DEFAULT_GOAL=dist-cross-download 
-.SHELLSTATUS=0 
-ADD_COMMITID_TO_VERSION= 
-ARCHCONFIG=X86_64 
-ARCH_LIST=aarch64 ppc64le s390x x86_64 
-BASEVERSION=5.16.0-6.test 
-BUILD=6 
-BUILD_FLAGS= 
-BUILD_PROFILE=-p stream 
-BUILD_PROFILE_USERDEF= 
-BUILD_TARGET=c9s-candidate 
-BUILD_TARGET_USERDEF= 
-BUMP_RELEASE=yes 
-CHANGELOG_EXT=changelog-9.99 
-CHANGELOG_PREV_EXT=changelog-9.98 
-CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu 
-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 
-DISTRO_USERDEF=centos 
-DIST_BRANCH="os-build" 
-DIST_USERDEF=.fc25 
-EARLY_YBUILD= 
-EARLY_YRELEASE= 
-ENABLE_WERROR= 
-FLAVOR= 
-GIT=git 
-GITID=df0cc57e057f18e44dac8e6c18aba47ab53202f9 
-GNUMAKEFLAGS= 
-HEAD=df0cc57e057f 
-INCLUDE_FEDORA_FILES=1 
-INCLUDE_RHEL_FILES=1 
-INCLUDE_RT_FILES=1 
-KABIDW=../redhat/kabi-dwarf 
-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.fc25.tar.bz2 
-LANG=C 
-LOCVERFILE=../localversion 
-MACH=x86_64 
-MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.cross 
-MAKEFLAGS= -- HEAD=df0cc57e057f DISTRO=centos DIST=.fc25 RHSELFTESTDATA=1 
-MARKER=v5.16 
-MERGE_BASE=df0cc57e057f18e44dac8e6c18aba47ab53202f9 
-NO_CONFIGCHECKS= 
-PATCHLIST_URL=none 
-PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
-PROCESS_CONFIGS_OPTS=-n -w -c 
-REDHAT=../redhat 
-RELEASED_KERNEL=0 
-RELEASETAG=kernel-5.16.0-6.test 
-RHDISTGIT_BRANCH=c9s 
-RHDISTGIT_CACHE= 
-RHDISTGIT_TMP=/tmp 
-RHEL_MAJOR=9 
-RHEL_MINOR=99 
-RHEL_REBASE_NUM=1 
-RHGITCOMMIT=df0cc57e057f 
-RHJOBS=1 
-RHPKG_BIN=centpkg 
-RHSELFTESTDATA=1 
-RPM=../redhat/rpm 
-RPMBUILD=rpmbuild 
-SNAPSHOT=0 
-SOURCES=../redhat/rpm/SOURCES 
-SPECBUILD=6.test 
-SPECCHANGELOG=kernel.changelog-9.99 
-SPECFILE=kernel.spec 
-SPECGEMINI=0 
-SPECINCLUDE_FEDORA_FILES=1 
-SPECINCLUDE_RHEL_FILES=1 
-SPECINCLUDE_RT_FILES=1 
-SPECKABIVERSION=5.16.0-6.test.fc25 
-SPECKEXTRAVERSION= 
-SPECKPATCHLEVEL=16 
-SPECKSUBLEVEL=0 
-SPECKVERSION=5 
-SPECPACKAGE_NAME=kernel 
-SPECRELEASED_KERNEL=0 
-SPECRPATCHLEVEL=1 
-SPECRPMVERSION=5.16.0 
-SPECRVERSION=0 
-SPECSELFTESTS_MUST_BUILD=0 
-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.fc25.tar.xz 
-TARFILE=linux-5.16.0-6.test.fc25.tar.xz 
-TESTPATCH=../redhat/linux-kernel-test.patch 
-TOPDIR=.. 
-UPSTREAMBUILD= 
-UPSTREAMBUILD_GIT_ONLY= 
-UPSTREAM_BRANCH=master 
-UPSTREAM_TARBALL_NAME=5.16 
-VERSION_ON_UPSTREAM=1 
-YSTREAM_FLAG=yes 
-ZSTREAM_FLAG=no 
-_OUTPUT=.. 
-_TAG=v5.16 
+.DEFAULT_GOAL=dist-cross-download
+.SHELLSTATUS=0
+ADD_COMMITID_TO_VERSION=
+ARCHCONFIG=X86_64
+ARCH_LIST=aarch64 ppc64le s390x x86_64
+BASEVERSION=5.16.0-6.test
+BUILD=6
+BUILD_FLAGS=
+BUILD_PROFILE=-p stream
+BUILD_PROFILE_USERDEF=
+BUILD_TARGET=c9s-candidate
+BUILD_TARGET_USERDEF=
+BUMP_RELEASE=yes
+CHANGELOG_EXT=changelog-9.99
+CHANGELOG_PREV_EXT=changelog-9.98
+CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu
+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
+DISTRO_USERDEF=centos
+DIST_BRANCH="os-build"
+DIST_USERDEF=.fc25
+EARLY_YBUILD=
+EARLY_YRELEASE=
+ENABLE_WERROR=
+FLAVOR=
+GIT=git
+GITID=df0cc57e057f18e44dac8e6c18aba47ab53202f9
+GNUMAKEFLAGS=
+HEAD=df0cc57e057f
+INCLUDE_FEDORA_FILES=1
+INCLUDE_RHEL_FILES=1
+INCLUDE_RT_FILES=1
+KABIDW=../redhat/kabi-dwarf
+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.fc25.tar.bz2
+LANG=C
+LOCVERFILE=../localversion
+MACH=x86_64
+MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.cross
+MAKEFLAGS= -- HEAD=df0cc57e057f DISTRO=centos DIST=.fc25 RHSELFTESTDATA=1
+MARKER=v5.16
+MERGE_BASE=df0cc57e057f18e44dac8e6c18aba47ab53202f9
+NO_CONFIGCHECKS=
+PATCHLIST_URL=none
+PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
+PROCESS_CONFIGS_OPTS=-n -w -c
+REDHAT=../redhat
+RELEASED_KERNEL=0
+RELEASETAG=kernel-5.16.0-6.test
+RHDISTGIT_BRANCH=c9s
+RHDISTGIT_CACHE=
+RHDISTGIT_TMP=/tmp
+RHEL_MAJOR=9
+RHEL_MINOR=99
+RHEL_REBASE_NUM=1
+RHGITCOMMIT=df0cc57e057f
+RHJOBS=1
+RHPKG_BIN=centpkg
+RHSELFTESTDATA=1
+RPM=../redhat/rpm
+RPMBUILD=rpmbuild
+SNAPSHOT=0
+SOURCES=../redhat/rpm/SOURCES
+SPECBUILD=6.test
+SPECCHANGELOG=kernel.changelog-9.99
+SPECFILE=kernel.spec
+SPECGEMINI=0
+SPECINCLUDE_FEDORA_FILES=1
+SPECINCLUDE_RHEL_FILES=1
+SPECINCLUDE_RT_FILES=1
+SPECKABIVERSION=5.16.0-6.test.fc25
+SPECKEXTRAVERSION=
+SPECKPATCHLEVEL=16
+SPECKSUBLEVEL=0
+SPECKVERSION=5
+SPECPACKAGE_NAME=kernel
+SPECRELEASED_KERNEL=0
+SPECRPATCHLEVEL=1
+SPECRPMVERSION=5.16.0
+SPECRVERSION=0
+SPECSELFTESTS_MUST_BUILD=0
+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.fc25.tar.xz
+TARFILE=linux-5.16.0-6.test.fc25.tar.xz
+TESTPATCH=../redhat/linux-kernel-test.patch
+TOPDIR=..
+UPSTREAMBUILD=
+UPSTREAMBUILD_GIT_ONLY=
+UPSTREAM_BRANCH=master
+UPSTREAM_TARBALL_NAME=5.16
+VERSION_ON_UPSTREAM=1
+YSTREAM_FLAG=yes
+ZSTREAM_FLAG=no
+_OUTPUT=..
+_TAG=v5.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
@@ -1,106 +1,106 @@
-.DEFAULT_GOAL=dist-cross-download 
-.SHELLSTATUS=0 
-ADD_COMMITID_TO_VERSION= 
-ARCHCONFIG=X86_64 
-ARCH_LIST=aarch64 ppc64le s390x x86_64 
-BASEVERSION=5.16.0-0.rc5.fce15c45d3fb.6.test 
-BUILD=6 
-BUILD_FLAGS= 
-BUILD_PROFILE=-p stream 
-BUILD_PROFILE_USERDEF= 
-BUILD_TARGET=c9s-candidate 
-BUILD_TARGET_USERDEF= 
-BUMP_RELEASE=yes 
-CHANGELOG_EXT=changelog-9.99 
-CHANGELOG_PREV_EXT=changelog-9.98 
-CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu 
-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 
-DISTRO_USERDEF=centos 
-DIST_BRANCH="os-build" 
-DIST_USERDEF=.el7 
-EARLY_YBUILD= 
-EARLY_YRELEASE= 
-ENABLE_WERROR= 
-FLAVOR= 
-GIT=git 
-GITID=fce15c45d3fbd9fc1feaaf3210d8e3f8b33dfd3a 
-GNUMAKEFLAGS= 
-HEAD=fce15c45d3fb 
-INCLUDE_FEDORA_FILES=1 
-INCLUDE_RHEL_FILES=1 
-INCLUDE_RT_FILES=1 
-KABIDW=../redhat/kabi-dwarf 
-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.el7.tar.bz2 
-LANG=C 
-LOCVERFILE=../localversion 
-MACH=x86_64 
-MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.cross 
-MAKEFLAGS= -- HEAD=fce15c45d3fb DISTRO=centos DIST=.el7 RHSELFTESTDATA=1 
-MARKER=fce15c45d3fb 
-MERGE_BASE=fce15c45d3fbd9fc1feaaf3210d8e3f8b33dfd3a 
-NO_CONFIGCHECKS= 
-PATCHLIST_URL=none 
-PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
-PROCESS_CONFIGS_OPTS=-n -w -c 
-REDHAT=../redhat 
-RELEASED_KERNEL=0 
-RELEASETAG=kernel-5.16.0-0.rc5.fce15c45d3fb.6.test 
-RHDISTGIT_BRANCH=c9s 
-RHDISTGIT_CACHE= 
-RHDISTGIT_TMP=/tmp 
-RHEL_MAJOR=9 
-RHEL_MINOR=99 
-RHEL_REBASE_NUM=1 
-RHGITCOMMIT=fce15c45d3fb 
-RHJOBS=1 
-RHPKG_BIN=centpkg 
-RHSELFTESTDATA=1 
-RPM=../redhat/rpm 
-RPMBUILD=rpmbuild 
-SNAPSHOT=1 
-SOURCES=../redhat/rpm/SOURCES 
-SPECBUILD=0.rc5.fce15c45d3fb.6.test 
-SPECCHANGELOG=kernel.changelog-9.99 
-SPECFILE=kernel.spec 
-SPECGEMINI=0 
-SPECINCLUDE_FEDORA_FILES=1 
-SPECINCLUDE_RHEL_FILES=1 
-SPECINCLUDE_RT_FILES=1 
-SPECKABIVERSION=5.16.0-0.rc5.fce15c45d3fb.6.test.el7 
-SPECKEXTRAVERSION=-rc5 
-SPECKPATCHLEVEL=16 
-SPECKSUBLEVEL=0 
-SPECKVERSION=5 
-SPECPACKAGE_NAME=kernel 
-SPECRELEASED_KERNEL=0 
-SPECRPATCHLEVEL=1 
-SPECRPMVERSION=5.16.0 
-SPECRVERSION=0 
-SPECSELFTESTS_MUST_BUILD=0 
-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.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. 
-UPSTREAMBUILD_GIT_ONLY=1 
-UPSTREAM_BRANCH=master 
-UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fb 
-VERSION_ON_UPSTREAM=1 
-YSTREAM_FLAG=yes 
-ZSTREAM_FLAG=no 
-_OUTPUT=.. 
-_TAG=v5.16-rc5-1-gfce15c45d3fb 
+.DEFAULT_GOAL=dist-cross-download
+.SHELLSTATUS=0
+ADD_COMMITID_TO_VERSION=
+ARCHCONFIG=X86_64
+ARCH_LIST=aarch64 ppc64le s390x x86_64
+BASEVERSION=5.16.0-0.rc5.fce15c45d3fb.6.test
+BUILD=6
+BUILD_FLAGS=
+BUILD_PROFILE=-p stream
+BUILD_PROFILE_USERDEF=
+BUILD_TARGET=c9s-candidate
+BUILD_TARGET_USERDEF=
+BUMP_RELEASE=yes
+CHANGELOG_EXT=changelog-9.99
+CHANGELOG_PREV_EXT=changelog-9.98
+CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu
+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
+DISTRO_USERDEF=centos
+DIST_BRANCH="os-build"
+DIST_USERDEF=.el7
+EARLY_YBUILD=
+EARLY_YRELEASE=
+ENABLE_WERROR=
+FLAVOR=
+GIT=git
+GITID=fce15c45d3fbd9fc1feaaf3210d8e3f8b33dfd3a
+GNUMAKEFLAGS=
+HEAD=fce15c45d3fb
+INCLUDE_FEDORA_FILES=1
+INCLUDE_RHEL_FILES=1
+INCLUDE_RT_FILES=1
+KABIDW=../redhat/kabi-dwarf
+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.el7.tar.bz2
+LANG=C
+LOCVERFILE=../localversion
+MACH=x86_64
+MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.cross
+MAKEFLAGS= -- HEAD=fce15c45d3fb DISTRO=centos DIST=.el7 RHSELFTESTDATA=1
+MARKER=fce15c45d3fb
+MERGE_BASE=fce15c45d3fbd9fc1feaaf3210d8e3f8b33dfd3a
+NO_CONFIGCHECKS=
+PATCHLIST_URL=none
+PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
+PROCESS_CONFIGS_OPTS=-n -w -c
+REDHAT=../redhat
+RELEASED_KERNEL=0
+RELEASETAG=kernel-5.16.0-0.rc5.fce15c45d3fb.6.test
+RHDISTGIT_BRANCH=c9s
+RHDISTGIT_CACHE=
+RHDISTGIT_TMP=/tmp
+RHEL_MAJOR=9
+RHEL_MINOR=99
+RHEL_REBASE_NUM=1
+RHGITCOMMIT=fce15c45d3fb
+RHJOBS=1
+RHPKG_BIN=centpkg
+RHSELFTESTDATA=1
+RPM=../redhat/rpm
+RPMBUILD=rpmbuild
+SNAPSHOT=1
+SOURCES=../redhat/rpm/SOURCES
+SPECBUILD=0.rc5.fce15c45d3fb.6.test
+SPECCHANGELOG=kernel.changelog-9.99
+SPECFILE=kernel.spec
+SPECGEMINI=0
+SPECINCLUDE_FEDORA_FILES=1
+SPECINCLUDE_RHEL_FILES=1
+SPECINCLUDE_RT_FILES=1
+SPECKABIVERSION=5.16.0-0.rc5.fce15c45d3fb.6.test.el7
+SPECKEXTRAVERSION=-rc5
+SPECKPATCHLEVEL=16
+SPECKSUBLEVEL=0
+SPECKVERSION=5
+SPECPACKAGE_NAME=kernel
+SPECRELEASED_KERNEL=0
+SPECRPATCHLEVEL=1
+SPECRPMVERSION=5.16.0
+SPECRVERSION=0
+SPECSELFTESTS_MUST_BUILD=0
+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.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.
+UPSTREAMBUILD_GIT_ONLY=1
+UPSTREAM_BRANCH=master
+UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fb
+VERSION_ON_UPSTREAM=1
+YSTREAM_FLAG=yes
+ZSTREAM_FLAG=no
+_OUTPUT=..
+_TAG=v5.16-rc5-1-gfce15c45d3fb
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
@@ -1,106 +1,106 @@
-.DEFAULT_GOAL=dist-cross-download 
-.SHELLSTATUS=0 
-ADD_COMMITID_TO_VERSION= 
-ARCHCONFIG=X86_64 
-ARCH_LIST=aarch64 ppc64le s390x x86_64 
-BASEVERSION=5.16.0-0.rc5.fce15c45d3fb.6.test 
-BUILD=6 
-BUILD_FLAGS= 
-BUILD_PROFILE=-p stream 
-BUILD_PROFILE_USERDEF= 
-BUILD_TARGET=c9s-candidate 
-BUILD_TARGET_USERDEF= 
-BUMP_RELEASE=yes 
-CHANGELOG_EXT=changelog-9.99 
-CHANGELOG_PREV_EXT=changelog-9.98 
-CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu 
-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 
-DISTRO_USERDEF=centos 
-DIST_BRANCH="os-build" 
-DIST_USERDEF=.fc25 
-EARLY_YBUILD= 
-EARLY_YRELEASE= 
-ENABLE_WERROR= 
-FLAVOR= 
-GIT=git 
-GITID=fce15c45d3fbd9fc1feaaf3210d8e3f8b33dfd3a 
-GNUMAKEFLAGS= 
-HEAD=fce15c45d3fb 
-INCLUDE_FEDORA_FILES=1 
-INCLUDE_RHEL_FILES=1 
-INCLUDE_RT_FILES=1 
-KABIDW=../redhat/kabi-dwarf 
-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.fc25.tar.bz2 
-LANG=C 
-LOCVERFILE=../localversion 
-MACH=x86_64 
-MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.cross 
-MAKEFLAGS= -- HEAD=fce15c45d3fb DISTRO=centos DIST=.fc25 RHSELFTESTDATA=1 
-MARKER=fce15c45d3fb 
-MERGE_BASE=fce15c45d3fbd9fc1feaaf3210d8e3f8b33dfd3a 
-NO_CONFIGCHECKS= 
-PATCHLIST_URL=none 
-PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
-PROCESS_CONFIGS_OPTS=-n -w -c 
-REDHAT=../redhat 
-RELEASED_KERNEL=0 
-RELEASETAG=kernel-5.16.0-0.rc5.fce15c45d3fb.6.test 
-RHDISTGIT_BRANCH=c9s 
-RHDISTGIT_CACHE= 
-RHDISTGIT_TMP=/tmp 
-RHEL_MAJOR=9 
-RHEL_MINOR=99 
-RHEL_REBASE_NUM=1 
-RHGITCOMMIT=fce15c45d3fb 
-RHJOBS=1 
-RHPKG_BIN=centpkg 
-RHSELFTESTDATA=1 
-RPM=../redhat/rpm 
-RPMBUILD=rpmbuild 
-SNAPSHOT=1 
-SOURCES=../redhat/rpm/SOURCES 
-SPECBUILD=0.rc5.fce15c45d3fb.6.test 
-SPECCHANGELOG=kernel.changelog-9.99 
-SPECFILE=kernel.spec 
-SPECGEMINI=0 
-SPECINCLUDE_FEDORA_FILES=1 
-SPECINCLUDE_RHEL_FILES=1 
-SPECINCLUDE_RT_FILES=1 
-SPECKABIVERSION=5.16.0-0.rc5.fce15c45d3fb.6.test.fc25 
-SPECKEXTRAVERSION=-rc5 
-SPECKPATCHLEVEL=16 
-SPECKSUBLEVEL=0 
-SPECKVERSION=5 
-SPECPACKAGE_NAME=kernel 
-SPECRELEASED_KERNEL=0 
-SPECRPATCHLEVEL=1 
-SPECRPMVERSION=5.16.0 
-SPECRVERSION=0 
-SPECSELFTESTS_MUST_BUILD=0 
-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.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. 
-UPSTREAMBUILD_GIT_ONLY=1 
-UPSTREAM_BRANCH=master 
-UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fb 
-VERSION_ON_UPSTREAM=1 
-YSTREAM_FLAG=yes 
-ZSTREAM_FLAG=no 
-_OUTPUT=.. 
-_TAG=v5.16-rc5-1-gfce15c45d3fb 
+.DEFAULT_GOAL=dist-cross-download
+.SHELLSTATUS=0
+ADD_COMMITID_TO_VERSION=
+ARCHCONFIG=X86_64
+ARCH_LIST=aarch64 ppc64le s390x x86_64
+BASEVERSION=5.16.0-0.rc5.fce15c45d3fb.6.test
+BUILD=6
+BUILD_FLAGS=
+BUILD_PROFILE=-p stream
+BUILD_PROFILE_USERDEF=
+BUILD_TARGET=c9s-candidate
+BUILD_TARGET_USERDEF=
+BUMP_RELEASE=yes
+CHANGELOG_EXT=changelog-9.99
+CHANGELOG_PREV_EXT=changelog-9.98
+CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu
+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
+DISTRO_USERDEF=centos
+DIST_BRANCH="os-build"
+DIST_USERDEF=.fc25
+EARLY_YBUILD=
+EARLY_YRELEASE=
+ENABLE_WERROR=
+FLAVOR=
+GIT=git
+GITID=fce15c45d3fbd9fc1feaaf3210d8e3f8b33dfd3a
+GNUMAKEFLAGS=
+HEAD=fce15c45d3fb
+INCLUDE_FEDORA_FILES=1
+INCLUDE_RHEL_FILES=1
+INCLUDE_RT_FILES=1
+KABIDW=../redhat/kabi-dwarf
+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.fc25.tar.bz2
+LANG=C
+LOCVERFILE=../localversion
+MACH=x86_64
+MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.cross
+MAKEFLAGS= -- HEAD=fce15c45d3fb DISTRO=centos DIST=.fc25 RHSELFTESTDATA=1
+MARKER=fce15c45d3fb
+MERGE_BASE=fce15c45d3fbd9fc1feaaf3210d8e3f8b33dfd3a
+NO_CONFIGCHECKS=
+PATCHLIST_URL=none
+PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
+PROCESS_CONFIGS_OPTS=-n -w -c
+REDHAT=../redhat
+RELEASED_KERNEL=0
+RELEASETAG=kernel-5.16.0-0.rc5.fce15c45d3fb.6.test
+RHDISTGIT_BRANCH=c9s
+RHDISTGIT_CACHE=
+RHDISTGIT_TMP=/tmp
+RHEL_MAJOR=9
+RHEL_MINOR=99
+RHEL_REBASE_NUM=1
+RHGITCOMMIT=fce15c45d3fb
+RHJOBS=1
+RHPKG_BIN=centpkg
+RHSELFTESTDATA=1
+RPM=../redhat/rpm
+RPMBUILD=rpmbuild
+SNAPSHOT=1
+SOURCES=../redhat/rpm/SOURCES
+SPECBUILD=0.rc5.fce15c45d3fb.6.test
+SPECCHANGELOG=kernel.changelog-9.99
+SPECFILE=kernel.spec
+SPECGEMINI=0
+SPECINCLUDE_FEDORA_FILES=1
+SPECINCLUDE_RHEL_FILES=1
+SPECINCLUDE_RT_FILES=1
+SPECKABIVERSION=5.16.0-0.rc5.fce15c45d3fb.6.test.fc25
+SPECKEXTRAVERSION=-rc5
+SPECKPATCHLEVEL=16
+SPECKSUBLEVEL=0
+SPECKVERSION=5
+SPECPACKAGE_NAME=kernel
+SPECRELEASED_KERNEL=0
+SPECRPATCHLEVEL=1
+SPECRPMVERSION=5.16.0
+SPECRVERSION=0
+SPECSELFTESTS_MUST_BUILD=0
+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.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.
+UPSTREAMBUILD_GIT_ONLY=1
+UPSTREAM_BRANCH=master
+UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fb
+VERSION_ON_UPSTREAM=1
+YSTREAM_FLAG=yes
+ZSTREAM_FLAG=no
+_OUTPUT=..
+_TAG=v5.16-rc5-1-gfce15c45d3fb
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,106 +1,106 @@
-.DEFAULT_GOAL=dist-cross-download 
-.SHELLSTATUS=0 
-ADD_COMMITID_TO_VERSION= 
-ARCHCONFIG=X86_64 
-ARCH_LIST=aarch64 ppc64le s390x x86_64 
-BASEVERSION=5.16.0-0.rc5.6.test 
-BUILD=6 
-BUILD_FLAGS= 
-BUILD_PROFILE= 
-BUILD_PROFILE_USERDEF= 
-BUILD_TARGET=rawhide 
-BUILD_TARGET_USERDEF= 
-BUMP_RELEASE=yes 
-CHANGELOG_EXT=changelog-9.99 
-CHANGELOG_PREV_EXT=changelog-9.98 
-CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu 
-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 
-DISTRO_USERDEF=fedora 
-DIST_BRANCH="os-build" 
-DIST_USERDEF=.el7 
-EARLY_YBUILD= 
-EARLY_YRELEASE= 
-ENABLE_WERROR= 
-FLAVOR= 
-GIT=git 
-GITID=2585cf9dfaaddf00b069673f27bb3f8530e2039c 
-GNUMAKEFLAGS= 
-HEAD=2585cf9dfaad 
-INCLUDE_FEDORA_FILES=1 
-INCLUDE_RHEL_FILES=1 
-INCLUDE_RT_FILES=1 
-KABIDW=../redhat/kabi-dwarf 
-KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0.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.tar.bz2 
-LANG=C 
-LOCVERFILE=../localversion 
-MACH=x86_64 
-MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.cross 
-MAKEFLAGS= -- HEAD=2585cf9dfaad DISTRO=fedora DIST=.el7 RHSELFTESTDATA=1 
-MARKER=v5.16-rc5 
-MERGE_BASE=2585cf9dfaaddf00b069673f27bb3f8530e2039c 
-NO_CONFIGCHECKS= 
-PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"; 
-PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
-PROCESS_CONFIGS_OPTS=-n -w -c 
-REDHAT=../redhat 
-RELEASED_KERNEL=0 
-RELEASETAG=kernel-5.16.0-0.rc5.6.test 
-RHDISTGIT_BRANCH=rawhide 
-RHDISTGIT_CACHE= 
-RHDISTGIT_TMP=/tmp 
-RHEL_MAJOR=9 
-RHEL_MINOR=99 
-RHEL_REBASE_NUM=1 
-RHGITCOMMIT=2585cf9dfaad 
-RHJOBS=1 
-RHPKG_BIN=fedpkg 
-RHSELFTESTDATA=1 
-RPM=../redhat/rpm 
-RPMBUILD=rpmbuild 
-SNAPSHOT=0 
-SOURCES=../redhat/rpm/SOURCES 
-SPECBUILD=0.rc5.6.test 
-SPECCHANGELOG=kernel.changelog-9.99 
-SPECFILE=kernel.spec 
-SPECGEMINI=0 
-SPECINCLUDE_FEDORA_FILES=1 
-SPECINCLUDE_RHEL_FILES=1 
-SPECINCLUDE_RT_FILES=1 
-SPECKABIVERSION=5.16.0 
-SPECKEXTRAVERSION=-rc5 
-SPECKPATCHLEVEL=16 
-SPECKSUBLEVEL=0 
-SPECKVERSION=5 
-SPECPACKAGE_NAME=kernel 
-SPECRELEASED_KERNEL=0 
-SPECRPATCHLEVEL=1 
-SPECRPMVERSION=5.16.0 
-SPECRVERSION=0 
-SPECSELFTESTS_MUST_BUILD=0 
-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 
-TESTPATCH=../redhat/linux-kernel-test.patch 
-TOPDIR=.. 
-UPSTREAMBUILD=0.rc5. 
-UPSTREAMBUILD_GIT_ONLY= 
-UPSTREAM_BRANCH=master 
-UPSTREAM_TARBALL_NAME=5.16-rc5 
-VERSION_ON_UPSTREAM=1 
-YSTREAM_FLAG=yes 
-ZSTREAM_FLAG=no 
-_OUTPUT=.. 
-_TAG=v5.16-rc5 
+.DEFAULT_GOAL=dist-cross-download
+.SHELLSTATUS=0
+ADD_COMMITID_TO_VERSION=
+ARCHCONFIG=X86_64
+ARCH_LIST=aarch64 ppc64le s390x x86_64
+BASEVERSION=5.16.0-0.rc5.6.test
+BUILD=6
+BUILD_FLAGS=
+BUILD_PROFILE=
+BUILD_PROFILE_USERDEF=
+BUILD_TARGET=rawhide
+BUILD_TARGET_USERDEF=
+BUMP_RELEASE=yes
+CHANGELOG_EXT=changelog-9.99
+CHANGELOG_PREV_EXT=changelog-9.98
+CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu
+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
+DISTRO_USERDEF=fedora
+DIST_BRANCH="os-build"
+DIST_USERDEF=.el7
+EARLY_YBUILD=
+EARLY_YRELEASE=
+ENABLE_WERROR=
+FLAVOR=
+GIT=git
+GITID=2585cf9dfaaddf00b069673f27bb3f8530e2039c
+GNUMAKEFLAGS=
+HEAD=2585cf9dfaad
+INCLUDE_FEDORA_FILES=1
+INCLUDE_RHEL_FILES=1
+INCLUDE_RT_FILES=1
+KABIDW=../redhat/kabi-dwarf
+KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0.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.tar.bz2
+LANG=C
+LOCVERFILE=../localversion
+MACH=x86_64
+MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.cross
+MAKEFLAGS= -- HEAD=2585cf9dfaad DISTRO=fedora DIST=.el7 RHSELFTESTDATA=1
+MARKER=v5.16-rc5
+MERGE_BASE=2585cf9dfaaddf00b069673f27bb3f8530e2039c
+NO_CONFIGCHECKS=
+PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit";
+PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
+PROCESS_CONFIGS_OPTS=-n -w -c
+REDHAT=../redhat
+RELEASED_KERNEL=0
+RELEASETAG=kernel-5.16.0-0.rc5.6.test
+RHDISTGIT_BRANCH=rawhide
+RHDISTGIT_CACHE=
+RHDISTGIT_TMP=/tmp
+RHEL_MAJOR=9
+RHEL_MINOR=99
+RHEL_REBASE_NUM=1
+RHGITCOMMIT=2585cf9dfaad
+RHJOBS=1
+RHPKG_BIN=fedpkg
+RHSELFTESTDATA=1
+RPM=../redhat/rpm
+RPMBUILD=rpmbuild
+SNAPSHOT=0
+SOURCES=../redhat/rpm/SOURCES
+SPECBUILD=0.rc5.6.test
+SPECCHANGELOG=kernel.changelog-9.99
+SPECFILE=kernel.spec
+SPECGEMINI=0
+SPECINCLUDE_FEDORA_FILES=1
+SPECINCLUDE_RHEL_FILES=1
+SPECINCLUDE_RT_FILES=1
+SPECKABIVERSION=5.16.0
+SPECKEXTRAVERSION=-rc5
+SPECKPATCHLEVEL=16
+SPECKSUBLEVEL=0
+SPECKVERSION=5
+SPECPACKAGE_NAME=kernel
+SPECRELEASED_KERNEL=0
+SPECRPATCHLEVEL=1
+SPECRPMVERSION=5.16.0
+SPECRVERSION=0
+SPECSELFTESTS_MUST_BUILD=0
+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
+TESTPATCH=../redhat/linux-kernel-test.patch
+TOPDIR=..
+UPSTREAMBUILD=0.rc5.
+UPSTREAMBUILD_GIT_ONLY=
+UPSTREAM_BRANCH=master
+UPSTREAM_TARBALL_NAME=5.16-rc5
+VERSION_ON_UPSTREAM=1
+YSTREAM_FLAG=yes
+ZSTREAM_FLAG=no
+_OUTPUT=..
+_TAG=v5.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
@@ -1,106 +1,106 @@
-.DEFAULT_GOAL=dist-cross-download 
-.SHELLSTATUS=0 
-ADD_COMMITID_TO_VERSION= 
-ARCHCONFIG=X86_64 
-ARCH_LIST=aarch64 ppc64le s390x x86_64 
-BASEVERSION=5.16.0-0.rc5.6.test 
-BUILD=6 
-BUILD_FLAGS= 
-BUILD_PROFILE= 
-BUILD_PROFILE_USERDEF= 
-BUILD_TARGET=rawhide 
-BUILD_TARGET_USERDEF= 
-BUMP_RELEASE=yes 
-CHANGELOG_EXT=changelog-9.99 
-CHANGELOG_PREV_EXT=changelog-9.98 
-CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu 
-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 
-DISTRELEASETAG=kernel-5.16.0-0.rc5.6.test 
-DISTRO=fedora 
-DISTRO_USERDEF=fedora 
-DIST_BRANCH="os-build" 
-DIST_USERDEF=.fc25 
-EARLY_YBUILD= 
-EARLY_YRELEASE= 
-ENABLE_WERROR= 
-FLAVOR= 
-GIT=git 
-GITID=2585cf9dfaaddf00b069673f27bb3f8530e2039c 
-GNUMAKEFLAGS= 
-HEAD=2585cf9dfaad 
-INCLUDE_FEDORA_FILES=1 
-INCLUDE_RHEL_FILES=1 
-INCLUDE_RT_FILES=1 
-KABIDW=../redhat/kabi-dwarf 
-KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0.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.tar.bz2 
-LANG=C 
-LOCVERFILE=../localversion 
-MACH=x86_64 
-MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.cross 
-MAKEFLAGS= -- HEAD=2585cf9dfaad DISTRO=fedora DIST=.fc25 RHSELFTESTDATA=1 
-MARKER=v5.16-rc5 
-MERGE_BASE=2585cf9dfaaddf00b069673f27bb3f8530e2039c 
-NO_CONFIGCHECKS= 
-PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"; 
-PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
-PROCESS_CONFIGS_OPTS=-n -w -c 
-REDHAT=../redhat 
-RELEASED_KERNEL=0 
-RELEASETAG=kernel-5.16.0-0.rc5.6.test 
-RHDISTGIT_BRANCH=rawhide 
-RHDISTGIT_CACHE= 
-RHDISTGIT_TMP=/tmp 
-RHEL_MAJOR=9 
-RHEL_MINOR=99 
-RHEL_REBASE_NUM=1 
-RHGITCOMMIT=2585cf9dfaad 
-RHJOBS=1 
-RHPKG_BIN=fedpkg 
-RHSELFTESTDATA=1 
-RPM=../redhat/rpm 
-RPMBUILD=rpmbuild 
-SNAPSHOT=0 
-SOURCES=../redhat/rpm/SOURCES 
-SPECBUILD=0.rc5.6.test 
-SPECCHANGELOG=kernel.changelog-9.99 
-SPECFILE=kernel.spec 
-SPECGEMINI=0 
-SPECINCLUDE_FEDORA_FILES=1 
-SPECINCLUDE_RHEL_FILES=1 
-SPECINCLUDE_RT_FILES=1 
-SPECKABIVERSION=5.16.0 
-SPECKEXTRAVERSION=-rc5 
-SPECKPATCHLEVEL=16 
-SPECKSUBLEVEL=0 
-SPECKVERSION=5 
-SPECPACKAGE_NAME=kernel 
-SPECRELEASED_KERNEL=0 
-SPECRPATCHLEVEL=1 
-SPECRPMVERSION=5.16.0 
-SPECRVERSION=0 
-SPECSELFTESTS_MUST_BUILD=0 
-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 
-TESTPATCH=../redhat/linux-kernel-test.patch 
-TOPDIR=.. 
-UPSTREAMBUILD=0.rc5. 
-UPSTREAMBUILD_GIT_ONLY= 
-UPSTREAM_BRANCH=master 
-UPSTREAM_TARBALL_NAME=5.16-rc5 
-VERSION_ON_UPSTREAM=1 
-YSTREAM_FLAG=yes 
-ZSTREAM_FLAG=no 
-_OUTPUT=.. 
-_TAG=v5.16-rc5 
+.DEFAULT_GOAL=dist-cross-download
+.SHELLSTATUS=0
+ADD_COMMITID_TO_VERSION=
+ARCHCONFIG=X86_64
+ARCH_LIST=aarch64 ppc64le s390x x86_64
+BASEVERSION=5.16.0-0.rc5.6.test
+BUILD=6
+BUILD_FLAGS=
+BUILD_PROFILE=
+BUILD_PROFILE_USERDEF=
+BUILD_TARGET=rawhide
+BUILD_TARGET_USERDEF=
+BUMP_RELEASE=yes
+CHANGELOG_EXT=changelog-9.99
+CHANGELOG_PREV_EXT=changelog-9.98
+CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu
+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
+DISTRELEASETAG=kernel-5.16.0-0.rc5.6.test
+DISTRO=fedora
+DISTRO_USERDEF=fedora
+DIST_BRANCH="os-build"
+DIST_USERDEF=.fc25
+EARLY_YBUILD=
+EARLY_YRELEASE=
+ENABLE_WERROR=
+FLAVOR=
+GIT=git
+GITID=2585cf9dfaaddf00b069673f27bb3f8530e2039c
+GNUMAKEFLAGS=
+HEAD=2585cf9dfaad
+INCLUDE_FEDORA_FILES=1
+INCLUDE_RHEL_FILES=1
+INCLUDE_RT_FILES=1
+KABIDW=../redhat/kabi-dwarf
+KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0.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.tar.bz2
+LANG=C
+LOCVERFILE=../localversion
+MACH=x86_64
+MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.cross
+MAKEFLAGS= -- HEAD=2585cf9dfaad DISTRO=fedora DIST=.fc25 RHSELFTESTDATA=1
+MARKER=v5.16-rc5
+MERGE_BASE=2585cf9dfaaddf00b069673f27bb3f8530e2039c
+NO_CONFIGCHECKS=
+PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit";
+PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
+PROCESS_CONFIGS_OPTS=-n -w -c
+REDHAT=../redhat
+RELEASED_KERNEL=0
+RELEASETAG=kernel-5.16.0-0.rc5.6.test
+RHDISTGIT_BRANCH=rawhide
+RHDISTGIT_CACHE=
+RHDISTGIT_TMP=/tmp
+RHEL_MAJOR=9
+RHEL_MINOR=99
+RHEL_REBASE_NUM=1
+RHGITCOMMIT=2585cf9dfaad
+RHJOBS=1
+RHPKG_BIN=fedpkg
+RHSELFTESTDATA=1
+RPM=../redhat/rpm
+RPMBUILD=rpmbuild
+SNAPSHOT=0
+SOURCES=../redhat/rpm/SOURCES
+SPECBUILD=0.rc5.6.test
+SPECCHANGELOG=kernel.changelog-9.99
+SPECFILE=kernel.spec
+SPECGEMINI=0
+SPECINCLUDE_FEDORA_FILES=1
+SPECINCLUDE_RHEL_FILES=1
+SPECINCLUDE_RT_FILES=1
+SPECKABIVERSION=5.16.0
+SPECKEXTRAVERSION=-rc5
+SPECKPATCHLEVEL=16
+SPECKSUBLEVEL=0
+SPECKVERSION=5
+SPECPACKAGE_NAME=kernel
+SPECRELEASED_KERNEL=0
+SPECRPATCHLEVEL=1
+SPECRPMVERSION=5.16.0
+SPECRVERSION=0
+SPECSELFTESTS_MUST_BUILD=0
+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
+TESTPATCH=../redhat/linux-kernel-test.patch
+TOPDIR=..
+UPSTREAMBUILD=0.rc5.
+UPSTREAMBUILD_GIT_ONLY=
+UPSTREAM_BRANCH=master
+UPSTREAM_TARBALL_NAME=5.16-rc5
+VERSION_ON_UPSTREAM=1
+YSTREAM_FLAG=yes
+ZSTREAM_FLAG=no
+_OUTPUT=..
+_TAG=v5.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
@@ -1,106 +1,106 @@
-.DEFAULT_GOAL=dist-cross-download 
-.SHELLSTATUS=0 
-ADD_COMMITID_TO_VERSION= 
-ARCHCONFIG=X86_64 
-ARCH_LIST=aarch64 ppc64le s390x x86_64 
-BASEVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test 
-BUILD=6 
-BUILD_FLAGS= 
-BUILD_PROFILE= 
-BUILD_PROFILE_USERDEF= 
-BUILD_TARGET=rawhide 
-BUILD_TARGET_USERDEF= 
-BUMP_RELEASE=yes 
-CHANGELOG_EXT=changelog-9.99 
-CHANGELOG_PREV_EXT=changelog-9.98 
-CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu 
-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 
-DISTRELEASETAG=kernel-5.17.0-0.rc0.78e36f3b0dae.6.test 
-DISTRO=fedora 
-DISTRO_USERDEF=fedora 
-DIST_BRANCH="os-build" 
-DIST_USERDEF=.el7 
-EARLY_YBUILD= 
-EARLY_YRELEASE= 
-ENABLE_WERROR= 
-FLAVOR= 
-GIT=git 
-GITID=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1 
-GNUMAKEFLAGS= 
-HEAD=78e36f3b0dae 
-INCLUDE_FEDORA_FILES=1 
-INCLUDE_RHEL_FILES=1 
-INCLUDE_RT_FILES=1 
-KABIDW=../redhat/kabi-dwarf 
-KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0.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.tar.bz2 
-LANG=C 
-LOCVERFILE=../localversion 
-MACH=x86_64 
-MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.cross 
-MAKEFLAGS= -- HEAD=78e36f3b0dae DISTRO=fedora DIST=.el7 RHSELFTESTDATA=1 
-MARKER=78e36f3b0dae 
-MERGE_BASE=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1 
-NO_CONFIGCHECKS= 
-PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"; 
-PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
-PROCESS_CONFIGS_OPTS=-n -w -c 
-REDHAT=../redhat 
-RELEASED_KERNEL=0 
-RELEASETAG=kernel-5.17.0-0.rc0.78e36f3b0dae.6.test 
-RHDISTGIT_BRANCH=rawhide 
-RHDISTGIT_CACHE= 
-RHDISTGIT_TMP=/tmp 
-RHEL_MAJOR=9 
-RHEL_MINOR=99 
-RHEL_REBASE_NUM=1 
-RHGITCOMMIT=78e36f3b0dae 
-RHJOBS=1 
-RHPKG_BIN=fedpkg 
-RHSELFTESTDATA=1 
-RPM=../redhat/rpm 
-RPMBUILD=rpmbuild 
-SNAPSHOT=1 
-SOURCES=../redhat/rpm/SOURCES 
-SPECBUILD=0.rc0.78e36f3b0dae.6.test 
-SPECCHANGELOG=kernel.changelog-9.99 
-SPECFILE=kernel.spec 
-SPECGEMINI=0 
-SPECINCLUDE_FEDORA_FILES=1 
-SPECINCLUDE_RHEL_FILES=1 
-SPECINCLUDE_RT_FILES=1 
-SPECKABIVERSION=5.17.0 
-SPECKEXTRAVERSION= 
-SPECKPATCHLEVEL=17 
-SPECKSUBLEVEL=0 
-SPECKVERSION=5 
-SPECPACKAGE_NAME=kernel 
-SPECRELEASED_KERNEL=0 
-SPECRPATCHLEVEL=1 
-SPECRPMVERSION=5.17.0 
-SPECRVERSION=0 
-SPECSELFTESTS_MUST_BUILD=0 
-SPECTARFILE_RELEASE=5.16-11523-g78e36f3b0dae 
-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.16-11523-g78e36f3b0dae.tar.xz 
-TARFILE=linux-5.16-11523-g78e36f3b0dae.tar.xz 
-TESTPATCH=../redhat/linux-kernel-test.patch 
-TOPDIR=.. 
-UPSTREAMBUILD=0.rc0.78e36f3b0dae. 
-UPSTREAMBUILD_GIT_ONLY=1 
-UPSTREAM_BRANCH=master 
-UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae 
-VERSION_ON_UPSTREAM=1 
-YSTREAM_FLAG=yes 
-ZSTREAM_FLAG=no 
-_OUTPUT=.. 
-_TAG=v5.16-11523-g78e36f3b0dae 
+.DEFAULT_GOAL=dist-cross-download
+.SHELLSTATUS=0
+ADD_COMMITID_TO_VERSION=
+ARCHCONFIG=X86_64
+ARCH_LIST=aarch64 ppc64le s390x x86_64
+BASEVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test
+BUILD=6
+BUILD_FLAGS=
+BUILD_PROFILE=
+BUILD_PROFILE_USERDEF=
+BUILD_TARGET=rawhide
+BUILD_TARGET_USERDEF=
+BUMP_RELEASE=yes
+CHANGELOG_EXT=changelog-9.99
+CHANGELOG_PREV_EXT=changelog-9.98
+CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu
+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
+DISTRELEASETAG=kernel-5.17.0-0.rc0.78e36f3b0dae.6.test
+DISTRO=fedora
+DISTRO_USERDEF=fedora
+DIST_BRANCH="os-build"
+DIST_USERDEF=.el7
+EARLY_YBUILD=
+EARLY_YRELEASE=
+ENABLE_WERROR=
+FLAVOR=
+GIT=git
+GITID=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1
+GNUMAKEFLAGS=
+HEAD=78e36f3b0dae
+INCLUDE_FEDORA_FILES=1
+INCLUDE_RHEL_FILES=1
+INCLUDE_RT_FILES=1
+KABIDW=../redhat/kabi-dwarf
+KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0.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.tar.bz2
+LANG=C
+LOCVERFILE=../localversion
+MACH=x86_64
+MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.cross
+MAKEFLAGS= -- HEAD=78e36f3b0dae DISTRO=fedora DIST=.el7 RHSELFTESTDATA=1
+MARKER=78e36f3b0dae
+MERGE_BASE=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1
+NO_CONFIGCHECKS=
+PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit";
+PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
+PROCESS_CONFIGS_OPTS=-n -w -c
+REDHAT=../redhat
+RELEASED_KERNEL=0
+RELEASETAG=kernel-5.17.0-0.rc0.78e36f3b0dae.6.test
+RHDISTGIT_BRANCH=rawhide
+RHDISTGIT_CACHE=
+RHDISTGIT_TMP=/tmp
+RHEL_MAJOR=9
+RHEL_MINOR=99
+RHEL_REBASE_NUM=1
+RHGITCOMMIT=78e36f3b0dae
+RHJOBS=1
+RHPKG_BIN=fedpkg
+RHSELFTESTDATA=1
+RPM=../redhat/rpm
+RPMBUILD=rpmbuild
+SNAPSHOT=1
+SOURCES=../redhat/rpm/SOURCES
+SPECBUILD=0.rc0.78e36f3b0dae.6.test
+SPECCHANGELOG=kernel.changelog-9.99
+SPECFILE=kernel.spec
+SPECGEMINI=0
+SPECINCLUDE_FEDORA_FILES=1
+SPECINCLUDE_RHEL_FILES=1
+SPECINCLUDE_RT_FILES=1
+SPECKABIVERSION=5.17.0
+SPECKEXTRAVERSION=
+SPECKPATCHLEVEL=17
+SPECKSUBLEVEL=0
+SPECKVERSION=5
+SPECPACKAGE_NAME=kernel
+SPECRELEASED_KERNEL=0
+SPECRPATCHLEVEL=1
+SPECRPMVERSION=5.17.0
+SPECRVERSION=0
+SPECSELFTESTS_MUST_BUILD=0
+SPECTARFILE_RELEASE=5.16-11523-g78e36f3b0dae
+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.16-11523-g78e36f3b0dae.tar.xz
+TARFILE=linux-5.16-11523-g78e36f3b0dae.tar.xz
+TESTPATCH=../redhat/linux-kernel-test.patch
+TOPDIR=..
+UPSTREAMBUILD=0.rc0.78e36f3b0dae.
+UPSTREAMBUILD_GIT_ONLY=1
+UPSTREAM_BRANCH=master
+UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae
+VERSION_ON_UPSTREAM=1
+YSTREAM_FLAG=yes
+ZSTREAM_FLAG=no
+_OUTPUT=..
+_TAG=v5.16-11523-g78e36f3b0dae
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
@@ -1,106 +1,106 @@
-.DEFAULT_GOAL=dist-cross-download 
-.SHELLSTATUS=0 
-ADD_COMMITID_TO_VERSION= 
-ARCHCONFIG=X86_64 
-ARCH_LIST=aarch64 ppc64le s390x x86_64 
-BASEVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test 
-BUILD=6 
-BUILD_FLAGS= 
-BUILD_PROFILE= 
-BUILD_PROFILE_USERDEF= 
-BUILD_TARGET=rawhide 
-BUILD_TARGET_USERDEF= 
-BUMP_RELEASE=yes 
-CHANGELOG_EXT=changelog-9.99 
-CHANGELOG_PREV_EXT=changelog-9.98 
-CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu 
-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 
-DISTRELEASETAG=kernel-5.17.0-0.rc0.78e36f3b0dae.6.test 
-DISTRO=fedora 
-DISTRO_USERDEF=fedora 
-DIST_BRANCH="os-build" 
-DIST_USERDEF=.fc25 
-EARLY_YBUILD= 
-EARLY_YRELEASE= 
-ENABLE_WERROR= 
-FLAVOR= 
-GIT=git 
-GITID=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1 
-GNUMAKEFLAGS= 
-HEAD=78e36f3b0dae 
-INCLUDE_FEDORA_FILES=1 
-INCLUDE_RHEL_FILES=1 
-INCLUDE_RT_FILES=1 
-KABIDW=../redhat/kabi-dwarf 
-KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0.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.tar.bz2 
-LANG=C 
-LOCVERFILE=../localversion 
-MACH=x86_64 
-MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.cross 
-MAKEFLAGS= -- HEAD=78e36f3b0dae DISTRO=fedora DIST=.fc25 RHSELFTESTDATA=1 
-MARKER=78e36f3b0dae 
-MERGE_BASE=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1 
-NO_CONFIGCHECKS= 
-PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"; 
-PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
-PROCESS_CONFIGS_OPTS=-n -w -c 
-REDHAT=../redhat 
-RELEASED_KERNEL=0 
-RELEASETAG=kernel-5.17.0-0.rc0.78e36f3b0dae.6.test 
-RHDISTGIT_BRANCH=rawhide 
-RHDISTGIT_CACHE= 
-RHDISTGIT_TMP=/tmp 
-RHEL_MAJOR=9 
-RHEL_MINOR=99 
-RHEL_REBASE_NUM=1 
-RHGITCOMMIT=78e36f3b0dae 
-RHJOBS=1 
-RHPKG_BIN=fedpkg 
-RHSELFTESTDATA=1 
-RPM=../redhat/rpm 
-RPMBUILD=rpmbuild 
-SNAPSHOT=1 
-SOURCES=../redhat/rpm/SOURCES 
-SPECBUILD=0.rc0.78e36f3b0dae.6.test 
-SPECCHANGELOG=kernel.changelog-9.99 
-SPECFILE=kernel.spec 
-SPECGEMINI=0 
-SPECINCLUDE_FEDORA_FILES=1 
-SPECINCLUDE_RHEL_FILES=1 
-SPECINCLUDE_RT_FILES=1 
-SPECKABIVERSION=5.17.0 
-SPECKEXTRAVERSION= 
-SPECKPATCHLEVEL=17 
-SPECKSUBLEVEL=0 
-SPECKVERSION=5 
-SPECPACKAGE_NAME=kernel 
-SPECRELEASED_KERNEL=0 
-SPECRPATCHLEVEL=1 
-SPECRPMVERSION=5.17.0 
-SPECRVERSION=0 
-SPECSELFTESTS_MUST_BUILD=0 
-SPECTARFILE_RELEASE=5.16-11523-g78e36f3b0dae 
-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.16-11523-g78e36f3b0dae.tar.xz 
-TARFILE=linux-5.16-11523-g78e36f3b0dae.tar.xz 
-TESTPATCH=../redhat/linux-kernel-test.patch 
-TOPDIR=.. 
-UPSTREAMBUILD=0.rc0.78e36f3b0dae. 
-UPSTREAMBUILD_GIT_ONLY=1 
-UPSTREAM_BRANCH=master 
-UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae 
-VERSION_ON_UPSTREAM=1 
-YSTREAM_FLAG=yes 
-ZSTREAM_FLAG=no 
-_OUTPUT=.. 
-_TAG=v5.16-11523-g78e36f3b0dae 
+.DEFAULT_GOAL=dist-cross-download
+.SHELLSTATUS=0
+ADD_COMMITID_TO_VERSION=
+ARCHCONFIG=X86_64
+ARCH_LIST=aarch64 ppc64le s390x x86_64
+BASEVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test
+BUILD=6
+BUILD_FLAGS=
+BUILD_PROFILE=
+BUILD_PROFILE_USERDEF=
+BUILD_TARGET=rawhide
+BUILD_TARGET_USERDEF=
+BUMP_RELEASE=yes
+CHANGELOG_EXT=changelog-9.99
+CHANGELOG_PREV_EXT=changelog-9.98
+CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu
+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
+DISTRELEASETAG=kernel-5.17.0-0.rc0.78e36f3b0dae.6.test
+DISTRO=fedora
+DISTRO_USERDEF=fedora
+DIST_BRANCH="os-build"
+DIST_USERDEF=.fc25
+EARLY_YBUILD=
+EARLY_YRELEASE=
+ENABLE_WERROR=
+FLAVOR=
+GIT=git
+GITID=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1
+GNUMAKEFLAGS=
+HEAD=78e36f3b0dae
+INCLUDE_FEDORA_FILES=1
+INCLUDE_RHEL_FILES=1
+INCLUDE_RT_FILES=1
+KABIDW=../redhat/kabi-dwarf
+KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0.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.tar.bz2
+LANG=C
+LOCVERFILE=../localversion
+MACH=x86_64
+MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.cross
+MAKEFLAGS= -- HEAD=78e36f3b0dae DISTRO=fedora DIST=.fc25 RHSELFTESTDATA=1
+MARKER=78e36f3b0dae
+MERGE_BASE=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1
+NO_CONFIGCHECKS=
+PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit";
+PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
+PROCESS_CONFIGS_OPTS=-n -w -c
+REDHAT=../redhat
+RELEASED_KERNEL=0
+RELEASETAG=kernel-5.17.0-0.rc0.78e36f3b0dae.6.test
+RHDISTGIT_BRANCH=rawhide
+RHDISTGIT_CACHE=
+RHDISTGIT_TMP=/tmp
+RHEL_MAJOR=9
+RHEL_MINOR=99
+RHEL_REBASE_NUM=1
+RHGITCOMMIT=78e36f3b0dae
+RHJOBS=1
+RHPKG_BIN=fedpkg
+RHSELFTESTDATA=1
+RPM=../redhat/rpm
+RPMBUILD=rpmbuild
+SNAPSHOT=1
+SOURCES=../redhat/rpm/SOURCES
+SPECBUILD=0.rc0.78e36f3b0dae.6.test
+SPECCHANGELOG=kernel.changelog-9.99
+SPECFILE=kernel.spec
+SPECGEMINI=0
+SPECINCLUDE_FEDORA_FILES=1
+SPECINCLUDE_RHEL_FILES=1
+SPECINCLUDE_RT_FILES=1
+SPECKABIVERSION=5.17.0
+SPECKEXTRAVERSION=
+SPECKPATCHLEVEL=17
+SPECKSUBLEVEL=0
+SPECKVERSION=5
+SPECPACKAGE_NAME=kernel
+SPECRELEASED_KERNEL=0
+SPECRPATCHLEVEL=1
+SPECRPMVERSION=5.17.0
+SPECRVERSION=0
+SPECSELFTESTS_MUST_BUILD=0
+SPECTARFILE_RELEASE=5.16-11523-g78e36f3b0dae
+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.16-11523-g78e36f3b0dae.tar.xz
+TARFILE=linux-5.16-11523-g78e36f3b0dae.tar.xz
+TESTPATCH=../redhat/linux-kernel-test.patch
+TOPDIR=..
+UPSTREAMBUILD=0.rc0.78e36f3b0dae.
+UPSTREAMBUILD_GIT_ONLY=1
+UPSTREAM_BRANCH=master
+UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae
+VERSION_ON_UPSTREAM=1
+YSTREAM_FLAG=yes
+ZSTREAM_FLAG=no
+_OUTPUT=..
+_TAG=v5.16-11523-g78e36f3b0dae
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
@@ -1,106 +1,106 @@
-.DEFAULT_GOAL=dist-cross-download 
-.SHELLSTATUS=0 
-ADD_COMMITID_TO_VERSION= 
-ARCHCONFIG=X86_64 
-ARCH_LIST=aarch64 ppc64le s390x x86_64 
-BASEVERSION=5.16.0-6.test 
-BUILD=6 
-BUILD_FLAGS= 
-BUILD_PROFILE= 
-BUILD_PROFILE_USERDEF= 
-BUILD_TARGET=rawhide 
-BUILD_TARGET_USERDEF= 
-BUMP_RELEASE=yes 
-CHANGELOG_EXT=changelog-9.99 
-CHANGELOG_PREV_EXT=changelog-9.98 
-CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu 
-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 
-DISTRELEASETAG=kernel-5.16.0-6.test 
-DISTRO=fedora 
-DISTRO_USERDEF=fedora 
-DIST_BRANCH="os-build" 
-DIST_USERDEF=.el7 
-EARLY_YBUILD= 
-EARLY_YRELEASE= 
-ENABLE_WERROR= 
-FLAVOR= 
-GIT=git 
-GITID=df0cc57e057f18e44dac8e6c18aba47ab53202f9 
-GNUMAKEFLAGS= 
-HEAD=df0cc57e057f 
-INCLUDE_FEDORA_FILES=1 
-INCLUDE_RHEL_FILES=1 
-INCLUDE_RT_FILES=1 
-KABIDW=../redhat/kabi-dwarf 
-KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0.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.tar.bz2 
-LANG=C 
-LOCVERFILE=../localversion 
-MACH=x86_64 
-MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.cross 
-MAKEFLAGS= -- HEAD=df0cc57e057f DISTRO=fedora DIST=.el7 RHSELFTESTDATA=1 
-MARKER=v5.16 
-MERGE_BASE=df0cc57e057f18e44dac8e6c18aba47ab53202f9 
-NO_CONFIGCHECKS= 
-PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"; 
-PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
-PROCESS_CONFIGS_OPTS=-n -w -c 
-REDHAT=../redhat 
-RELEASED_KERNEL=0 
-RELEASETAG=kernel-5.16.0-6.test 
-RHDISTGIT_BRANCH=rawhide 
-RHDISTGIT_CACHE= 
-RHDISTGIT_TMP=/tmp 
-RHEL_MAJOR=9 
-RHEL_MINOR=99 
-RHEL_REBASE_NUM=1 
-RHGITCOMMIT=df0cc57e057f 
-RHJOBS=1 
-RHPKG_BIN=fedpkg 
-RHSELFTESTDATA=1 
-RPM=../redhat/rpm 
-RPMBUILD=rpmbuild 
-SNAPSHOT=0 
-SOURCES=../redhat/rpm/SOURCES 
-SPECBUILD=6.test 
-SPECCHANGELOG=kernel.changelog-9.99 
-SPECFILE=kernel.spec 
-SPECGEMINI=0 
-SPECINCLUDE_FEDORA_FILES=1 
-SPECINCLUDE_RHEL_FILES=1 
-SPECINCLUDE_RT_FILES=1 
-SPECKABIVERSION=5.16.0 
-SPECKEXTRAVERSION= 
-SPECKPATCHLEVEL=16 
-SPECKSUBLEVEL=0 
-SPECKVERSION=5 
-SPECPACKAGE_NAME=kernel 
-SPECRELEASED_KERNEL=0 
-SPECRPATCHLEVEL=1 
-SPECRPMVERSION=5.16.0 
-SPECRVERSION=0 
-SPECSELFTESTS_MUST_BUILD=0 
-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 
-TESTPATCH=../redhat/linux-kernel-test.patch 
-TOPDIR=.. 
-UPSTREAMBUILD= 
-UPSTREAMBUILD_GIT_ONLY= 
-UPSTREAM_BRANCH=master 
-UPSTREAM_TARBALL_NAME=5.16 
-VERSION_ON_UPSTREAM=1 
-YSTREAM_FLAG=yes 
-ZSTREAM_FLAG=no 
-_OUTPUT=.. 
-_TAG=v5.16 
+.DEFAULT_GOAL=dist-cross-download
+.SHELLSTATUS=0
+ADD_COMMITID_TO_VERSION=
+ARCHCONFIG=X86_64
+ARCH_LIST=aarch64 ppc64le s390x x86_64
+BASEVERSION=5.16.0-6.test
+BUILD=6
+BUILD_FLAGS=
+BUILD_PROFILE=
+BUILD_PROFILE_USERDEF=
+BUILD_TARGET=rawhide
+BUILD_TARGET_USERDEF=
+BUMP_RELEASE=yes
+CHANGELOG_EXT=changelog-9.99
+CHANGELOG_PREV_EXT=changelog-9.98
+CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu
+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
+DISTRELEASETAG=kernel-5.16.0-6.test
+DISTRO=fedora
+DISTRO_USERDEF=fedora
+DIST_BRANCH="os-build"
+DIST_USERDEF=.el7
+EARLY_YBUILD=
+EARLY_YRELEASE=
+ENABLE_WERROR=
+FLAVOR=
+GIT=git
+GITID=df0cc57e057f18e44dac8e6c18aba47ab53202f9
+GNUMAKEFLAGS=
+HEAD=df0cc57e057f
+INCLUDE_FEDORA_FILES=1
+INCLUDE_RHEL_FILES=1
+INCLUDE_RT_FILES=1
+KABIDW=../redhat/kabi-dwarf
+KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0.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.tar.bz2
+LANG=C
+LOCVERFILE=../localversion
+MACH=x86_64
+MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.cross
+MAKEFLAGS= -- HEAD=df0cc57e057f DISTRO=fedora DIST=.el7 RHSELFTESTDATA=1
+MARKER=v5.16
+MERGE_BASE=df0cc57e057f18e44dac8e6c18aba47ab53202f9
+NO_CONFIGCHECKS=
+PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit";
+PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
+PROCESS_CONFIGS_OPTS=-n -w -c
+REDHAT=../redhat
+RELEASED_KERNEL=0
+RELEASETAG=kernel-5.16.0-6.test
+RHDISTGIT_BRANCH=rawhide
+RHDISTGIT_CACHE=
+RHDISTGIT_TMP=/tmp
+RHEL_MAJOR=9
+RHEL_MINOR=99
+RHEL_REBASE_NUM=1
+RHGITCOMMIT=df0cc57e057f
+RHJOBS=1
+RHPKG_BIN=fedpkg
+RHSELFTESTDATA=1
+RPM=../redhat/rpm
+RPMBUILD=rpmbuild
+SNAPSHOT=0
+SOURCES=../redhat/rpm/SOURCES
+SPECBUILD=6.test
+SPECCHANGELOG=kernel.changelog-9.99
+SPECFILE=kernel.spec
+SPECGEMINI=0
+SPECINCLUDE_FEDORA_FILES=1
+SPECINCLUDE_RHEL_FILES=1
+SPECINCLUDE_RT_FILES=1
+SPECKABIVERSION=5.16.0
+SPECKEXTRAVERSION=
+SPECKPATCHLEVEL=16
+SPECKSUBLEVEL=0
+SPECKVERSION=5
+SPECPACKAGE_NAME=kernel
+SPECRELEASED_KERNEL=0
+SPECRPATCHLEVEL=1
+SPECRPMVERSION=5.16.0
+SPECRVERSION=0
+SPECSELFTESTS_MUST_BUILD=0
+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
+TESTPATCH=../redhat/linux-kernel-test.patch
+TOPDIR=..
+UPSTREAMBUILD=
+UPSTREAMBUILD_GIT_ONLY=
+UPSTREAM_BRANCH=master
+UPSTREAM_TARBALL_NAME=5.16
+VERSION_ON_UPSTREAM=1
+YSTREAM_FLAG=yes
+ZSTREAM_FLAG=no
+_OUTPUT=..
+_TAG=v5.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
@@ -1,106 +1,106 @@
-.DEFAULT_GOAL=dist-cross-download 
-.SHELLSTATUS=0 
-ADD_COMMITID_TO_VERSION= 
-ARCHCONFIG=X86_64 
-ARCH_LIST=aarch64 ppc64le s390x x86_64 
-BASEVERSION=5.16.0-6.test 
-BUILD=6 
-BUILD_FLAGS= 
-BUILD_PROFILE= 
-BUILD_PROFILE_USERDEF= 
-BUILD_TARGET=rawhide 
-BUILD_TARGET_USERDEF= 
-BUMP_RELEASE=yes 
-CHANGELOG_EXT=changelog-9.99 
-CHANGELOG_PREV_EXT=changelog-9.98 
-CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu 
-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 
-DISTRELEASETAG=kernel-5.16.0-6.test 
-DISTRO=fedora 
-DISTRO_USERDEF=fedora 
-DIST_BRANCH="os-build" 
-DIST_USERDEF=.fc25 
-EARLY_YBUILD= 
-EARLY_YRELEASE= 
-ENABLE_WERROR= 
-FLAVOR= 
-GIT=git 
-GITID=df0cc57e057f18e44dac8e6c18aba47ab53202f9 
-GNUMAKEFLAGS= 
-HEAD=df0cc57e057f 
-INCLUDE_FEDORA_FILES=1 
-INCLUDE_RHEL_FILES=1 
-INCLUDE_RT_FILES=1 
-KABIDW=../redhat/kabi-dwarf 
-KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0.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.tar.bz2 
-LANG=C 
-LOCVERFILE=../localversion 
-MACH=x86_64 
-MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.cross 
-MAKEFLAGS= -- HEAD=df0cc57e057f DISTRO=fedora DIST=.fc25 RHSELFTESTDATA=1 
-MARKER=v5.16 
-MERGE_BASE=df0cc57e057f18e44dac8e6c18aba47ab53202f9 
-NO_CONFIGCHECKS= 
-PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"; 
-PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
-PROCESS_CONFIGS_OPTS=-n -w -c 
-REDHAT=../redhat 
-RELEASED_KERNEL=0 
-RELEASETAG=kernel-5.16.0-6.test 
-RHDISTGIT_BRANCH=rawhide 
-RHDISTGIT_CACHE= 
-RHDISTGIT_TMP=/tmp 
-RHEL_MAJOR=9 
-RHEL_MINOR=99 
-RHEL_REBASE_NUM=1 
-RHGITCOMMIT=df0cc57e057f 
-RHJOBS=1 
-RHPKG_BIN=fedpkg 
-RHSELFTESTDATA=1 
-RPM=../redhat/rpm 
-RPMBUILD=rpmbuild 
-SNAPSHOT=0 
-SOURCES=../redhat/rpm/SOURCES 
-SPECBUILD=6.test 
-SPECCHANGELOG=kernel.changelog-9.99 
-SPECFILE=kernel.spec 
-SPECGEMINI=0 
-SPECINCLUDE_FEDORA_FILES=1 
-SPECINCLUDE_RHEL_FILES=1 
-SPECINCLUDE_RT_FILES=1 
-SPECKABIVERSION=5.16.0 
-SPECKEXTRAVERSION= 
-SPECKPATCHLEVEL=16 
-SPECKSUBLEVEL=0 
-SPECKVERSION=5 
-SPECPACKAGE_NAME=kernel 
-SPECRELEASED_KERNEL=0 
-SPECRPATCHLEVEL=1 
-SPECRPMVERSION=5.16.0 
-SPECRVERSION=0 
-SPECSELFTESTS_MUST_BUILD=0 
-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 
-TESTPATCH=../redhat/linux-kernel-test.patch 
-TOPDIR=.. 
-UPSTREAMBUILD= 
-UPSTREAMBUILD_GIT_ONLY= 
-UPSTREAM_BRANCH=master 
-UPSTREAM_TARBALL_NAME=5.16 
-VERSION_ON_UPSTREAM=1 
-YSTREAM_FLAG=yes 
-ZSTREAM_FLAG=no 
-_OUTPUT=.. 
-_TAG=v5.16 
+.DEFAULT_GOAL=dist-cross-download
+.SHELLSTATUS=0
+ADD_COMMITID_TO_VERSION=
+ARCHCONFIG=X86_64
+ARCH_LIST=aarch64 ppc64le s390x x86_64
+BASEVERSION=5.16.0-6.test
+BUILD=6
+BUILD_FLAGS=
+BUILD_PROFILE=
+BUILD_PROFILE_USERDEF=
+BUILD_TARGET=rawhide
+BUILD_TARGET_USERDEF=
+BUMP_RELEASE=yes
+CHANGELOG_EXT=changelog-9.99
+CHANGELOG_PREV_EXT=changelog-9.98
+CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu
+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
+DISTRELEASETAG=kernel-5.16.0-6.test
+DISTRO=fedora
+DISTRO_USERDEF=fedora
+DIST_BRANCH="os-build"
+DIST_USERDEF=.fc25
+EARLY_YBUILD=
+EARLY_YRELEASE=
+ENABLE_WERROR=
+FLAVOR=
+GIT=git
+GITID=df0cc57e057f18e44dac8e6c18aba47ab53202f9
+GNUMAKEFLAGS=
+HEAD=df0cc57e057f
+INCLUDE_FEDORA_FILES=1
+INCLUDE_RHEL_FILES=1
+INCLUDE_RT_FILES=1
+KABIDW=../redhat/kabi-dwarf
+KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0.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.tar.bz2
+LANG=C
+LOCVERFILE=../localversion
+MACH=x86_64
+MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.cross
+MAKEFLAGS= -- HEAD=df0cc57e057f DISTRO=fedora DIST=.fc25 RHSELFTESTDATA=1
+MARKER=v5.16
+MERGE_BASE=df0cc57e057f18e44dac8e6c18aba47ab53202f9
+NO_CONFIGCHECKS=
+PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit";
+PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
+PROCESS_CONFIGS_OPTS=-n -w -c
+REDHAT=../redhat
+RELEASED_KERNEL=0
+RELEASETAG=kernel-5.16.0-6.test
+RHDISTGIT_BRANCH=rawhide
+RHDISTGIT_CACHE=
+RHDISTGIT_TMP=/tmp
+RHEL_MAJOR=9
+RHEL_MINOR=99
+RHEL_REBASE_NUM=1
+RHGITCOMMIT=df0cc57e057f
+RHJOBS=1
+RHPKG_BIN=fedpkg
+RHSELFTESTDATA=1
+RPM=../redhat/rpm
+RPMBUILD=rpmbuild
+SNAPSHOT=0
+SOURCES=../redhat/rpm/SOURCES
+SPECBUILD=6.test
+SPECCHANGELOG=kernel.changelog-9.99
+SPECFILE=kernel.spec
+SPECGEMINI=0
+SPECINCLUDE_FEDORA_FILES=1
+SPECINCLUDE_RHEL_FILES=1
+SPECINCLUDE_RT_FILES=1
+SPECKABIVERSION=5.16.0
+SPECKEXTRAVERSION=
+SPECKPATCHLEVEL=16
+SPECKSUBLEVEL=0
+SPECKVERSION=5
+SPECPACKAGE_NAME=kernel
+SPECRELEASED_KERNEL=0
+SPECRPATCHLEVEL=1
+SPECRPMVERSION=5.16.0
+SPECRVERSION=0
+SPECSELFTESTS_MUST_BUILD=0
+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
+TESTPATCH=../redhat/linux-kernel-test.patch
+TOPDIR=..
+UPSTREAMBUILD=
+UPSTREAMBUILD_GIT_ONLY=
+UPSTREAM_BRANCH=master
+UPSTREAM_TARBALL_NAME=5.16
+VERSION_ON_UPSTREAM=1
+YSTREAM_FLAG=yes
+ZSTREAM_FLAG=no
+_OUTPUT=..
+_TAG=v5.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
@@ -1,106 +1,106 @@
-.DEFAULT_GOAL=dist-cross-download 
-.SHELLSTATUS=0 
-ADD_COMMITID_TO_VERSION= 
-ARCHCONFIG=X86_64 
-ARCH_LIST=aarch64 ppc64le s390x x86_64 
-BASEVERSION=5.16.0-0.rc5.fce15c45d3fb.6.test 
-BUILD=6 
-BUILD_FLAGS= 
-BUILD_PROFILE= 
-BUILD_PROFILE_USERDEF= 
-BUILD_TARGET=rawhide 
-BUILD_TARGET_USERDEF= 
-BUMP_RELEASE=yes 
-CHANGELOG_EXT=changelog-9.99 
-CHANGELOG_PREV_EXT=changelog-9.98 
-CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu 
-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 
-DISTRELEASETAG=kernel-5.16.0-0.rc5.fce15c45d3fb.6.test 
-DISTRO=fedora 
-DISTRO_USERDEF=fedora 
-DIST_BRANCH="os-build" 
-DIST_USERDEF=.el7 
-EARLY_YBUILD= 
-EARLY_YRELEASE= 
-ENABLE_WERROR= 
-FLAVOR= 
-GIT=git 
-GITID=fce15c45d3fbd9fc1feaaf3210d8e3f8b33dfd3a 
-GNUMAKEFLAGS= 
-HEAD=fce15c45d3fb 
-INCLUDE_FEDORA_FILES=1 
-INCLUDE_RHEL_FILES=1 
-INCLUDE_RT_FILES=1 
-KABIDW=../redhat/kabi-dwarf 
-KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0.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.tar.bz2 
-LANG=C 
-LOCVERFILE=../localversion 
-MACH=x86_64 
-MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.cross 
-MAKEFLAGS= -- HEAD=fce15c45d3fb DISTRO=fedora DIST=.el7 RHSELFTESTDATA=1 
-MARKER=fce15c45d3fb 
-MERGE_BASE=fce15c45d3fbd9fc1feaaf3210d8e3f8b33dfd3a 
-NO_CONFIGCHECKS= 
-PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"; 
-PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
-PROCESS_CONFIGS_OPTS=-n -w -c 
-REDHAT=../redhat 
-RELEASED_KERNEL=0 
-RELEASETAG=kernel-5.16.0-0.rc5.fce15c45d3fb.6.test 
-RHDISTGIT_BRANCH=rawhide 
-RHDISTGIT_CACHE= 
-RHDISTGIT_TMP=/tmp 
-RHEL_MAJOR=9 
-RHEL_MINOR=99 
-RHEL_REBASE_NUM=1 
-RHGITCOMMIT=fce15c45d3fb 
-RHJOBS=1 
-RHPKG_BIN=fedpkg 
-RHSELFTESTDATA=1 
-RPM=../redhat/rpm 
-RPMBUILD=rpmbuild 
-SNAPSHOT=1 
-SOURCES=../redhat/rpm/SOURCES 
-SPECBUILD=0.rc5.fce15c45d3fb.6.test 
-SPECCHANGELOG=kernel.changelog-9.99 
-SPECFILE=kernel.spec 
-SPECGEMINI=0 
-SPECINCLUDE_FEDORA_FILES=1 
-SPECINCLUDE_RHEL_FILES=1 
-SPECINCLUDE_RT_FILES=1 
-SPECKABIVERSION=5.16.0 
-SPECKEXTRAVERSION=-rc5 
-SPECKPATCHLEVEL=16 
-SPECKSUBLEVEL=0 
-SPECKVERSION=5 
-SPECPACKAGE_NAME=kernel 
-SPECRELEASED_KERNEL=0 
-SPECRPATCHLEVEL=1 
-SPECRPMVERSION=5.16.0 
-SPECRVERSION=0 
-SPECSELFTESTS_MUST_BUILD=0 
-SPECTARFILE_RELEASE=5.16-rc5-1-gfce15c45d3fb 
-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-rc5-1-gfce15c45d3fb.tar.xz 
-TARFILE=linux-5.16-rc5-1-gfce15c45d3fb.tar.xz 
-TESTPATCH=../redhat/linux-kernel-test.patch 
-TOPDIR=.. 
-UPSTREAMBUILD=0.rc5.fce15c45d3fb. 
-UPSTREAMBUILD_GIT_ONLY=1 
-UPSTREAM_BRANCH=master 
-UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fb 
-VERSION_ON_UPSTREAM=1 
-YSTREAM_FLAG=yes 
-ZSTREAM_FLAG=no 
-_OUTPUT=.. 
-_TAG=v5.16-rc5-1-gfce15c45d3fb 
+.DEFAULT_GOAL=dist-cross-download
+.SHELLSTATUS=0
+ADD_COMMITID_TO_VERSION=
+ARCHCONFIG=X86_64
+ARCH_LIST=aarch64 ppc64le s390x x86_64
+BASEVERSION=5.16.0-0.rc5.fce15c45d3fb.6.test
+BUILD=6
+BUILD_FLAGS=
+BUILD_PROFILE=
+BUILD_PROFILE_USERDEF=
+BUILD_TARGET=rawhide
+BUILD_TARGET_USERDEF=
+BUMP_RELEASE=yes
+CHANGELOG_EXT=changelog-9.99
+CHANGELOG_PREV_EXT=changelog-9.98
+CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu
+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
+DISTRELEASETAG=kernel-5.16.0-0.rc5.fce15c45d3fb.6.test
+DISTRO=fedora
+DISTRO_USERDEF=fedora
+DIST_BRANCH="os-build"
+DIST_USERDEF=.el7
+EARLY_YBUILD=
+EARLY_YRELEASE=
+ENABLE_WERROR=
+FLAVOR=
+GIT=git
+GITID=fce15c45d3fbd9fc1feaaf3210d8e3f8b33dfd3a
+GNUMAKEFLAGS=
+HEAD=fce15c45d3fb
+INCLUDE_FEDORA_FILES=1
+INCLUDE_RHEL_FILES=1
+INCLUDE_RT_FILES=1
+KABIDW=../redhat/kabi-dwarf
+KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0.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.tar.bz2
+LANG=C
+LOCVERFILE=../localversion
+MACH=x86_64
+MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.cross
+MAKEFLAGS= -- HEAD=fce15c45d3fb DISTRO=fedora DIST=.el7 RHSELFTESTDATA=1
+MARKER=fce15c45d3fb
+MERGE_BASE=fce15c45d3fbd9fc1feaaf3210d8e3f8b33dfd3a
+NO_CONFIGCHECKS=
+PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit";
+PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
+PROCESS_CONFIGS_OPTS=-n -w -c
+REDHAT=../redhat
+RELEASED_KERNEL=0
+RELEASETAG=kernel-5.16.0-0.rc5.fce15c45d3fb.6.test
+RHDISTGIT_BRANCH=rawhide
+RHDISTGIT_CACHE=
+RHDISTGIT_TMP=/tmp
+RHEL_MAJOR=9
+RHEL_MINOR=99
+RHEL_REBASE_NUM=1
+RHGITCOMMIT=fce15c45d3fb
+RHJOBS=1
+RHPKG_BIN=fedpkg
+RHSELFTESTDATA=1
+RPM=../redhat/rpm
+RPMBUILD=rpmbuild
+SNAPSHOT=1
+SOURCES=../redhat/rpm/SOURCES
+SPECBUILD=0.rc5.fce15c45d3fb.6.test
+SPECCHANGELOG=kernel.changelog-9.99
+SPECFILE=kernel.spec
+SPECGEMINI=0
+SPECINCLUDE_FEDORA_FILES=1
+SPECINCLUDE_RHEL_FILES=1
+SPECINCLUDE_RT_FILES=1
+SPECKABIVERSION=5.16.0
+SPECKEXTRAVERSION=-rc5
+SPECKPATCHLEVEL=16
+SPECKSUBLEVEL=0
+SPECKVERSION=5
+SPECPACKAGE_NAME=kernel
+SPECRELEASED_KERNEL=0
+SPECRPATCHLEVEL=1
+SPECRPMVERSION=5.16.0
+SPECRVERSION=0
+SPECSELFTESTS_MUST_BUILD=0
+SPECTARFILE_RELEASE=5.16-rc5-1-gfce15c45d3fb
+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-rc5-1-gfce15c45d3fb.tar.xz
+TARFILE=linux-5.16-rc5-1-gfce15c45d3fb.tar.xz
+TESTPATCH=../redhat/linux-kernel-test.patch
+TOPDIR=..
+UPSTREAMBUILD=0.rc5.fce15c45d3fb.
+UPSTREAMBUILD_GIT_ONLY=1
+UPSTREAM_BRANCH=master
+UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fb
+VERSION_ON_UPSTREAM=1
+YSTREAM_FLAG=yes
+ZSTREAM_FLAG=no
+_OUTPUT=..
+_TAG=v5.16-rc5-1-gfce15c45d3fb
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
@@ -1,106 +1,106 @@
-.DEFAULT_GOAL=dist-cross-download 
-.SHELLSTATUS=0 
-ADD_COMMITID_TO_VERSION= 
-ARCHCONFIG=X86_64 
-ARCH_LIST=aarch64 ppc64le s390x x86_64 
-BASEVERSION=5.16.0-0.rc5.fce15c45d3fb.6.test 
-BUILD=6 
-BUILD_FLAGS= 
-BUILD_PROFILE= 
-BUILD_PROFILE_USERDEF= 
-BUILD_TARGET=rawhide 
-BUILD_TARGET_USERDEF= 
-BUMP_RELEASE=yes 
-CHANGELOG_EXT=changelog-9.99 
-CHANGELOG_PREV_EXT=changelog-9.98 
-CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu 
-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 
-DISTRELEASETAG=kernel-5.16.0-0.rc5.fce15c45d3fb.6.test 
-DISTRO=fedora 
-DISTRO_USERDEF=fedora 
-DIST_BRANCH="os-build" 
-DIST_USERDEF=.fc25 
-EARLY_YBUILD= 
-EARLY_YRELEASE= 
-ENABLE_WERROR= 
-FLAVOR= 
-GIT=git 
-GITID=fce15c45d3fbd9fc1feaaf3210d8e3f8b33dfd3a 
-GNUMAKEFLAGS= 
-HEAD=fce15c45d3fb 
-INCLUDE_FEDORA_FILES=1 
-INCLUDE_RHEL_FILES=1 
-INCLUDE_RT_FILES=1 
-KABIDW=../redhat/kabi-dwarf 
-KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0.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.tar.bz2 
-LANG=C 
-LOCVERFILE=../localversion 
-MACH=x86_64 
-MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.cross 
-MAKEFLAGS= -- HEAD=fce15c45d3fb DISTRO=fedora DIST=.fc25 RHSELFTESTDATA=1 
-MARKER=fce15c45d3fb 
-MERGE_BASE=fce15c45d3fbd9fc1feaaf3210d8e3f8b33dfd3a 
-NO_CONFIGCHECKS= 
-PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"; 
-PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
-PROCESS_CONFIGS_OPTS=-n -w -c 
-REDHAT=../redhat 
-RELEASED_KERNEL=0 
-RELEASETAG=kernel-5.16.0-0.rc5.fce15c45d3fb.6.test 
-RHDISTGIT_BRANCH=rawhide 
-RHDISTGIT_CACHE= 
-RHDISTGIT_TMP=/tmp 
-RHEL_MAJOR=9 
-RHEL_MINOR=99 
-RHEL_REBASE_NUM=1 
-RHGITCOMMIT=fce15c45d3fb 
-RHJOBS=1 
-RHPKG_BIN=fedpkg 
-RHSELFTESTDATA=1 
-RPM=../redhat/rpm 
-RPMBUILD=rpmbuild 
-SNAPSHOT=1 
-SOURCES=../redhat/rpm/SOURCES 
-SPECBUILD=0.rc5.fce15c45d3fb.6.test 
-SPECCHANGELOG=kernel.changelog-9.99 
-SPECFILE=kernel.spec 
-SPECGEMINI=0 
-SPECINCLUDE_FEDORA_FILES=1 
-SPECINCLUDE_RHEL_FILES=1 
-SPECINCLUDE_RT_FILES=1 
-SPECKABIVERSION=5.16.0 
-SPECKEXTRAVERSION=-rc5 
-SPECKPATCHLEVEL=16 
-SPECKSUBLEVEL=0 
-SPECKVERSION=5 
-SPECPACKAGE_NAME=kernel 
-SPECRELEASED_KERNEL=0 
-SPECRPATCHLEVEL=1 
-SPECRPMVERSION=5.16.0 
-SPECRVERSION=0 
-SPECSELFTESTS_MUST_BUILD=0 
-SPECTARFILE_RELEASE=5.16-rc5-1-gfce15c45d3fb 
-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-rc5-1-gfce15c45d3fb.tar.xz 
-TARFILE=linux-5.16-rc5-1-gfce15c45d3fb.tar.xz 
-TESTPATCH=../redhat/linux-kernel-test.patch 
-TOPDIR=.. 
-UPSTREAMBUILD=0.rc5.fce15c45d3fb. 
-UPSTREAMBUILD_GIT_ONLY=1 
-UPSTREAM_BRANCH=master 
-UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fb 
-VERSION_ON_UPSTREAM=1 
-YSTREAM_FLAG=yes 
-ZSTREAM_FLAG=no 
-_OUTPUT=.. 
-_TAG=v5.16-rc5-1-gfce15c45d3fb 
+.DEFAULT_GOAL=dist-cross-download
+.SHELLSTATUS=0
+ADD_COMMITID_TO_VERSION=
+ARCHCONFIG=X86_64
+ARCH_LIST=aarch64 ppc64le s390x x86_64
+BASEVERSION=5.16.0-0.rc5.fce15c45d3fb.6.test
+BUILD=6
+BUILD_FLAGS=
+BUILD_PROFILE=
+BUILD_PROFILE_USERDEF=
+BUILD_TARGET=rawhide
+BUILD_TARGET_USERDEF=
+BUMP_RELEASE=yes
+CHANGELOG_EXT=changelog-9.99
+CHANGELOG_PREV_EXT=changelog-9.98
+CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu
+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
+DISTRELEASETAG=kernel-5.16.0-0.rc5.fce15c45d3fb.6.test
+DISTRO=fedora
+DISTRO_USERDEF=fedora
+DIST_BRANCH="os-build"
+DIST_USERDEF=.fc25
+EARLY_YBUILD=
+EARLY_YRELEASE=
+ENABLE_WERROR=
+FLAVOR=
+GIT=git
+GITID=fce15c45d3fbd9fc1feaaf3210d8e3f8b33dfd3a
+GNUMAKEFLAGS=
+HEAD=fce15c45d3fb
+INCLUDE_FEDORA_FILES=1
+INCLUDE_RHEL_FILES=1
+INCLUDE_RT_FILES=1
+KABIDW=../redhat/kabi-dwarf
+KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0.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.tar.bz2
+LANG=C
+LOCVERFILE=../localversion
+MACH=x86_64
+MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.cross
+MAKEFLAGS= -- HEAD=fce15c45d3fb DISTRO=fedora DIST=.fc25 RHSELFTESTDATA=1
+MARKER=fce15c45d3fb
+MERGE_BASE=fce15c45d3fbd9fc1feaaf3210d8e3f8b33dfd3a
+NO_CONFIGCHECKS=
+PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit";
+PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
+PROCESS_CONFIGS_OPTS=-n -w -c
+REDHAT=../redhat
+RELEASED_KERNEL=0
+RELEASETAG=kernel-5.16.0-0.rc5.fce15c45d3fb.6.test
+RHDISTGIT_BRANCH=rawhide
+RHDISTGIT_CACHE=
+RHDISTGIT_TMP=/tmp
+RHEL_MAJOR=9
+RHEL_MINOR=99
+RHEL_REBASE_NUM=1
+RHGITCOMMIT=fce15c45d3fb
+RHJOBS=1
+RHPKG_BIN=fedpkg
+RHSELFTESTDATA=1
+RPM=../redhat/rpm
+RPMBUILD=rpmbuild
+SNAPSHOT=1
+SOURCES=../redhat/rpm/SOURCES
+SPECBUILD=0.rc5.fce15c45d3fb.6.test
+SPECCHANGELOG=kernel.changelog-9.99
+SPECFILE=kernel.spec
+SPECGEMINI=0
+SPECINCLUDE_FEDORA_FILES=1
+SPECINCLUDE_RHEL_FILES=1
+SPECINCLUDE_RT_FILES=1
+SPECKABIVERSION=5.16.0
+SPECKEXTRAVERSION=-rc5
+SPECKPATCHLEVEL=16
+SPECKSUBLEVEL=0
+SPECKVERSION=5
+SPECPACKAGE_NAME=kernel
+SPECRELEASED_KERNEL=0
+SPECRPATCHLEVEL=1
+SPECRPMVERSION=5.16.0
+SPECRVERSION=0
+SPECSELFTESTS_MUST_BUILD=0
+SPECTARFILE_RELEASE=5.16-rc5-1-gfce15c45d3fb
+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-rc5-1-gfce15c45d3fb.tar.xz
+TARFILE=linux-5.16-rc5-1-gfce15c45d3fb.tar.xz
+TESTPATCH=../redhat/linux-kernel-test.patch
+TOPDIR=..
+UPSTREAMBUILD=0.rc5.fce15c45d3fb.
+UPSTREAMBUILD_GIT_ONLY=1
+UPSTREAM_BRANCH=master
+UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fb
+VERSION_ON_UPSTREAM=1
+YSTREAM_FLAG=yes
+ZSTREAM_FLAG=no
+_OUTPUT=..
+_TAG=v5.16-rc5-1-gfce15c45d3fb
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
@@ -1,106 +1,106 @@
-.DEFAULT_GOAL=dist-cross-download 
-.SHELLSTATUS=0 
-ADD_COMMITID_TO_VERSION= 
-ARCHCONFIG=X86_64 
-ARCH_LIST=aarch64 ppc64le s390x x86_64 
-BASEVERSION=5.16.0-0.rc5.6.test 
-BUILD=6 
-BUILD_FLAGS= 
-BUILD_PROFILE= 
-BUILD_PROFILE_USERDEF= 
-BUILD_TARGET=rhel-9-newest-test-pesign 
-BUILD_TARGET_USERDEF= 
-BUMP_RELEASE=yes 
-CHANGELOG_EXT=changelog-9.99 
-CHANGELOG_PREV_EXT=changelog-9.98 
-CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu 
-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=rhel 
-DISTRO_USERDEF=rhel 
-DIST_BRANCH="os-build" 
-DIST_USERDEF=.el7 
-EARLY_YBUILD= 
-EARLY_YRELEASE= 
-ENABLE_WERROR= 
-FLAVOR= 
-GIT=git 
-GITID=2585cf9dfaaddf00b069673f27bb3f8530e2039c 
-GNUMAKEFLAGS= 
-HEAD=2585cf9dfaad 
-INCLUDE_FEDORA_FILES=1 
-INCLUDE_RHEL_FILES=1 
-INCLUDE_RT_FILES=1 
-KABIDW=../redhat/kabi-dwarf 
-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.el7.tar.bz2 
-LANG=C 
-LOCVERFILE=../localversion 
-MACH=x86_64 
-MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.cross 
-MAKEFLAGS= -- HEAD=2585cf9dfaad DISTRO=rhel DIST=.el7 RHSELFTESTDATA=1 
-MARKER=v5.16-rc5 
-MERGE_BASE=2585cf9dfaaddf00b069673f27bb3f8530e2039c 
-NO_CONFIGCHECKS= 
-PATCHLIST_URL=none 
-PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
-PROCESS_CONFIGS_OPTS=-n -w -c 
-REDHAT=../redhat 
-RELEASED_KERNEL=0 
-RELEASETAG=kernel-5.16.0-0.rc5.6.test 
-RHDISTGIT_BRANCH=rhel-9.99.0 
-RHDISTGIT_CACHE= 
-RHDISTGIT_TMP=/tmp 
-RHEL_MAJOR=9 
-RHEL_MINOR=99 
-RHEL_REBASE_NUM=1 
-RHGITCOMMIT=2585cf9dfaad 
-RHJOBS=1 
-RHPKG_BIN=rhpkg 
-RHSELFTESTDATA=1 
-RPM=../redhat/rpm 
-RPMBUILD=rpmbuild 
-SNAPSHOT=0 
-SOURCES=../redhat/rpm/SOURCES 
-SPECBUILD=0.rc5.6.test 
-SPECCHANGELOG=kernel.changelog-9.99 
-SPECFILE=kernel.spec 
-SPECGEMINI=0 
-SPECINCLUDE_FEDORA_FILES=1 
-SPECINCLUDE_RHEL_FILES=1 
-SPECINCLUDE_RT_FILES=1 
-SPECKABIVERSION=5.16.0-0.rc5.6.test.el7 
-SPECKEXTRAVERSION=-rc5 
-SPECKPATCHLEVEL=16 
-SPECKSUBLEVEL=0 
-SPECKVERSION=5 
-SPECPACKAGE_NAME=kernel 
-SPECRELEASED_KERNEL=0 
-SPECRPATCHLEVEL=1 
-SPECRPMVERSION=5.16.0 
-SPECRVERSION=0 
-SPECSELFTESTS_MUST_BUILD=0 
-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.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. 
-UPSTREAMBUILD_GIT_ONLY= 
-UPSTREAM_BRANCH=master 
-UPSTREAM_TARBALL_NAME=5.16-rc5 
-VERSION_ON_UPSTREAM=1 
-YSTREAM_FLAG=yes 
-ZSTREAM_FLAG=no 
-_OUTPUT=.. 
-_TAG=v5.16-rc5 
+.DEFAULT_GOAL=dist-cross-download
+.SHELLSTATUS=0
+ADD_COMMITID_TO_VERSION=
+ARCHCONFIG=X86_64
+ARCH_LIST=aarch64 ppc64le s390x x86_64
+BASEVERSION=5.16.0-0.rc5.6.test
+BUILD=6
+BUILD_FLAGS=
+BUILD_PROFILE=
+BUILD_PROFILE_USERDEF=
+BUILD_TARGET=rhel-9-newest-test-pesign
+BUILD_TARGET_USERDEF=
+BUMP_RELEASE=yes
+CHANGELOG_EXT=changelog-9.99
+CHANGELOG_PREV_EXT=changelog-9.98
+CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu
+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=rhel
+DISTRO_USERDEF=rhel
+DIST_BRANCH="os-build"
+DIST_USERDEF=.el7
+EARLY_YBUILD=
+EARLY_YRELEASE=
+ENABLE_WERROR=
+FLAVOR=
+GIT=git
+GITID=2585cf9dfaaddf00b069673f27bb3f8530e2039c
+GNUMAKEFLAGS=
+HEAD=2585cf9dfaad
+INCLUDE_FEDORA_FILES=1
+INCLUDE_RHEL_FILES=1
+INCLUDE_RT_FILES=1
+KABIDW=../redhat/kabi-dwarf
+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.el7.tar.bz2
+LANG=C
+LOCVERFILE=../localversion
+MACH=x86_64
+MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.cross
+MAKEFLAGS= -- HEAD=2585cf9dfaad DISTRO=rhel DIST=.el7 RHSELFTESTDATA=1
+MARKER=v5.16-rc5
+MERGE_BASE=2585cf9dfaaddf00b069673f27bb3f8530e2039c
+NO_CONFIGCHECKS=
+PATCHLIST_URL=none
+PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
+PROCESS_CONFIGS_OPTS=-n -w -c
+REDHAT=../redhat
+RELEASED_KERNEL=0
+RELEASETAG=kernel-5.16.0-0.rc5.6.test
+RHDISTGIT_BRANCH=rhel-9.99.0
+RHDISTGIT_CACHE=
+RHDISTGIT_TMP=/tmp
+RHEL_MAJOR=9
+RHEL_MINOR=99
+RHEL_REBASE_NUM=1
+RHGITCOMMIT=2585cf9dfaad
+RHJOBS=1
+RHPKG_BIN=rhpkg
+RHSELFTESTDATA=1
+RPM=../redhat/rpm
+RPMBUILD=rpmbuild
+SNAPSHOT=0
+SOURCES=../redhat/rpm/SOURCES
+SPECBUILD=0.rc5.6.test
+SPECCHANGELOG=kernel.changelog-9.99
+SPECFILE=kernel.spec
+SPECGEMINI=0
+SPECINCLUDE_FEDORA_FILES=1
+SPECINCLUDE_RHEL_FILES=1
+SPECINCLUDE_RT_FILES=1
+SPECKABIVERSION=5.16.0-0.rc5.6.test.el7
+SPECKEXTRAVERSION=-rc5
+SPECKPATCHLEVEL=16
+SPECKSUBLEVEL=0
+SPECKVERSION=5
+SPECPACKAGE_NAME=kernel
+SPECRELEASED_KERNEL=0
+SPECRPATCHLEVEL=1
+SPECRPMVERSION=5.16.0
+SPECRVERSION=0
+SPECSELFTESTS_MUST_BUILD=0
+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.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.
+UPSTREAMBUILD_GIT_ONLY=
+UPSTREAM_BRANCH=master
+UPSTREAM_TARBALL_NAME=5.16-rc5
+VERSION_ON_UPSTREAM=1
+YSTREAM_FLAG=yes
+ZSTREAM_FLAG=no
+_OUTPUT=..
+_TAG=v5.16-rc5
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
@@ -1,106 +1,106 @@
-.DEFAULT_GOAL=dist-cross-download 
-.SHELLSTATUS=0 
-ADD_COMMITID_TO_VERSION= 
-ARCHCONFIG=X86_64 
-ARCH_LIST=aarch64 ppc64le s390x x86_64 
-BASEVERSION=5.16.0-0.rc5.6.test 
-BUILD=6 
-BUILD_FLAGS= 
-BUILD_PROFILE= 
-BUILD_PROFILE_USERDEF= 
-BUILD_TARGET=rhel-9-newest-test-pesign 
-BUILD_TARGET_USERDEF= 
-BUMP_RELEASE=yes 
-CHANGELOG_EXT=changelog-9.99 
-CHANGELOG_PREV_EXT=changelog-9.98 
-CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu 
-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=rhel 
-DISTRO_USERDEF=rhel 
-DIST_BRANCH="os-build" 
-DIST_USERDEF=.fc25 
-EARLY_YBUILD= 
-EARLY_YRELEASE= 
-ENABLE_WERROR= 
-FLAVOR= 
-GIT=git 
-GITID=2585cf9dfaaddf00b069673f27bb3f8530e2039c 
-GNUMAKEFLAGS= 
-HEAD=2585cf9dfaad 
-INCLUDE_FEDORA_FILES=1 
-INCLUDE_RHEL_FILES=1 
-INCLUDE_RT_FILES=1 
-KABIDW=../redhat/kabi-dwarf 
-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.fc25.tar.bz2 
-LANG=C 
-LOCVERFILE=../localversion 
-MACH=x86_64 
-MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.cross 
-MAKEFLAGS= -- HEAD=2585cf9dfaad DISTRO=rhel DIST=.fc25 RHSELFTESTDATA=1 
-MARKER=v5.16-rc5 
-MERGE_BASE=2585cf9dfaaddf00b069673f27bb3f8530e2039c 
-NO_CONFIGCHECKS= 
-PATCHLIST_URL=none 
-PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
-PROCESS_CONFIGS_OPTS=-n -w -c 
-REDHAT=../redhat 
-RELEASED_KERNEL=0 
-RELEASETAG=kernel-5.16.0-0.rc5.6.test 
-RHDISTGIT_BRANCH=rhel-9.99.0 
-RHDISTGIT_CACHE= 
-RHDISTGIT_TMP=/tmp 
-RHEL_MAJOR=9 
-RHEL_MINOR=99 
-RHEL_REBASE_NUM=1 
-RHGITCOMMIT=2585cf9dfaad 
-RHJOBS=1 
-RHPKG_BIN=rhpkg 
-RHSELFTESTDATA=1 
-RPM=../redhat/rpm 
-RPMBUILD=rpmbuild 
-SNAPSHOT=0 
-SOURCES=../redhat/rpm/SOURCES 
-SPECBUILD=0.rc5.6.test 
-SPECCHANGELOG=kernel.changelog-9.99 
-SPECFILE=kernel.spec 
-SPECGEMINI=0 
-SPECINCLUDE_FEDORA_FILES=1 
-SPECINCLUDE_RHEL_FILES=1 
-SPECINCLUDE_RT_FILES=1 
-SPECKABIVERSION=5.16.0-0.rc5.6.test.fc25 
-SPECKEXTRAVERSION=-rc5 
-SPECKPATCHLEVEL=16 
-SPECKSUBLEVEL=0 
-SPECKVERSION=5 
-SPECPACKAGE_NAME=kernel 
-SPECRELEASED_KERNEL=0 
-SPECRPATCHLEVEL=1 
-SPECRPMVERSION=5.16.0 
-SPECRVERSION=0 
-SPECSELFTESTS_MUST_BUILD=0 
-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.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. 
-UPSTREAMBUILD_GIT_ONLY= 
-UPSTREAM_BRANCH=master 
-UPSTREAM_TARBALL_NAME=5.16-rc5 
-VERSION_ON_UPSTREAM=1 
-YSTREAM_FLAG=yes 
-ZSTREAM_FLAG=no 
-_OUTPUT=.. 
-_TAG=v5.16-rc5 
+.DEFAULT_GOAL=dist-cross-download
+.SHELLSTATUS=0
+ADD_COMMITID_TO_VERSION=
+ARCHCONFIG=X86_64
+ARCH_LIST=aarch64 ppc64le s390x x86_64
+BASEVERSION=5.16.0-0.rc5.6.test
+BUILD=6
+BUILD_FLAGS=
+BUILD_PROFILE=
+BUILD_PROFILE_USERDEF=
+BUILD_TARGET=rhel-9-newest-test-pesign
+BUILD_TARGET_USERDEF=
+BUMP_RELEASE=yes
+CHANGELOG_EXT=changelog-9.99
+CHANGELOG_PREV_EXT=changelog-9.98
+CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu
+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=rhel
+DISTRO_USERDEF=rhel
+DIST_BRANCH="os-build"
+DIST_USERDEF=.fc25
+EARLY_YBUILD=
+EARLY_YRELEASE=
+ENABLE_WERROR=
+FLAVOR=
+GIT=git
+GITID=2585cf9dfaaddf00b069673f27bb3f8530e2039c
+GNUMAKEFLAGS=
+HEAD=2585cf9dfaad
+INCLUDE_FEDORA_FILES=1
+INCLUDE_RHEL_FILES=1
+INCLUDE_RT_FILES=1
+KABIDW=../redhat/kabi-dwarf
+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.fc25.tar.bz2
+LANG=C
+LOCVERFILE=../localversion
+MACH=x86_64
+MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.cross
+MAKEFLAGS= -- HEAD=2585cf9dfaad DISTRO=rhel DIST=.fc25 RHSELFTESTDATA=1
+MARKER=v5.16-rc5
+MERGE_BASE=2585cf9dfaaddf00b069673f27bb3f8530e2039c
+NO_CONFIGCHECKS=
+PATCHLIST_URL=none
+PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
+PROCESS_CONFIGS_OPTS=-n -w -c
+REDHAT=../redhat
+RELEASED_KERNEL=0
+RELEASETAG=kernel-5.16.0-0.rc5.6.test
+RHDISTGIT_BRANCH=rhel-9.99.0
+RHDISTGIT_CACHE=
+RHDISTGIT_TMP=/tmp
+RHEL_MAJOR=9
+RHEL_MINOR=99
+RHEL_REBASE_NUM=1
+RHGITCOMMIT=2585cf9dfaad
+RHJOBS=1
+RHPKG_BIN=rhpkg
+RHSELFTESTDATA=1
+RPM=../redhat/rpm
+RPMBUILD=rpmbuild
+SNAPSHOT=0
+SOURCES=../redhat/rpm/SOURCES
+SPECBUILD=0.rc5.6.test
+SPECCHANGELOG=kernel.changelog-9.99
+SPECFILE=kernel.spec
+SPECGEMINI=0
+SPECINCLUDE_FEDORA_FILES=1
+SPECINCLUDE_RHEL_FILES=1
+SPECINCLUDE_RT_FILES=1
+SPECKABIVERSION=5.16.0-0.rc5.6.test.fc25
+SPECKEXTRAVERSION=-rc5
+SPECKPATCHLEVEL=16
+SPECKSUBLEVEL=0
+SPECKVERSION=5
+SPECPACKAGE_NAME=kernel
+SPECRELEASED_KERNEL=0
+SPECRPATCHLEVEL=1
+SPECRPMVERSION=5.16.0
+SPECRVERSION=0
+SPECSELFTESTS_MUST_BUILD=0
+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.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.
+UPSTREAMBUILD_GIT_ONLY=
+UPSTREAM_BRANCH=master
+UPSTREAM_TARBALL_NAME=5.16-rc5
+VERSION_ON_UPSTREAM=1
+YSTREAM_FLAG=yes
+ZSTREAM_FLAG=no
+_OUTPUT=..
+_TAG=v5.16-rc5
diff --git a/redhat/self-test/data/rhel-78e36f3b0dae.el7 b/redhat/self-test/data/rhel-78e36f3b0dae.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/rhel-78e36f3b0dae.el7
+++ b/redhat/self-test/data/rhel-78e36f3b0dae.el7
@@ -1,106 +1,106 @@
-.DEFAULT_GOAL=dist-cross-download 
-.SHELLSTATUS=0 
-ADD_COMMITID_TO_VERSION= 
-ARCHCONFIG=X86_64 
-ARCH_LIST=aarch64 ppc64le s390x x86_64 
-BASEVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test 
-BUILD=6 
-BUILD_FLAGS= 
-BUILD_PROFILE= 
-BUILD_PROFILE_USERDEF= 
-BUILD_TARGET=rhel-9-newest-test-pesign 
-BUILD_TARGET_USERDEF= 
-BUMP_RELEASE=yes 
-CHANGELOG_EXT=changelog-9.99 
-CHANGELOG_PREV_EXT=changelog-9.98 
-CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu 
-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=rhel 
-DISTRO_USERDEF=rhel 
-DIST_BRANCH="os-build" 
-DIST_USERDEF=.el7 
-EARLY_YBUILD= 
-EARLY_YRELEASE= 
-ENABLE_WERROR= 
-FLAVOR= 
-GIT=git 
-GITID=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1 
-GNUMAKEFLAGS= 
-HEAD=78e36f3b0dae 
-INCLUDE_FEDORA_FILES=1 
-INCLUDE_RHEL_FILES=1 
-INCLUDE_RT_FILES=1 
-KABIDW=../redhat/kabi-dwarf 
-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.el7.tar.bz2 
-LANG=C 
-LOCVERFILE=../localversion 
-MACH=x86_64 
-MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.cross 
-MAKEFLAGS= -- HEAD=78e36f3b0dae DISTRO=rhel DIST=.el7 RHSELFTESTDATA=1 
-MARKER=78e36f3b0dae 
-MERGE_BASE=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1 
-NO_CONFIGCHECKS= 
-PATCHLIST_URL=none 
-PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
-PROCESS_CONFIGS_OPTS=-n -w -c 
-REDHAT=../redhat 
-RELEASED_KERNEL=0 
-RELEASETAG=kernel-5.17.0-0.rc0.78e36f3b0dae.6.test 
-RHDISTGIT_BRANCH=rhel-9.99.0 
-RHDISTGIT_CACHE= 
-RHDISTGIT_TMP=/tmp 
-RHEL_MAJOR=9 
-RHEL_MINOR=99 
-RHEL_REBASE_NUM=1 
-RHGITCOMMIT=78e36f3b0dae 
-RHJOBS=1 
-RHPKG_BIN=rhpkg 
-RHSELFTESTDATA=1 
-RPM=../redhat/rpm 
-RPMBUILD=rpmbuild 
-SNAPSHOT=1 
-SOURCES=../redhat/rpm/SOURCES 
-SPECBUILD=0.rc0.78e36f3b0dae.6.test 
-SPECCHANGELOG=kernel.changelog-9.99 
-SPECFILE=kernel.spec 
-SPECGEMINI=0 
-SPECINCLUDE_FEDORA_FILES=1 
-SPECINCLUDE_RHEL_FILES=1 
-SPECINCLUDE_RT_FILES=1 
-SPECKABIVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test.el7 
-SPECKEXTRAVERSION= 
-SPECKPATCHLEVEL=17 
-SPECKSUBLEVEL=0 
-SPECKVERSION=5 
-SPECPACKAGE_NAME=kernel 
-SPECRELEASED_KERNEL=0 
-SPECRPATCHLEVEL=1 
-SPECRPMVERSION=5.17.0 
-SPECRVERSION=0 
-SPECSELFTESTS_MUST_BUILD=0 
-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.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. 
-UPSTREAMBUILD_GIT_ONLY=1 
-UPSTREAM_BRANCH=master 
-UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae 
-VERSION_ON_UPSTREAM=1 
-YSTREAM_FLAG=yes 
-ZSTREAM_FLAG=no 
-_OUTPUT=.. 
-_TAG=v5.16-11523-g78e36f3b0dae 
+.DEFAULT_GOAL=dist-cross-download
+.SHELLSTATUS=0
+ADD_COMMITID_TO_VERSION=
+ARCHCONFIG=X86_64
+ARCH_LIST=aarch64 ppc64le s390x x86_64
+BASEVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test
+BUILD=6
+BUILD_FLAGS=
+BUILD_PROFILE=
+BUILD_PROFILE_USERDEF=
+BUILD_TARGET=rhel-9-newest-test-pesign
+BUILD_TARGET_USERDEF=
+BUMP_RELEASE=yes
+CHANGELOG_EXT=changelog-9.99
+CHANGELOG_PREV_EXT=changelog-9.98
+CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu
+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=rhel
+DISTRO_USERDEF=rhel
+DIST_BRANCH="os-build"
+DIST_USERDEF=.el7
+EARLY_YBUILD=
+EARLY_YRELEASE=
+ENABLE_WERROR=
+FLAVOR=
+GIT=git
+GITID=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1
+GNUMAKEFLAGS=
+HEAD=78e36f3b0dae
+INCLUDE_FEDORA_FILES=1
+INCLUDE_RHEL_FILES=1
+INCLUDE_RT_FILES=1
+KABIDW=../redhat/kabi-dwarf
+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.el7.tar.bz2
+LANG=C
+LOCVERFILE=../localversion
+MACH=x86_64
+MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.cross
+MAKEFLAGS= -- HEAD=78e36f3b0dae DISTRO=rhel DIST=.el7 RHSELFTESTDATA=1
+MARKER=78e36f3b0dae
+MERGE_BASE=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1
+NO_CONFIGCHECKS=
+PATCHLIST_URL=none
+PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
+PROCESS_CONFIGS_OPTS=-n -w -c
+REDHAT=../redhat
+RELEASED_KERNEL=0
+RELEASETAG=kernel-5.17.0-0.rc0.78e36f3b0dae.6.test
+RHDISTGIT_BRANCH=rhel-9.99.0
+RHDISTGIT_CACHE=
+RHDISTGIT_TMP=/tmp
+RHEL_MAJOR=9
+RHEL_MINOR=99
+RHEL_REBASE_NUM=1
+RHGITCOMMIT=78e36f3b0dae
+RHJOBS=1
+RHPKG_BIN=rhpkg
+RHSELFTESTDATA=1
+RPM=../redhat/rpm
+RPMBUILD=rpmbuild
+SNAPSHOT=1
+SOURCES=../redhat/rpm/SOURCES
+SPECBUILD=0.rc0.78e36f3b0dae.6.test
+SPECCHANGELOG=kernel.changelog-9.99
+SPECFILE=kernel.spec
+SPECGEMINI=0
+SPECINCLUDE_FEDORA_FILES=1
+SPECINCLUDE_RHEL_FILES=1
+SPECINCLUDE_RT_FILES=1
+SPECKABIVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test.el7
+SPECKEXTRAVERSION=
+SPECKPATCHLEVEL=17
+SPECKSUBLEVEL=0
+SPECKVERSION=5
+SPECPACKAGE_NAME=kernel
+SPECRELEASED_KERNEL=0
+SPECRPATCHLEVEL=1
+SPECRPMVERSION=5.17.0
+SPECRVERSION=0
+SPECSELFTESTS_MUST_BUILD=0
+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.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.
+UPSTREAMBUILD_GIT_ONLY=1
+UPSTREAM_BRANCH=master
+UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae
+VERSION_ON_UPSTREAM=1
+YSTREAM_FLAG=yes
+ZSTREAM_FLAG=no
+_OUTPUT=..
+_TAG=v5.16-11523-g78e36f3b0dae
diff --git a/redhat/self-test/data/rhel-78e36f3b0dae.fc25 b/redhat/self-test/data/rhel-78e36f3b0dae.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/rhel-78e36f3b0dae.fc25
+++ b/redhat/self-test/data/rhel-78e36f3b0dae.fc25
@@ -1,106 +1,106 @@
-.DEFAULT_GOAL=dist-cross-download 
-.SHELLSTATUS=0 
-ADD_COMMITID_TO_VERSION= 
-ARCHCONFIG=X86_64 
-ARCH_LIST=aarch64 ppc64le s390x x86_64 
-BASEVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test 
-BUILD=6 
-BUILD_FLAGS= 
-BUILD_PROFILE= 
-BUILD_PROFILE_USERDEF= 
-BUILD_TARGET=rhel-9-newest-test-pesign 
-BUILD_TARGET_USERDEF= 
-BUMP_RELEASE=yes 
-CHANGELOG_EXT=changelog-9.99 
-CHANGELOG_PREV_EXT=changelog-9.98 
-CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu 
-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=rhel 
-DISTRO_USERDEF=rhel 
-DIST_BRANCH="os-build" 
-DIST_USERDEF=.fc25 
-EARLY_YBUILD= 
-EARLY_YRELEASE= 
-ENABLE_WERROR= 
-FLAVOR= 
-GIT=git 
-GITID=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1 
-GNUMAKEFLAGS= 
-HEAD=78e36f3b0dae 
-INCLUDE_FEDORA_FILES=1 
-INCLUDE_RHEL_FILES=1 
-INCLUDE_RT_FILES=1 
-KABIDW=../redhat/kabi-dwarf 
-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.fc25.tar.bz2 
-LANG=C 
-LOCVERFILE=../localversion 
-MACH=x86_64 
-MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.cross 
-MAKEFLAGS= -- HEAD=78e36f3b0dae DISTRO=rhel DIST=.fc25 RHSELFTESTDATA=1 
-MARKER=78e36f3b0dae 
-MERGE_BASE=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1 
-NO_CONFIGCHECKS= 
-PATCHLIST_URL=none 
-PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
-PROCESS_CONFIGS_OPTS=-n -w -c 
-REDHAT=../redhat 
-RELEASED_KERNEL=0 
-RELEASETAG=kernel-5.17.0-0.rc0.78e36f3b0dae.6.test 
-RHDISTGIT_BRANCH=rhel-9.99.0 
-RHDISTGIT_CACHE= 
-RHDISTGIT_TMP=/tmp 
-RHEL_MAJOR=9 
-RHEL_MINOR=99 
-RHEL_REBASE_NUM=1 
-RHGITCOMMIT=78e36f3b0dae 
-RHJOBS=1 
-RHPKG_BIN=rhpkg 
-RHSELFTESTDATA=1 
-RPM=../redhat/rpm 
-RPMBUILD=rpmbuild 
-SNAPSHOT=1 
-SOURCES=../redhat/rpm/SOURCES 
-SPECBUILD=0.rc0.78e36f3b0dae.6.test 
-SPECCHANGELOG=kernel.changelog-9.99 
-SPECFILE=kernel.spec 
-SPECGEMINI=0 
-SPECINCLUDE_FEDORA_FILES=1 
-SPECINCLUDE_RHEL_FILES=1 
-SPECINCLUDE_RT_FILES=1 
-SPECKABIVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test.fc25 
-SPECKEXTRAVERSION= 
-SPECKPATCHLEVEL=17 
-SPECKSUBLEVEL=0 
-SPECKVERSION=5 
-SPECPACKAGE_NAME=kernel 
-SPECRELEASED_KERNEL=0 
-SPECRPATCHLEVEL=1 
-SPECRPMVERSION=5.17.0 
-SPECRVERSION=0 
-SPECSELFTESTS_MUST_BUILD=0 
-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.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. 
-UPSTREAMBUILD_GIT_ONLY=1 
-UPSTREAM_BRANCH=master 
-UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae 
-VERSION_ON_UPSTREAM=1 
-YSTREAM_FLAG=yes 
-ZSTREAM_FLAG=no 
-_OUTPUT=.. 
-_TAG=v5.16-11523-g78e36f3b0dae 
+.DEFAULT_GOAL=dist-cross-download
+.SHELLSTATUS=0
+ADD_COMMITID_TO_VERSION=
+ARCHCONFIG=X86_64
+ARCH_LIST=aarch64 ppc64le s390x x86_64
+BASEVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test
+BUILD=6
+BUILD_FLAGS=
+BUILD_PROFILE=
+BUILD_PROFILE_USERDEF=
+BUILD_TARGET=rhel-9-newest-test-pesign
+BUILD_TARGET_USERDEF=
+BUMP_RELEASE=yes
+CHANGELOG_EXT=changelog-9.99
+CHANGELOG_PREV_EXT=changelog-9.98
+CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu
+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=rhel
+DISTRO_USERDEF=rhel
+DIST_BRANCH="os-build"
+DIST_USERDEF=.fc25
+EARLY_YBUILD=
+EARLY_YRELEASE=
+ENABLE_WERROR=
+FLAVOR=
+GIT=git
+GITID=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1
+GNUMAKEFLAGS=
+HEAD=78e36f3b0dae
+INCLUDE_FEDORA_FILES=1
+INCLUDE_RHEL_FILES=1
+INCLUDE_RT_FILES=1
+KABIDW=../redhat/kabi-dwarf
+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.fc25.tar.bz2
+LANG=C
+LOCVERFILE=../localversion
+MACH=x86_64
+MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.cross
+MAKEFLAGS= -- HEAD=78e36f3b0dae DISTRO=rhel DIST=.fc25 RHSELFTESTDATA=1
+MARKER=78e36f3b0dae
+MERGE_BASE=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1
+NO_CONFIGCHECKS=
+PATCHLIST_URL=none
+PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
+PROCESS_CONFIGS_OPTS=-n -w -c
+REDHAT=../redhat
+RELEASED_KERNEL=0
+RELEASETAG=kernel-5.17.0-0.rc0.78e36f3b0dae.6.test
+RHDISTGIT_BRANCH=rhel-9.99.0
+RHDISTGIT_CACHE=
+RHDISTGIT_TMP=/tmp
+RHEL_MAJOR=9
+RHEL_MINOR=99
+RHEL_REBASE_NUM=1
+RHGITCOMMIT=78e36f3b0dae
+RHJOBS=1
+RHPKG_BIN=rhpkg
+RHSELFTESTDATA=1
+RPM=../redhat/rpm
+RPMBUILD=rpmbuild
+SNAPSHOT=1
+SOURCES=../redhat/rpm/SOURCES
+SPECBUILD=0.rc0.78e36f3b0dae.6.test
+SPECCHANGELOG=kernel.changelog-9.99
+SPECFILE=kernel.spec
+SPECGEMINI=0
+SPECINCLUDE_FEDORA_FILES=1
+SPECINCLUDE_RHEL_FILES=1
+SPECINCLUDE_RT_FILES=1
+SPECKABIVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test.fc25
+SPECKEXTRAVERSION=
+SPECKPATCHLEVEL=17
+SPECKSUBLEVEL=0
+SPECKVERSION=5
+SPECPACKAGE_NAME=kernel
+SPECRELEASED_KERNEL=0
+SPECRPATCHLEVEL=1
+SPECRPMVERSION=5.17.0
+SPECRVERSION=0
+SPECSELFTESTS_MUST_BUILD=0
+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.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.
+UPSTREAMBUILD_GIT_ONLY=1
+UPSTREAM_BRANCH=master
+UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae
+VERSION_ON_UPSTREAM=1
+YSTREAM_FLAG=yes
+ZSTREAM_FLAG=no
+_OUTPUT=..
+_TAG=v5.16-11523-g78e36f3b0dae

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




[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