4:34 p.m.
From: Prarit Bhargava on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1706
Making changes to the Makefiles has been difficult and revealed minor
issues with even the simplest of changes. Having a test that compares the
Makefile variables to a "known good" set, and being able to compare the
kernel spec file to a "known good" spec file will help with testing future
changes.
I have chosen these 4 ARK commits to test with because they result in
different
versioning in the variables and the kernel specfile:
78e36f3b0dae := 5.17.0 merge window (5.16 + additional changes before -rc1)
result: 5.17.0-0.rc0.78e36f3b0dae.6.test
2585cf9dfaad := 5.16-rc5
result: 5.16.0-0.rc5.6.test
df0cc57e057f := 5.16
result: 5.16.0-6.test
fce15c45d3fb := 5.16-rc5 + 2 additional commits
result: 5.16.0-0.rc5.fce15c45d3fb.6.test
This changeset provides a better "dist-dump-variables" test that also
compares the resulting spec files. The test code does introduce two new
Makefile.variables entries both of which are clearly marked as unstable.
The genspec.sh change is minor, and is just a reorganization of the code
to speed up the creation of test files.
As indicated in the last commit, changelog generation is not yet tested.
That will come at a later date. Additional tests beyond these tests will
also be added at a later date.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
---
redhat/configs/build_configs.sh | 18 +-
redhat/configs/generate_all_configs.sh | 20 +-
redhat/configs/process_configs.sh | 11 +-
redhat/scripts/create-tarball.sh | 6 +-
redhat/scripts/rh-dist-git.sh | 62 +-
redhat/self-test/data/centos-2585cf9dfaad.el7 | 99 +
redhat/self-test/data/centos-2585cf9dfaad.el7.spec | 3031 +++++++++++++++++++
redhat/self-test/data/centos-2585cf9dfaad.fc25 | 99 +
redhat/self-test/data/centos-2585cf9dfaad.fc25.spec | 3031 +++++++++++++++++++
redhat/self-test/data/centos-78e36f3b0dae.el7 | 99 +
redhat/self-test/data/centos-78e36f3b0dae.el7.spec | 3031 +++++++++++++++++++
redhat/self-test/data/centos-78e36f3b0dae.fc25 | 99 +
redhat/self-test/data/centos-78e36f3b0dae.fc25.spec | 3031 +++++++++++++++++++
redhat/self-test/data/centos-df0cc57e057f.el7 | 99 +
redhat/self-test/data/centos-df0cc57e057f.el7.spec | 3031 +++++++++++++++++++
redhat/self-test/data/centos-df0cc57e057f.fc25 | 99 +
redhat/self-test/data/centos-df0cc57e057f.fc25.spec | 3031 +++++++++++++++++++
redhat/self-test/data/centos-fce15c45d3fb.el7 | 99 +
redhat/self-test/data/centos-fce15c45d3fb.el7.spec | 3031 +++++++++++++++++++
redhat/self-test/data/centos-fce15c45d3fb.fc25 | 99 +
redhat/self-test/data/centos-fce15c45d3fb.fc25.spec | 3031 +++++++++++++++++++
redhat/self-test/data/create-data.sh | 54 +
redhat/self-test/data/fedora-2585cf9dfaad.el7 | 97 +
redhat/self-test/data/fedora-2585cf9dfaad.el7.spec | 3031 +++++++++++++++++++
redhat/self-test/data/fedora-2585cf9dfaad.fc25 | 97 +
redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec | 3031 +++++++++++++++++++
redhat/self-test/data/fedora-78e36f3b0dae.el7 | 97 +
redhat/self-test/data/fedora-78e36f3b0dae.el7.spec | 3031 +++++++++++++++++++
redhat/self-test/data/fedora-78e36f3b0dae.fc25 | 97 +
redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec | 3031 +++++++++++++++++++
redhat/self-test/data/fedora-df0cc57e057f.el7 | 97 +
redhat/self-test/data/fedora-df0cc57e057f.el7.spec | 3031 +++++++++++++++++++
redhat/self-test/data/fedora-df0cc57e057f.fc25 | 97 +
redhat/self-test/data/fedora-df0cc57e057f.fc25.spec | 3031 +++++++++++++++++++
redhat/self-test/data/fedora-fce15c45d3fb.el7 | 97 +
redhat/self-test/data/fedora-fce15c45d3fb.el7.spec | 3031 +++++++++++++++++++
redhat/self-test/data/fedora-fce15c45d3fb.fc25 | 97 +
redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec | 3031 +++++++++++++++++++
redhat/self-test/data/rhel-2585cf9dfaad.el7 | 97 +
redhat/self-test/data/rhel-2585cf9dfaad.el7.spec | 3031 +++++++++++++++++++
redhat/self-test/data/rhel-2585cf9dfaad.fc25 | 97 +
redhat/self-test/data/rhel-2585cf9dfaad.fc25.spec | 3031 +++++++++++++++++++
redhat/self-test/data/rhel-78e36f3b0dae.el7 | 97 +
redhat/self-test/data/rhel-78e36f3b0dae.el7.spec | 3031 +++++++++++++++++++
redhat/self-test/data/rhel-78e36f3b0dae.fc25 | 97 +
redhat/self-test/data/rhel-78e36f3b0dae.fc25.spec | 3031 +++++++++++++++++++
redhat/self-test/data/rhel-df0cc57e057f.el7 | 97 +
redhat/self-test/data/rhel-df0cc57e057f.el7.spec | 3031 +++++++++++++++++++
redhat/self-test/data/rhel-df0cc57e057f.fc25 | 97 +
redhat/self-test/data/rhel-df0cc57e057f.fc25.spec | 3031 +++++++++++++++++++
redhat/self-test/data/rhel-fce15c45d3fb.el7 | 97 +
redhat/self-test/data/rhel-fce15c45d3fb.el7.spec | 3031 +++++++++++++++++++
redhat/self-test/data/rhel-fce15c45d3fb.fc25 | 97 +
redhat/self-test/data/rhel-fce15c45d3fb.fc25.spec | 3031 +++++++++++++++++++
redhat/self-test/1005-dist-dump-variables.bats | 59 +-
redhat/Makefile | 62 +-
redhat/Makefile.rhpkg | 6 +-
redhat/Makefile.variables | 10 +-
redhat/genspec.sh | 158 +-
redhat/kernel.spec.template | 7 +-
60 files changed, 75321 insertions(+), 240 deletions(-)
4:34 p.m.
New subject: [OS-BUILD PATCHv6 1/16] redhat/self-test: Add variable test data
From: Prarit Bhargava <prarit(a)redhat.com>
redhat/self-test: Add variable test data
Add test data for various release types, a script to create the data, and
a Makefile target. This data will be used as a baseline for testing of
Makefile changes.
Note: By default, 'make self-test-data' outputs absolute paths. The
modification to TOPDIR allows relative path information which results in
generic test data. When RHSELFTESTDATA is set TOPDIR is ../
instead of, for example, '/home/prarit/path/to/directory/kernel/ark', and
RHDISTGIT_USER is set to "shadowman".
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -21,7 +21,11 @@ endif
include Makefile.variables
LANG=C
-TOPDIR:=$(shell $(GIT) rev-parse --show-toplevel)
+ifndef RHSELFTESTDATA
+ TOPDIR:=$(shell $(GIT) rev-parse --show-toplevel)
+else
+ TOPDIR:=..
+endif
REDHAT:=$(TOPDIR)/redhat
include $(TOPDIR)/Makefile.rhelver
@@ -650,6 +654,9 @@ dist-self-test:
echo "dist-self-test: The bats package is not installed" ; \
fi
+dist-self-test-data:
+ ./self-test/data/create-data.sh ${REDHAT}/self-test/data
+
dist-help:
@echo 'Cleaning targets:'
@echo ' dist-clean - Clean redhat/configs/ and redhat/rpm/
directories.'
diff --git a/redhat/Makefile.rhpkg b/redhat/Makefile.rhpkg
index blahblah..blahblah 100644
--- a/redhat/Makefile.rhpkg
+++ b/redhat/Makefile.rhpkg
@@ -10,7 +10,11 @@ else
RHPKG_BIN:=rhpkg
endif
# Kerberos username for pkgs.devel.redhat.com
-RHDISTGIT_USER:="$(shell whoami)"
+ifndef RHSELFTESTDATA
+ RHDISTGIT_USER:="$(shell whoami)"
+else
+ RHDISTGIT_USER:="shadowman"
+endif
# Local dist-git _clean_ clone. To be used when updating dist-git
#RHDISTGIT_CACHE:=
# Temporary directory to clone the dist-git repo to. Change this if you
diff --git a/redhat/Makefile.variables b/redhat/Makefile.variables
index blahblah..blahblah 100644
--- a/redhat/Makefile.variables
+++ b/redhat/Makefile.variables
@@ -119,3 +119,7 @@ RHJOBS ?=
# This disables the CONFIG error checking in redhat/configs/process_configs.sh.
NO_CONFIGCHECKS ?=
+
+# This variable is only used to create self-test data. It should not be
+# considered stable and may be changed or removed without warning.
+RHSELFTESTDATA ?=
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.el7
b/redhat/self-test/data/centos-2585cf9dfaad.el7
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/self-test/data/centos-2585cf9dfaad.el7
@@ -0,0 +1,102 @@
+.DEFAULT_GOAL=dist-cross-download
+.SHELLSTATUS=0
+ARCHCONFIG=X86_64
+ARCH_LIST=aarch64 ppc64le s390x x86_64
+BUILD_FLAGS=
+BUILD_PROFILE=-p stream
+BUMP_RELEASE=yes
+CHANGELOG=kernel.changelog-9.99
+CHANGELOG_PREV=kernel.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
+DISTRO=centos
+DISTRO_BUILD=0.rc5.6
+EARLY_YBUILD=
+EARLY_YRELEASE=
+FLAVOR=
+GITID=2585cf9dfaaddf00b069673f27bb3f8530e2039c
+GL_FORK_PATH=kernel.git
+GNUMAKEFLAGS=
+HEAD=2585cf9dfaad
+INCLUDE_FEDORA_FILES=1
+INCLUDE_RHEL_FILES=1
+KABIDW=../redhat/kabi-dwarf
+KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.tar.bz2
+KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.tar.bz2
+KEXTRAVERSION=.rc5
+KVERSION=5.16.0
+LANG=C
+LOCVERFILE=../localversion
+MACH=x86_64
+MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.rhpkg
Makefile.cross
+MAKEFLAGS=w -- HEAD=2585cf9dfaad DISTRO=centos DIST=.el7 RHSELFTESTDATA=1
+MARKER=v5.16-rc5
+MERGE_BASE=2585cf9dfaaddf00b069673f27bb3f8530e2039c
+PKGRELEASE=0.rc5.6.test
+PREBUILD=0.rc5.
+PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
+PROCESS_CONFIGS_OPTS=-n -w -c
+REDHAT=../redhat
+RELEASED_KERNEL=0
+RHDISTGIT=git@gitlab.com:/kernel.git
+RHDISTGIT_BRANCH=c9s
+RHDISTGIT_TMP=/tmp
+RHDISTGIT_USER="shadowman"
+RHEL_MAJOR=9
+RHEL_MINOR=99
+RHEL_RELEASE=6
+RHPKG_BIN=centpkg
+RHSELFTESTDATA=1
+RPM=../redhat/rpm
+RPMBUILD=rpmbuild
+RPMKEXTRAVERSION=-rc5
+RPMKPATCHLEVEL=16
+RPMKSUBLEVEL=0
+RPMKVERSION=5
+RPMVERSION=5.16.0-0.rc5.6.test
+SHELL=/bin/sh
+SINGLE_TARBALL=1
+SNAPSHOT=0
+SOURCES=../redhat/rpm/SOURCES
+SPECFILE=kernel.spec
+SPECRELEASE=0.rc5.6%{?buildid}%{?dist}
+SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.6.test.el7.src.rpm
+SRPMS=../redhat/rpm/SRPMS
+TARBALL=../redhat/linux-5.16.0-0.rc5.6.test.tar.xz
+TARFILE=linux-5.16.0-0.rc5.6.test.tar.xz
+TARFILE_RELEASE=5.16.0-0.rc5.6.test
+TESTPATCH=../redhat/linux-kernel-test.patch
+TOPDIR=..
+UPSTREAM=aa5b537b0ecc16992577b013f11112d54c7ce869
+UPSTREAM_TARBALL_NAME=5.16-rc5
+VERSION_ON_UPSTREAM=1
+_OUTPUT=..
+_TAG=v5.16-rc5
+__YSTREAM=yes
+__ZSTREAM=no
+DIST_BRANCH="os-build"
+DIST=.el7
+DISTRO=centos
+UPSTREAM_BRANCH=master
+VERSION_ON_UPSTREAM=1
+RELEASED_KERNEL=0
+BUMP_RELEASE=yes
+INCLUDE_FEDORA_FILES=1
+INCLUDE_RHEL_FILES=1
+PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"
+PACKAGE_NAME=kernel
+GIT=git
+HEAD=HEAD
+BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
+BUILD_TARGET=--scratch temp-ark-rhel-8-test
+BUILD_PROFILE=
+BUILD_FLAGS=
+BUILD=6
+PREBUILD_GIT_ONLY=1
+RHGITURL=git@gitlab.com:cki-project/kernel-ark.git
+RHGITCOMMIT=HEAD
+RHJOBS=1
+NO_CONFIGCHECKS=
+RHSELFTESTDATA=
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.fc25
b/redhat/self-test/data/centos-2585cf9dfaad.fc25
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/self-test/data/centos-2585cf9dfaad.fc25
@@ -0,0 +1,102 @@
+.DEFAULT_GOAL=dist-cross-download
+.SHELLSTATUS=0
+ARCHCONFIG=X86_64
+ARCH_LIST=aarch64 ppc64le s390x x86_64
+BUILD_FLAGS=
+BUILD_PROFILE=-p stream
+BUMP_RELEASE=yes
+CHANGELOG=kernel.changelog-9.99
+CHANGELOG_PREV=kernel.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
+DISTRO=centos
+DISTRO_BUILD=0.rc5.6
+EARLY_YBUILD=
+EARLY_YRELEASE=
+FLAVOR=
+GITID=2585cf9dfaaddf00b069673f27bb3f8530e2039c
+GL_FORK_PATH=kernel.git
+GNUMAKEFLAGS=
+HEAD=2585cf9dfaad
+INCLUDE_FEDORA_FILES=1
+INCLUDE_RHEL_FILES=1
+KABIDW=../redhat/kabi-dwarf
+KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.tar.bz2
+KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.tar.bz2
+KEXTRAVERSION=.rc5
+KVERSION=5.16.0
+LANG=C
+LOCVERFILE=../localversion
+MACH=x86_64
+MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.rhpkg
Makefile.cross
+MAKEFLAGS=w -- HEAD=2585cf9dfaad DISTRO=centos DIST=.fc25 RHSELFTESTDATA=1
+MARKER=v5.16-rc5
+MERGE_BASE=2585cf9dfaaddf00b069673f27bb3f8530e2039c
+PKGRELEASE=0.rc5.6.test
+PREBUILD=0.rc5.
+PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
+PROCESS_CONFIGS_OPTS=-n -w -c
+REDHAT=../redhat
+RELEASED_KERNEL=0
+RHDISTGIT=git@gitlab.com:/kernel.git
+RHDISTGIT_BRANCH=c9s
+RHDISTGIT_TMP=/tmp
+RHDISTGIT_USER="shadowman"
+RHEL_MAJOR=9
+RHEL_MINOR=99
+RHEL_RELEASE=6
+RHPKG_BIN=centpkg
+RHSELFTESTDATA=1
+RPM=../redhat/rpm
+RPMBUILD=rpmbuild
+RPMKEXTRAVERSION=-rc5
+RPMKPATCHLEVEL=16
+RPMKSUBLEVEL=0
+RPMKVERSION=5
+RPMVERSION=5.16.0-0.rc5.6.test
+SHELL=/bin/sh
+SINGLE_TARBALL=1
+SNAPSHOT=0
+SOURCES=../redhat/rpm/SOURCES
+SPECFILE=kernel.spec
+SPECRELEASE=0.rc5.6%{?buildid}%{?dist}
+SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.6.test.fc25.src.rpm
+SRPMS=../redhat/rpm/SRPMS
+TARBALL=../redhat/linux-5.16.0-0.rc5.6.test.tar.xz
+TARFILE=linux-5.16.0-0.rc5.6.test.tar.xz
+TARFILE_RELEASE=5.16.0-0.rc5.6.test
+TESTPATCH=../redhat/linux-kernel-test.patch
+TOPDIR=..
+UPSTREAM=aa5b537b0ecc16992577b013f11112d54c7ce869
+UPSTREAM_TARBALL_NAME=5.16-rc5
+VERSION_ON_UPSTREAM=1
+_OUTPUT=..
+_TAG=v5.16-rc5
+__YSTREAM=yes
+__ZSTREAM=no
+DIST_BRANCH="os-build"
+DIST=.fc25
+DISTRO=centos
+UPSTREAM_BRANCH=master
+VERSION_ON_UPSTREAM=1
+RELEASED_KERNEL=0
+BUMP_RELEASE=yes
+INCLUDE_FEDORA_FILES=1
+INCLUDE_RHEL_FILES=1
+PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"
+PACKAGE_NAME=kernel
+GIT=git
+HEAD=HEAD
+BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
+BUILD_TARGET=--scratch temp-ark-rhel-8-test
+BUILD_PROFILE=
+BUILD_FLAGS=
+BUILD=6
+PREBUILD_GIT_ONLY=1
+RHGITURL=git@gitlab.com:cki-project/kernel-ark.git
+RHGITCOMMIT=HEAD
+RHJOBS=1
+NO_CONFIGCHECKS=
+RHSELFTESTDATA=
diff --git a/redhat/self-test/data/centos-78e36f3b0dae.el7
b/redhat/self-test/data/centos-78e36f3b0dae.el7
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/self-test/data/centos-78e36f3b0dae.el7
@@ -0,0 +1,102 @@
+.DEFAULT_GOAL=dist-cross-download
+.SHELLSTATUS=0
+ARCHCONFIG=X86_64
+ARCH_LIST=aarch64 ppc64le s390x x86_64
+BUILD_FLAGS=
+BUILD_PROFILE=-p stream
+BUMP_RELEASE=yes
+CHANGELOG=kernel.changelog-9.99
+CHANGELOG_PREV=kernel.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
+DISTRO=centos
+DISTRO_BUILD=0.rc0.78e36f3b0dae.6
+EARLY_YBUILD=
+EARLY_YRELEASE=
+FLAVOR=
+GITID=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1
+GL_FORK_PATH=kernel.git
+GNUMAKEFLAGS=
+HEAD=78e36f3b0dae
+INCLUDE_FEDORA_FILES=1
+INCLUDE_RHEL_FILES=1
+KABIDW=../redhat/kabi-dwarf
+KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae.6.tar.bz2
+KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.tar.bz2
+KEXTRAVERSION=.rc0
+KVERSION=5.17.0
+LANG=C
+LOCVERFILE=../localversion
+MACH=x86_64
+MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.rhpkg
Makefile.cross
+MAKEFLAGS=w -- HEAD=78e36f3b0dae DISTRO=centos DIST=.el7 RHSELFTESTDATA=1
+MARKER=78e36f3b0dae
+MERGE_BASE=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1
+PKGRELEASE=0.rc0.78e36f3b0dae.6.test
+PREBUILD=0.rc0.78e36f3b0dae.
+PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
+PROCESS_CONFIGS_OPTS=-n -w -c
+REDHAT=../redhat
+RELEASED_KERNEL=0
+RHDISTGIT=git@gitlab.com:/kernel.git
+RHDISTGIT_BRANCH=c9s
+RHDISTGIT_TMP=/tmp
+RHDISTGIT_USER="shadowman"
+RHEL_MAJOR=9
+RHEL_MINOR=99
+RHEL_RELEASE=6
+RHPKG_BIN=centpkg
+RHSELFTESTDATA=1
+RPM=../redhat/rpm
+RPMBUILD=rpmbuild
+RPMKEXTRAVERSION=
+RPMKPATCHLEVEL=17
+RPMKSUBLEVEL=0
+RPMKVERSION=5
+RPMVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test
+SHELL=/bin/sh
+SINGLE_TARBALL=1
+SNAPSHOT=1
+SOURCES=../redhat/rpm/SOURCES
+SPECFILE=kernel.spec
+SPECRELEASE=0.rc0.78e36f3b0dae.6%{?buildid}%{?dist}
+SRPM=../redhat/rpm/SRPMS/kernel-5.17.0-0.rc0.78e36f3b0dae.6.test.el7.src.rpm
+SRPMS=../redhat/rpm/SRPMS
+TARBALL=../redhat/linux-5.17.0-0.rc0.78e36f3b0dae.6.test.tar.xz
+TARFILE=linux-5.17.0-0.rc0.78e36f3b0dae.6.test.tar.xz
+TARFILE_RELEASE=5.17.0-0.rc0.78e36f3b0dae.6.test
+TESTPATCH=../redhat/linux-kernel-test.patch
+TOPDIR=..
+UPSTREAM=aa5b537b0ecc16992577b013f11112d54c7ce869
+UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae
+VERSION_ON_UPSTREAM=1
+_OUTPUT=..
+_TAG=v5.16-11523-g78e36f3b0dae
+__YSTREAM=yes
+__ZSTREAM=no
+DIST_BRANCH="os-build"
+DIST=.el7
+DISTRO=centos
+UPSTREAM_BRANCH=master
+VERSION_ON_UPSTREAM=1
+RELEASED_KERNEL=0
+BUMP_RELEASE=yes
+INCLUDE_FEDORA_FILES=1
+INCLUDE_RHEL_FILES=1
+PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"
+PACKAGE_NAME=kernel
+GIT=git
+HEAD=HEAD
+BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
+BUILD_TARGET=--scratch temp-ark-rhel-8-test
+BUILD_PROFILE=
+BUILD_FLAGS=
+BUILD=6
+PREBUILD_GIT_ONLY=1
+RHGITURL=git@gitlab.com:cki-project/kernel-ark.git
+RHGITCOMMIT=HEAD
+RHJOBS=1
+NO_CONFIGCHECKS=
+RHSELFTESTDATA=
diff --git a/redhat/self-test/data/centos-78e36f3b0dae.fc25
b/redhat/self-test/data/centos-78e36f3b0dae.fc25
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/self-test/data/centos-78e36f3b0dae.fc25
@@ -0,0 +1,102 @@
+.DEFAULT_GOAL=dist-cross-download
+.SHELLSTATUS=0
+ARCHCONFIG=X86_64
+ARCH_LIST=aarch64 ppc64le s390x x86_64
+BUILD_FLAGS=
+BUILD_PROFILE=-p stream
+BUMP_RELEASE=yes
+CHANGELOG=kernel.changelog-9.99
+CHANGELOG_PREV=kernel.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
+DISTRO=centos
+DISTRO_BUILD=0.rc0.78e36f3b0dae.6
+EARLY_YBUILD=
+EARLY_YRELEASE=
+FLAVOR=
+GITID=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1
+GL_FORK_PATH=kernel.git
+GNUMAKEFLAGS=
+HEAD=78e36f3b0dae
+INCLUDE_FEDORA_FILES=1
+INCLUDE_RHEL_FILES=1
+KABIDW=../redhat/kabi-dwarf
+KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae.6.tar.bz2
+KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.tar.bz2
+KEXTRAVERSION=.rc0
+KVERSION=5.17.0
+LANG=C
+LOCVERFILE=../localversion
+MACH=x86_64
+MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.rhpkg
Makefile.cross
+MAKEFLAGS=w -- HEAD=78e36f3b0dae DISTRO=centos DIST=.fc25 RHSELFTESTDATA=1
+MARKER=78e36f3b0dae
+MERGE_BASE=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1
+PKGRELEASE=0.rc0.78e36f3b0dae.6.test
+PREBUILD=0.rc0.78e36f3b0dae.
+PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
+PROCESS_CONFIGS_OPTS=-n -w -c
+REDHAT=../redhat
+RELEASED_KERNEL=0
+RHDISTGIT=git@gitlab.com:/kernel.git
+RHDISTGIT_BRANCH=c9s
+RHDISTGIT_TMP=/tmp
+RHDISTGIT_USER="shadowman"
+RHEL_MAJOR=9
+RHEL_MINOR=99
+RHEL_RELEASE=6
+RHPKG_BIN=centpkg
+RHSELFTESTDATA=1
+RPM=../redhat/rpm
+RPMBUILD=rpmbuild
+RPMKEXTRAVERSION=
+RPMKPATCHLEVEL=17
+RPMKSUBLEVEL=0
+RPMKVERSION=5
+RPMVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test
+SHELL=/bin/sh
+SINGLE_TARBALL=1
+SNAPSHOT=1
+SOURCES=../redhat/rpm/SOURCES
+SPECFILE=kernel.spec
+SPECRELEASE=0.rc0.78e36f3b0dae.6%{?buildid}%{?dist}
+SRPM=../redhat/rpm/SRPMS/kernel-5.17.0-0.rc0.78e36f3b0dae.6.test.fc25.src.rpm
+SRPMS=../redhat/rpm/SRPMS
+TARBALL=../redhat/linux-5.17.0-0.rc0.78e36f3b0dae.6.test.tar.xz
+TARFILE=linux-5.17.0-0.rc0.78e36f3b0dae.6.test.tar.xz
+TARFILE_RELEASE=5.17.0-0.rc0.78e36f3b0dae.6.test
+TESTPATCH=../redhat/linux-kernel-test.patch
+TOPDIR=..
+UPSTREAM=aa5b537b0ecc16992577b013f11112d54c7ce869
+UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae
+VERSION_ON_UPSTREAM=1
+_OUTPUT=..
+_TAG=v5.16-11523-g78e36f3b0dae
+__YSTREAM=yes
+__ZSTREAM=no
+DIST_BRANCH="os-build"
+DIST=.fc25
+DISTRO=centos
+UPSTREAM_BRANCH=master
+VERSION_ON_UPSTREAM=1
+RELEASED_KERNEL=0
+BUMP_RELEASE=yes
+INCLUDE_FEDORA_FILES=1
+INCLUDE_RHEL_FILES=1
+PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"
+PACKAGE_NAME=kernel
+GIT=git
+HEAD=HEAD
+BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
+BUILD_TARGET=--scratch temp-ark-rhel-8-test
+BUILD_PROFILE=
+BUILD_FLAGS=
+BUILD=6
+PREBUILD_GIT_ONLY=1
+RHGITURL=git@gitlab.com:cki-project/kernel-ark.git
+RHGITCOMMIT=HEAD
+RHJOBS=1
+NO_CONFIGCHECKS=
+RHSELFTESTDATA=
diff --git a/redhat/self-test/data/centos-df0cc57e057f.el7
b/redhat/self-test/data/centos-df0cc57e057f.el7
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/self-test/data/centos-df0cc57e057f.el7
@@ -0,0 +1,102 @@
+.DEFAULT_GOAL=dist-cross-download
+.SHELLSTATUS=0
+ARCHCONFIG=X86_64
+ARCH_LIST=aarch64 ppc64le s390x x86_64
+BUILD_FLAGS=
+BUILD_PROFILE=-p stream
+BUMP_RELEASE=yes
+CHANGELOG=kernel.changelog-9.99
+CHANGELOG_PREV=kernel.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
+DISTRO=centos
+DISTRO_BUILD=6
+EARLY_YBUILD=
+EARLY_YRELEASE=
+FLAVOR=
+GITID=df0cc57e057f18e44dac8e6c18aba47ab53202f9
+GL_FORK_PATH=kernel.git
+GNUMAKEFLAGS=
+HEAD=df0cc57e057f
+INCLUDE_FEDORA_FILES=1
+INCLUDE_RHEL_FILES=1
+KABIDW=../redhat/kabi-dwarf
+KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-6.tar.bz2
+KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-6.tar.bz2
+KEXTRAVERSION=
+KVERSION=5.16.0
+LANG=C
+LOCVERFILE=../localversion
+MACH=x86_64
+MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.rhpkg
Makefile.cross
+MAKEFLAGS=w -- HEAD=df0cc57e057f DISTRO=centos DIST=.el7 RHSELFTESTDATA=1
+MARKER=v5.16
+MERGE_BASE=df0cc57e057f18e44dac8e6c18aba47ab53202f9
+PKGRELEASE=6.test
+PREBUILD=
+PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
+PROCESS_CONFIGS_OPTS=-n -w -c
+REDHAT=../redhat
+RELEASED_KERNEL=0
+RHDISTGIT=git@gitlab.com:/kernel.git
+RHDISTGIT_BRANCH=c9s
+RHDISTGIT_TMP=/tmp
+RHDISTGIT_USER="shadowman"
+RHEL_MAJOR=9
+RHEL_MINOR=99
+RHEL_RELEASE=6
+RHPKG_BIN=centpkg
+RHSELFTESTDATA=1
+RPM=../redhat/rpm
+RPMBUILD=rpmbuild
+RPMKEXTRAVERSION=
+RPMKPATCHLEVEL=16
+RPMKSUBLEVEL=0
+RPMKVERSION=5
+RPMVERSION=5.16.0-6.test
+SHELL=/bin/sh
+SINGLE_TARBALL=1
+SNAPSHOT=0
+SOURCES=../redhat/rpm/SOURCES
+SPECFILE=kernel.spec
+SPECRELEASE=6%{?buildid}%{?dist}
+SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-6.test.el7.src.rpm
+SRPMS=../redhat/rpm/SRPMS
+TARBALL=../redhat/linux-5.16.0-6.test.tar.xz
+TARFILE=linux-5.16.0-6.test.tar.xz
+TARFILE_RELEASE=5.16.0-6.test
+TESTPATCH=../redhat/linux-kernel-test.patch
+TOPDIR=..
+UPSTREAM=aa5b537b0ecc16992577b013f11112d54c7ce869
+UPSTREAM_TARBALL_NAME=5.16
+VERSION_ON_UPSTREAM=1
+_OUTPUT=..
+_TAG=v5.16
+__YSTREAM=yes
+__ZSTREAM=no
+DIST_BRANCH="os-build"
+DIST=.el7
+DISTRO=centos
+UPSTREAM_BRANCH=master
+VERSION_ON_UPSTREAM=1
+RELEASED_KERNEL=0
+BUMP_RELEASE=yes
+INCLUDE_FEDORA_FILES=1
+INCLUDE_RHEL_FILES=1
+PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"
+PACKAGE_NAME=kernel
+GIT=git
+HEAD=HEAD
+BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
+BUILD_TARGET=--scratch temp-ark-rhel-8-test
+BUILD_PROFILE=
+BUILD_FLAGS=
+BUILD=6
+PREBUILD_GIT_ONLY=1
+RHGITURL=git@gitlab.com:cki-project/kernel-ark.git
+RHGITCOMMIT=HEAD
+RHJOBS=1
+NO_CONFIGCHECKS=
+RHSELFTESTDATA=
diff --git a/redhat/self-test/data/centos-df0cc57e057f.fc25
b/redhat/self-test/data/centos-df0cc57e057f.fc25
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/self-test/data/centos-df0cc57e057f.fc25
@@ -0,0 +1,102 @@
+.DEFAULT_GOAL=dist-cross-download
+.SHELLSTATUS=0
+ARCHCONFIG=X86_64
+ARCH_LIST=aarch64 ppc64le s390x x86_64
+BUILD_FLAGS=
+BUILD_PROFILE=-p stream
+BUMP_RELEASE=yes
+CHANGELOG=kernel.changelog-9.99
+CHANGELOG_PREV=kernel.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
+DISTRO=centos
+DISTRO_BUILD=6
+EARLY_YBUILD=
+EARLY_YRELEASE=
+FLAVOR=
+GITID=df0cc57e057f18e44dac8e6c18aba47ab53202f9
+GL_FORK_PATH=kernel.git
+GNUMAKEFLAGS=
+HEAD=df0cc57e057f
+INCLUDE_FEDORA_FILES=1
+INCLUDE_RHEL_FILES=1
+KABIDW=../redhat/kabi-dwarf
+KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-6.tar.bz2
+KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-6.tar.bz2
+KEXTRAVERSION=
+KVERSION=5.16.0
+LANG=C
+LOCVERFILE=../localversion
+MACH=x86_64
+MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.rhpkg
Makefile.cross
+MAKEFLAGS=w -- HEAD=df0cc57e057f DISTRO=centos DIST=.fc25 RHSELFTESTDATA=1
+MARKER=v5.16
+MERGE_BASE=df0cc57e057f18e44dac8e6c18aba47ab53202f9
+PKGRELEASE=6.test
+PREBUILD=
+PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
+PROCESS_CONFIGS_OPTS=-n -w -c
+REDHAT=../redhat
+RELEASED_KERNEL=0
+RHDISTGIT=git@gitlab.com:/kernel.git
+RHDISTGIT_BRANCH=c9s
+RHDISTGIT_TMP=/tmp
+RHDISTGIT_USER="shadowman"
+RHEL_MAJOR=9
+RHEL_MINOR=99
+RHEL_RELEASE=6
+RHPKG_BIN=centpkg
+RHSELFTESTDATA=1
+RPM=../redhat/rpm
+RPMBUILD=rpmbuild
+RPMKEXTRAVERSION=
+RPMKPATCHLEVEL=16
+RPMKSUBLEVEL=0
+RPMKVERSION=5
+RPMVERSION=5.16.0-6.test
+SHELL=/bin/sh
+SINGLE_TARBALL=1
+SNAPSHOT=0
+SOURCES=../redhat/rpm/SOURCES
+SPECFILE=kernel.spec
+SPECRELEASE=6%{?buildid}%{?dist}
+SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-6.test.fc25.src.rpm
+SRPMS=../redhat/rpm/SRPMS
+TARBALL=../redhat/linux-5.16.0-6.test.tar.xz
+TARFILE=linux-5.16.0-6.test.tar.xz
+TARFILE_RELEASE=5.16.0-6.test
+TESTPATCH=../redhat/linux-kernel-test.patch
+TOPDIR=..
+UPSTREAM=aa5b537b0ecc16992577b013f11112d54c7ce869
+UPSTREAM_TARBALL_NAME=5.16
+VERSION_ON_UPSTREAM=1
+_OUTPUT=..
+_TAG=v5.16
+__YSTREAM=yes
+__ZSTREAM=no
+DIST_BRANCH="os-build"
+DIST=.fc25
+DISTRO=centos
+UPSTREAM_BRANCH=master
+VERSION_ON_UPSTREAM=1
+RELEASED_KERNEL=0
+BUMP_RELEASE=yes
+INCLUDE_FEDORA_FILES=1
+INCLUDE_RHEL_FILES=1
+PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"
+PACKAGE_NAME=kernel
+GIT=git
+HEAD=HEAD
+BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
+BUILD_TARGET=--scratch temp-ark-rhel-8-test
+BUILD_PROFILE=
+BUILD_FLAGS=
+BUILD=6
+PREBUILD_GIT_ONLY=1
+RHGITURL=git@gitlab.com:cki-project/kernel-ark.git
+RHGITCOMMIT=HEAD
+RHJOBS=1
+NO_CONFIGCHECKS=
+RHSELFTESTDATA=
diff --git a/redhat/self-test/data/centos-fce15c45d3fb.el7
b/redhat/self-test/data/centos-fce15c45d3fb.el7
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/self-test/data/centos-fce15c45d3fb.el7
@@ -0,0 +1,102 @@
+.DEFAULT_GOAL=dist-cross-download
+.SHELLSTATUS=0
+ARCHCONFIG=X86_64
+ARCH_LIST=aarch64 ppc64le s390x x86_64
+BUILD_FLAGS=
+BUILD_PROFILE=-p stream
+BUMP_RELEASE=yes
+CHANGELOG=kernel.changelog-9.99
+CHANGELOG_PREV=kernel.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
+DISTRO=centos
+DISTRO_BUILD=0.rc5.fce15c45d3fb.6
+EARLY_YBUILD=
+EARLY_YRELEASE=
+FLAVOR=
+GITID=fce15c45d3fbd9fc1feaaf3210d8e3f8b33dfd3a
+GL_FORK_PATH=kernel.git
+GNUMAKEFLAGS=
+HEAD=fce15c45d3fb
+INCLUDE_FEDORA_FILES=1
+INCLUDE_RHEL_FILES=1
+KABIDW=../redhat/kabi-dwarf
+KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.fce15c45d3fb.6.tar.bz2
+KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.fce15c45d3fb.6.tar.bz2
+KEXTRAVERSION=.rc5
+KVERSION=5.16.0
+LANG=C
+LOCVERFILE=../localversion
+MACH=x86_64
+MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.rhpkg
Makefile.cross
+MAKEFLAGS=w -- HEAD=fce15c45d3fb DISTRO=centos DIST=.el7 RHSELFTESTDATA=1
+MARKER=fce15c45d3fb
+MERGE_BASE=fce15c45d3fbd9fc1feaaf3210d8e3f8b33dfd3a
+PKGRELEASE=0.rc5.fce15c45d3fb.6.test
+PREBUILD=0.rc5.fce15c45d3fb.
+PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
+PROCESS_CONFIGS_OPTS=-n -w -c
+REDHAT=../redhat
+RELEASED_KERNEL=0
+RHDISTGIT=git@gitlab.com:/kernel.git
+RHDISTGIT_BRANCH=c9s
+RHDISTGIT_TMP=/tmp
+RHDISTGIT_USER="shadowman"
+RHEL_MAJOR=9
+RHEL_MINOR=99
+RHEL_RELEASE=6
+RHPKG_BIN=centpkg
+RHSELFTESTDATA=1
+RPM=../redhat/rpm
+RPMBUILD=rpmbuild
+RPMKEXTRAVERSION=-rc5
+RPMKPATCHLEVEL=16
+RPMKSUBLEVEL=0
+RPMKVERSION=5
+RPMVERSION=5.16.0-0.rc5.fce15c45d3fb.6.test
+SHELL=/bin/sh
+SINGLE_TARBALL=1
+SNAPSHOT=1
+SOURCES=../redhat/rpm/SOURCES
+SPECFILE=kernel.spec
+SPECRELEASE=0.rc5.fce15c45d3fb.6%{?buildid}%{?dist}
+SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.fce15c45d3fb.6.test.el7.src.rpm
+SRPMS=../redhat/rpm/SRPMS
+TARBALL=../redhat/linux-5.16.0-0.rc5.fce15c45d3fb.6.test.tar.xz
+TARFILE=linux-5.16.0-0.rc5.fce15c45d3fb.6.test.tar.xz
+TARFILE_RELEASE=5.16.0-0.rc5.fce15c45d3fb.6.test
+TESTPATCH=../redhat/linux-kernel-test.patch
+TOPDIR=..
+UPSTREAM=aa5b537b0ecc16992577b013f11112d54c7ce869
+UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fb
+VERSION_ON_UPSTREAM=1
+_OUTPUT=..
+_TAG=v5.16-rc5-1-gfce15c45d3fb
+__YSTREAM=yes
+__ZSTREAM=no
+DIST_BRANCH="os-build"
+DIST=.el7
+DISTRO=centos
+UPSTREAM_BRANCH=master
+VERSION_ON_UPSTREAM=1
+RELEASED_KERNEL=0
+BUMP_RELEASE=yes
+INCLUDE_FEDORA_FILES=1
+INCLUDE_RHEL_FILES=1
+PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"
+PACKAGE_NAME=kernel
+GIT=git
+HEAD=HEAD
+BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
+BUILD_TARGET=--scratch temp-ark-rhel-8-test
+BUILD_PROFILE=
+BUILD_FLAGS=
+BUILD=6
+PREBUILD_GIT_ONLY=1
+RHGITURL=git@gitlab.com:cki-project/kernel-ark.git
+RHGITCOMMIT=HEAD
+RHJOBS=1
+NO_CONFIGCHECKS=
+RHSELFTESTDATA=
diff --git a/redhat/self-test/data/centos-fce15c45d3fb.fc25
b/redhat/self-test/data/centos-fce15c45d3fb.fc25
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/self-test/data/centos-fce15c45d3fb.fc25
@@ -0,0 +1,102 @@
+.DEFAULT_GOAL=dist-cross-download
+.SHELLSTATUS=0
+ARCHCONFIG=X86_64
+ARCH_LIST=aarch64 ppc64le s390x x86_64
+BUILD_FLAGS=
+BUILD_PROFILE=-p stream
+BUMP_RELEASE=yes
+CHANGELOG=kernel.changelog-9.99
+CHANGELOG_PREV=kernel.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
+DISTRO=centos
+DISTRO_BUILD=0.rc5.fce15c45d3fb.6
+EARLY_YBUILD=
+EARLY_YRELEASE=
+FLAVOR=
+GITID=fce15c45d3fbd9fc1feaaf3210d8e3f8b33dfd3a
+GL_FORK_PATH=kernel.git
+GNUMAKEFLAGS=
+HEAD=fce15c45d3fb
+INCLUDE_FEDORA_FILES=1
+INCLUDE_RHEL_FILES=1
+KABIDW=../redhat/kabi-dwarf
+KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.fce15c45d3fb.6.tar.bz2
+KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.fce15c45d3fb.6.tar.bz2
+KEXTRAVERSION=.rc5
+KVERSION=5.16.0
+LANG=C
+LOCVERFILE=../localversion
+MACH=x86_64
+MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.rhpkg
Makefile.cross
+MAKEFLAGS=w -- HEAD=fce15c45d3fb DISTRO=centos DIST=.fc25 RHSELFTESTDATA=1
+MARKER=fce15c45d3fb
+MERGE_BASE=fce15c45d3fbd9fc1feaaf3210d8e3f8b33dfd3a
+PKGRELEASE=0.rc5.fce15c45d3fb.6.test
+PREBUILD=0.rc5.fce15c45d3fb.
+PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
+PROCESS_CONFIGS_OPTS=-n -w -c
+REDHAT=../redhat
+RELEASED_KERNEL=0
+RHDISTGIT=git@gitlab.com:/kernel.git
+RHDISTGIT_BRANCH=c9s
+RHDISTGIT_TMP=/tmp
+RHDISTGIT_USER="shadowman"
+RHEL_MAJOR=9
+RHEL_MINOR=99
+RHEL_RELEASE=6
+RHPKG_BIN=centpkg
+RHSELFTESTDATA=1
+RPM=../redhat/rpm
+RPMBUILD=rpmbuild
+RPMKEXTRAVERSION=-rc5
+RPMKPATCHLEVEL=16
+RPMKSUBLEVEL=0
+RPMKVERSION=5
+RPMVERSION=5.16.0-0.rc5.fce15c45d3fb.6.test
+SHELL=/bin/sh
+SINGLE_TARBALL=1
+SNAPSHOT=1
+SOURCES=../redhat/rpm/SOURCES
+SPECFILE=kernel.spec
+SPECRELEASE=0.rc5.fce15c45d3fb.6%{?buildid}%{?dist}
+SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.fce15c45d3fb.6.test.fc25.src.rpm
+SRPMS=../redhat/rpm/SRPMS
+TARBALL=../redhat/linux-5.16.0-0.rc5.fce15c45d3fb.6.test.tar.xz
+TARFILE=linux-5.16.0-0.rc5.fce15c45d3fb.6.test.tar.xz
+TARFILE_RELEASE=5.16.0-0.rc5.fce15c45d3fb.6.test
+TESTPATCH=../redhat/linux-kernel-test.patch
+TOPDIR=..
+UPSTREAM=aa5b537b0ecc16992577b013f11112d54c7ce869
+UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fb
+VERSION_ON_UPSTREAM=1
+_OUTPUT=..
+_TAG=v5.16-rc5-1-gfce15c45d3fb
+__YSTREAM=yes
+__ZSTREAM=no
+DIST_BRANCH="os-build"
+DIST=.fc25
+DISTRO=centos
+UPSTREAM_BRANCH=master
+VERSION_ON_UPSTREAM=1
+RELEASED_KERNEL=0
+BUMP_RELEASE=yes
+INCLUDE_FEDORA_FILES=1
+INCLUDE_RHEL_FILES=1
+PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"
+PACKAGE_NAME=kernel
+GIT=git
+HEAD=HEAD
+BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
+BUILD_TARGET=--scratch temp-ark-rhel-8-test
+BUILD_PROFILE=
+BUILD_FLAGS=
+BUILD=6
+PREBUILD_GIT_ONLY=1
+RHGITURL=git@gitlab.com:cki-project/kernel-ark.git
+RHGITCOMMIT=HEAD
+RHJOBS=1
+NO_CONFIGCHECKS=
+RHSELFTESTDATA=
diff --git a/redhat/self-test/data/create-data.sh b/redhat/self-test/data/create-data.sh
new file mode 100755
index blahblah..blahblah 100755
--- /dev/null
+++ b/redhat/self-test/data/create-data.sh
@@ -0,0 +1,46 @@
+#!/usr/bin/bash
+
+target_dir=$1
+[ -z "${target_dir}" ] && echo "Missing target directory."
&& exit 1
+
+# This script generates 'dist-dump-variables' output for various configurations
+# using known ark commit IDs. It uses this information as well as setting
+# different values for DISTRO and DIST.
+#
+# The ark commit IDs are
+#
+# 78e36f3b0dae := 5.17.0 merge window (5.16 + additional changes before -rc1)
+# 2585cf9dfaad := 5.16-rc5
+# df0cc57e057f := 5.16
+# fce15c45d3fb := 5.16-rc5 + 2 additional commits
+#
+
+[ -z "$REDHAT" ] && echo "ERROR: execution only supported through
'make dist-self-test-data'" && exit 1
+
+for DISTRO in fedora rhel centos
+do
+ for commit in 78e36f3b0dae 2585cf9dfaad df0cc57e057f fce15c45d3fb
+ do
+ for DIST in .fc25 .el7
+ do
+ varfilename="${DISTRO}-${commit}${DIST}"
+
+ echo "building $varfilename"
+
+ # CURDIR is a make special target and cannot be easily changed. Omit
+ # CURDIR from the output.
+ make RHSELFTESTDATA=1 DIST="${DIST}" DISTRO="${DISTRO}"
HEAD=${commit} dist-dump-variables | grep "=" | grep -v CURDIR >&
"${target_dir}"/"${varfilename}"
+
+ # When executed from a script, the variables in Makefile.variables are
+ # listed as having origin 'environment'. This is because the script
+ # inherits the variables from the 'export' command in the redhat/Makefile.
+ # The 'dist-dump-variables' target explicitly omits these variables from
+ # its output. As a workaround, read in the variables and output them to
+ # the data file.
+ # shellcheck disable=SC2002
+ cat Makefile.variables | grep -v "^#" | sed '/^$/d' | tr -d "
" | awk -F "?=|:=" '{print $1}' | while read -r VAR; do echo
"$VAR=${!VAR}"; done >>
"${target_dir}"/"${varfilename}"
+ done
+ done
+done
+
+exit 0
diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.el7
b/redhat/self-test/data/fedora-2585cf9dfaad.el7
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/self-test/data/fedora-2585cf9dfaad.el7
@@ -0,0 +1,100 @@
+.DEFAULT_GOAL=dist-cross-download
+.SHELLSTATUS=0
+ARCHCONFIG=X86_64
+ARCH_LIST=aarch64 ppc64le s390x x86_64
+BUILD_FLAGS=
+BUMP_RELEASE=yes
+CHANGELOG=kernel.changelog-9.99
+CHANGELOG_PREV=kernel.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
+DISTRO=fedora
+DISTRO_BUILD=0.rc5.6
+EARLY_YBUILD=
+EARLY_YRELEASE=
+FLAVOR=
+GITID=2585cf9dfaaddf00b069673f27bb3f8530e2039c
+GNUMAKEFLAGS=
+HEAD=2585cf9dfaad
+INCLUDE_FEDORA_FILES=1
+INCLUDE_RHEL_FILES=1
+KABIDW=../redhat/kabi-dwarf
+KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.tar.bz2
+KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.tar.bz2
+KEXTRAVERSION=.rc5
+KVERSION=5.16.0
+LANG=C
+LOCVERFILE=../localversion
+MACH=x86_64
+MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.rhpkg
Makefile.cross
+MAKEFLAGS=w -- HEAD=2585cf9dfaad DISTRO=fedora DIST=.el7 RHSELFTESTDATA=1
+MARKER=v5.16-rc5
+MERGE_BASE=2585cf9dfaaddf00b069673f27bb3f8530e2039c
+PKGRELEASE=0.rc5.6.test
+PREBUILD=0.rc5.
+PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
+PROCESS_CONFIGS_OPTS=-n -w -c
+REDHAT=../redhat
+RELEASED_KERNEL=0
+RHDISTGIT="ssh://"shadowman"@pkgs.fedoraproject.org/rpms/kernel"
+RHDISTGIT_BRANCH=rawhide
+RHDISTGIT_TMP=/tmp
+RHDISTGIT_USER="shadowman"
+RHEL_MAJOR=9
+RHEL_MINOR=99
+RHEL_RELEASE=6
+RHPKG_BIN=fedpkg
+RHSELFTESTDATA=1
+RPM=../redhat/rpm
+RPMBUILD=rpmbuild
+RPMKEXTRAVERSION=-rc5
+RPMKPATCHLEVEL=16
+RPMKSUBLEVEL=0
+RPMKVERSION=5
+RPMVERSION=5.16.0-0.rc5.6.test
+SHELL=/bin/sh
+SINGLE_TARBALL=0
+SNAPSHOT=0
+SOURCES=../redhat/rpm/SOURCES
+SPECFILE=kernel.spec
+SPECRELEASE=0.rc5.6%{?buildid}%{?dist}
+SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.6.test.el7.src.rpm
+SRPMS=../redhat/rpm/SRPMS
+TARBALL=../redhat/linux-5.16-rc5.tar.xz
+TARFILE=linux-5.16-rc5.tar.xz
+TARFILE_RELEASE=5.16-rc5
+TESTPATCH=../redhat/linux-kernel-test.patch
+TOPDIR=..
+UPSTREAM=aa5b537b0ecc16992577b013f11112d54c7ce869
+UPSTREAM_TARBALL_NAME=5.16-rc5
+VERSION_ON_UPSTREAM=1
+_OUTPUT=..
+_TAG=v5.16-rc5
+__YSTREAM=yes
+__ZSTREAM=no
+DIST_BRANCH="os-build"
+DIST=.el7
+DISTRO=fedora
+UPSTREAM_BRANCH=master
+VERSION_ON_UPSTREAM=1
+RELEASED_KERNEL=0
+BUMP_RELEASE=yes
+INCLUDE_FEDORA_FILES=1
+INCLUDE_RHEL_FILES=1
+PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"
+PACKAGE_NAME=kernel
+GIT=git
+HEAD=HEAD
+BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
+BUILD_TARGET=--scratch temp-ark-rhel-8-test
+BUILD_PROFILE=
+BUILD_FLAGS=
+BUILD=6
+PREBUILD_GIT_ONLY=1
+RHGITURL=git@gitlab.com:cki-project/kernel-ark.git
+RHGITCOMMIT=HEAD
+RHJOBS=1
+NO_CONFIGCHECKS=
+RHSELFTESTDATA=
diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.fc25
b/redhat/self-test/data/fedora-2585cf9dfaad.fc25
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/self-test/data/fedora-2585cf9dfaad.fc25
@@ -0,0 +1,100 @@
+.DEFAULT_GOAL=dist-cross-download
+.SHELLSTATUS=0
+ARCHCONFIG=X86_64
+ARCH_LIST=aarch64 ppc64le s390x x86_64
+BUILD_FLAGS=
+BUMP_RELEASE=yes
+CHANGELOG=kernel.changelog-9.99
+CHANGELOG_PREV=kernel.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
+DISTRO=fedora
+DISTRO_BUILD=0.rc5.6
+EARLY_YBUILD=
+EARLY_YRELEASE=
+FLAVOR=
+GITID=2585cf9dfaaddf00b069673f27bb3f8530e2039c
+GNUMAKEFLAGS=
+HEAD=2585cf9dfaad
+INCLUDE_FEDORA_FILES=1
+INCLUDE_RHEL_FILES=1
+KABIDW=../redhat/kabi-dwarf
+KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.tar.bz2
+KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.tar.bz2
+KEXTRAVERSION=.rc5
+KVERSION=5.16.0
+LANG=C
+LOCVERFILE=../localversion
+MACH=x86_64
+MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.rhpkg
Makefile.cross
+MAKEFLAGS=w -- HEAD=2585cf9dfaad DISTRO=fedora DIST=.fc25 RHSELFTESTDATA=1
+MARKER=v5.16-rc5
+MERGE_BASE=2585cf9dfaaddf00b069673f27bb3f8530e2039c
+PKGRELEASE=0.rc5.6.test
+PREBUILD=0.rc5.
+PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
+PROCESS_CONFIGS_OPTS=-n -w -c
+REDHAT=../redhat
+RELEASED_KERNEL=0
+RHDISTGIT="ssh://"shadowman"@pkgs.fedoraproject.org/rpms/kernel"
+RHDISTGIT_BRANCH=rawhide
+RHDISTGIT_TMP=/tmp
+RHDISTGIT_USER="shadowman"
+RHEL_MAJOR=9
+RHEL_MINOR=99
+RHEL_RELEASE=6
+RHPKG_BIN=fedpkg
+RHSELFTESTDATA=1
+RPM=../redhat/rpm
+RPMBUILD=rpmbuild
+RPMKEXTRAVERSION=-rc5
+RPMKPATCHLEVEL=16
+RPMKSUBLEVEL=0
+RPMKVERSION=5
+RPMVERSION=5.16.0-0.rc5.6.test
+SHELL=/bin/sh
+SINGLE_TARBALL=0
+SNAPSHOT=0
+SOURCES=../redhat/rpm/SOURCES
+SPECFILE=kernel.spec
+SPECRELEASE=0.rc5.6%{?buildid}%{?dist}
+SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.6.test.fc25.src.rpm
+SRPMS=../redhat/rpm/SRPMS
+TARBALL=../redhat/linux-5.16-rc5.tar.xz
+TARFILE=linux-5.16-rc5.tar.xz
+TARFILE_RELEASE=5.16-rc5
+TESTPATCH=../redhat/linux-kernel-test.patch
+TOPDIR=..
+UPSTREAM=aa5b537b0ecc16992577b013f11112d54c7ce869
+UPSTREAM_TARBALL_NAME=5.16-rc5
+VERSION_ON_UPSTREAM=1
+_OUTPUT=..
+_TAG=v5.16-rc5
+__YSTREAM=yes
+__ZSTREAM=no
+DIST_BRANCH="os-build"
+DIST=.fc25
+DISTRO=fedora
+UPSTREAM_BRANCH=master
+VERSION_ON_UPSTREAM=1
+RELEASED_KERNEL=0
+BUMP_RELEASE=yes
+INCLUDE_FEDORA_FILES=1
+INCLUDE_RHEL_FILES=1
+PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"
+PACKAGE_NAME=kernel
+GIT=git
+HEAD=HEAD
+BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
+BUILD_TARGET=--scratch temp-ark-rhel-8-test
+BUILD_PROFILE=
+BUILD_FLAGS=
+BUILD=6
+PREBUILD_GIT_ONLY=1
+RHGITURL=git@gitlab.com:cki-project/kernel-ark.git
+RHGITCOMMIT=HEAD
+RHJOBS=1
+NO_CONFIGCHECKS=
+RHSELFTESTDATA=
diff --git a/redhat/self-test/data/fedora-78e36f3b0dae.el7
b/redhat/self-test/data/fedora-78e36f3b0dae.el7
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/self-test/data/fedora-78e36f3b0dae.el7
@@ -0,0 +1,100 @@
+.DEFAULT_GOAL=dist-cross-download
+.SHELLSTATUS=0
+ARCHCONFIG=X86_64
+ARCH_LIST=aarch64 ppc64le s390x x86_64
+BUILD_FLAGS=
+BUMP_RELEASE=yes
+CHANGELOG=kernel.changelog-9.99
+CHANGELOG_PREV=kernel.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
+DISTRO=fedora
+DISTRO_BUILD=0.rc0.78e36f3b0dae.6
+EARLY_YBUILD=
+EARLY_YRELEASE=
+FLAVOR=
+GITID=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1
+GNUMAKEFLAGS=
+HEAD=78e36f3b0dae
+INCLUDE_FEDORA_FILES=1
+INCLUDE_RHEL_FILES=1
+KABIDW=../redhat/kabi-dwarf
+KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae.6.tar.bz2
+KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.tar.bz2
+KEXTRAVERSION=.rc0
+KVERSION=5.17.0
+LANG=C
+LOCVERFILE=../localversion
+MACH=x86_64
+MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.rhpkg
Makefile.cross
+MAKEFLAGS=w -- HEAD=78e36f3b0dae DISTRO=fedora DIST=.el7 RHSELFTESTDATA=1
+MARKER=78e36f3b0dae
+MERGE_BASE=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1
+PKGRELEASE=0.rc0.78e36f3b0dae.6.test
+PREBUILD=0.rc0.78e36f3b0dae.
+PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
+PROCESS_CONFIGS_OPTS=-n -w -c
+REDHAT=../redhat
+RELEASED_KERNEL=0
+RHDISTGIT="ssh://"shadowman"@pkgs.fedoraproject.org/rpms/kernel"
+RHDISTGIT_BRANCH=rawhide
+RHDISTGIT_TMP=/tmp
+RHDISTGIT_USER="shadowman"
+RHEL_MAJOR=9
+RHEL_MINOR=99
+RHEL_RELEASE=6
+RHPKG_BIN=fedpkg
+RHSELFTESTDATA=1
+RPM=../redhat/rpm
+RPMBUILD=rpmbuild
+RPMKEXTRAVERSION=
+RPMKPATCHLEVEL=17
+RPMKSUBLEVEL=0
+RPMKVERSION=5
+RPMVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test
+SHELL=/bin/sh
+SINGLE_TARBALL=0
+SNAPSHOT=1
+SOURCES=../redhat/rpm/SOURCES
+SPECFILE=kernel.spec
+SPECRELEASE=0.rc0.78e36f3b0dae.6%{?buildid}%{?dist}
+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
+TARFILE_RELEASE=5.16-11523-g78e36f3b0dae
+TESTPATCH=../redhat/linux-kernel-test.patch
+TOPDIR=..
+UPSTREAM=aa5b537b0ecc16992577b013f11112d54c7ce869
+UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae
+VERSION_ON_UPSTREAM=1
+_OUTPUT=..
+_TAG=v5.16-11523-g78e36f3b0dae
+__YSTREAM=yes
+__ZSTREAM=no
+DIST_BRANCH="os-build"
+DIST=.el7
+DISTRO=fedora
+UPSTREAM_BRANCH=master
+VERSION_ON_UPSTREAM=1
+RELEASED_KERNEL=0
+BUMP_RELEASE=yes
+INCLUDE_FEDORA_FILES=1
+INCLUDE_RHEL_FILES=1
+PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"
+PACKAGE_NAME=kernel
+GIT=git
+HEAD=HEAD
+BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
+BUILD_TARGET=--scratch temp-ark-rhel-8-test
+BUILD_PROFILE=
+BUILD_FLAGS=
+BUILD=6
+PREBUILD_GIT_ONLY=1
+RHGITURL=git@gitlab.com:cki-project/kernel-ark.git
+RHGITCOMMIT=HEAD
+RHJOBS=1
+NO_CONFIGCHECKS=
+RHSELFTESTDATA=
diff --git a/redhat/self-test/data/fedora-78e36f3b0dae.fc25
b/redhat/self-test/data/fedora-78e36f3b0dae.fc25
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/self-test/data/fedora-78e36f3b0dae.fc25
@@ -0,0 +1,100 @@
+.DEFAULT_GOAL=dist-cross-download
+.SHELLSTATUS=0
+ARCHCONFIG=X86_64
+ARCH_LIST=aarch64 ppc64le s390x x86_64
+BUILD_FLAGS=
+BUMP_RELEASE=yes
+CHANGELOG=kernel.changelog-9.99
+CHANGELOG_PREV=kernel.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
+DISTRO=fedora
+DISTRO_BUILD=0.rc0.78e36f3b0dae.6
+EARLY_YBUILD=
+EARLY_YRELEASE=
+FLAVOR=
+GITID=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1
+GNUMAKEFLAGS=
+HEAD=78e36f3b0dae
+INCLUDE_FEDORA_FILES=1
+INCLUDE_RHEL_FILES=1
+KABIDW=../redhat/kabi-dwarf
+KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae.6.tar.bz2
+KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.tar.bz2
+KEXTRAVERSION=.rc0
+KVERSION=5.17.0
+LANG=C
+LOCVERFILE=../localversion
+MACH=x86_64
+MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.rhpkg
Makefile.cross
+MAKEFLAGS=w -- HEAD=78e36f3b0dae DISTRO=fedora DIST=.fc25 RHSELFTESTDATA=1
+MARKER=78e36f3b0dae
+MERGE_BASE=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1
+PKGRELEASE=0.rc0.78e36f3b0dae.6.test
+PREBUILD=0.rc0.78e36f3b0dae.
+PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
+PROCESS_CONFIGS_OPTS=-n -w -c
+REDHAT=../redhat
+RELEASED_KERNEL=0
+RHDISTGIT="ssh://"shadowman"@pkgs.fedoraproject.org/rpms/kernel"
+RHDISTGIT_BRANCH=rawhide
+RHDISTGIT_TMP=/tmp
+RHDISTGIT_USER="shadowman"
+RHEL_MAJOR=9
+RHEL_MINOR=99
+RHEL_RELEASE=6
+RHPKG_BIN=fedpkg
+RHSELFTESTDATA=1
+RPM=../redhat/rpm
+RPMBUILD=rpmbuild
+RPMKEXTRAVERSION=
+RPMKPATCHLEVEL=17
+RPMKSUBLEVEL=0
+RPMKVERSION=5
+RPMVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test
+SHELL=/bin/sh
+SINGLE_TARBALL=0
+SNAPSHOT=1
+SOURCES=../redhat/rpm/SOURCES
+SPECFILE=kernel.spec
+SPECRELEASE=0.rc0.78e36f3b0dae.6%{?buildid}%{?dist}
+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
+TARFILE_RELEASE=5.16-11523-g78e36f3b0dae
+TESTPATCH=../redhat/linux-kernel-test.patch
+TOPDIR=..
+UPSTREAM=aa5b537b0ecc16992577b013f11112d54c7ce869
+UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae
+VERSION_ON_UPSTREAM=1
+_OUTPUT=..
+_TAG=v5.16-11523-g78e36f3b0dae
+__YSTREAM=yes
+__ZSTREAM=no
+DIST_BRANCH="os-build"
+DIST=.fc25
+DISTRO=fedora
+UPSTREAM_BRANCH=master
+VERSION_ON_UPSTREAM=1
+RELEASED_KERNEL=0
+BUMP_RELEASE=yes
+INCLUDE_FEDORA_FILES=1
+INCLUDE_RHEL_FILES=1
+PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"
+PACKAGE_NAME=kernel
+GIT=git
+HEAD=HEAD
+BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
+BUILD_TARGET=--scratch temp-ark-rhel-8-test
+BUILD_PROFILE=
+BUILD_FLAGS=
+BUILD=6
+PREBUILD_GIT_ONLY=1
+RHGITURL=git@gitlab.com:cki-project/kernel-ark.git
+RHGITCOMMIT=HEAD
+RHJOBS=1
+NO_CONFIGCHECKS=
+RHSELFTESTDATA=
diff --git a/redhat/self-test/data/fedora-df0cc57e057f.el7
b/redhat/self-test/data/fedora-df0cc57e057f.el7
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/self-test/data/fedora-df0cc57e057f.el7
@@ -0,0 +1,100 @@
+.DEFAULT_GOAL=dist-cross-download
+.SHELLSTATUS=0
+ARCHCONFIG=X86_64
+ARCH_LIST=aarch64 ppc64le s390x x86_64
+BUILD_FLAGS=
+BUMP_RELEASE=yes
+CHANGELOG=kernel.changelog-9.99
+CHANGELOG_PREV=kernel.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
+DISTRO=fedora
+DISTRO_BUILD=6
+EARLY_YBUILD=
+EARLY_YRELEASE=
+FLAVOR=
+GITID=df0cc57e057f18e44dac8e6c18aba47ab53202f9
+GNUMAKEFLAGS=
+HEAD=df0cc57e057f
+INCLUDE_FEDORA_FILES=1
+INCLUDE_RHEL_FILES=1
+KABIDW=../redhat/kabi-dwarf
+KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-6.tar.bz2
+KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-6.tar.bz2
+KEXTRAVERSION=
+KVERSION=5.16.0
+LANG=C
+LOCVERFILE=../localversion
+MACH=x86_64
+MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.rhpkg
Makefile.cross
+MAKEFLAGS=w -- HEAD=df0cc57e057f DISTRO=fedora DIST=.el7 RHSELFTESTDATA=1
+MARKER=v5.16
+MERGE_BASE=df0cc57e057f18e44dac8e6c18aba47ab53202f9
+PKGRELEASE=6.test
+PREBUILD=
+PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
+PROCESS_CONFIGS_OPTS=-n -w -c
+REDHAT=../redhat
+RELEASED_KERNEL=0
+RHDISTGIT="ssh://"shadowman"@pkgs.fedoraproject.org/rpms/kernel"
+RHDISTGIT_BRANCH=rawhide
+RHDISTGIT_TMP=/tmp
+RHDISTGIT_USER="shadowman"
+RHEL_MAJOR=9
+RHEL_MINOR=99
+RHEL_RELEASE=6
+RHPKG_BIN=fedpkg
+RHSELFTESTDATA=1
+RPM=../redhat/rpm
+RPMBUILD=rpmbuild
+RPMKEXTRAVERSION=
+RPMKPATCHLEVEL=16
+RPMKSUBLEVEL=0
+RPMKVERSION=5
+RPMVERSION=5.16.0-6.test
+SHELL=/bin/sh
+SINGLE_TARBALL=0
+SNAPSHOT=0
+SOURCES=../redhat/rpm/SOURCES
+SPECFILE=kernel.spec
+SPECRELEASE=6%{?buildid}%{?dist}
+SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-6.test.el7.src.rpm
+SRPMS=../redhat/rpm/SRPMS
+TARBALL=../redhat/linux-5.16.tar.xz
+TARFILE=linux-5.16.tar.xz
+TARFILE_RELEASE=5.16
+TESTPATCH=../redhat/linux-kernel-test.patch
+TOPDIR=..
+UPSTREAM=aa5b537b0ecc16992577b013f11112d54c7ce869
+UPSTREAM_TARBALL_NAME=5.16
+VERSION_ON_UPSTREAM=1
+_OUTPUT=..
+_TAG=v5.16
+__YSTREAM=yes
+__ZSTREAM=no
+DIST_BRANCH="os-build"
+DIST=.el7
+DISTRO=fedora
+UPSTREAM_BRANCH=master
+VERSION_ON_UPSTREAM=1
+RELEASED_KERNEL=0
+BUMP_RELEASE=yes
+INCLUDE_FEDORA_FILES=1
+INCLUDE_RHEL_FILES=1
+PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"
+PACKAGE_NAME=kernel
+GIT=git
+HEAD=HEAD
+BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
+BUILD_TARGET=--scratch temp-ark-rhel-8-test
+BUILD_PROFILE=
+BUILD_FLAGS=
+BUILD=6
+PREBUILD_GIT_ONLY=1
+RHGITURL=git@gitlab.com:cki-project/kernel-ark.git
+RHGITCOMMIT=HEAD
+RHJOBS=1
+NO_CONFIGCHECKS=
+RHSELFTESTDATA=
diff --git a/redhat/self-test/data/fedora-df0cc57e057f.fc25
b/redhat/self-test/data/fedora-df0cc57e057f.fc25
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/self-test/data/fedora-df0cc57e057f.fc25
@@ -0,0 +1,100 @@
+.DEFAULT_GOAL=dist-cross-download
+.SHELLSTATUS=0
+ARCHCONFIG=X86_64
+ARCH_LIST=aarch64 ppc64le s390x x86_64
+BUILD_FLAGS=
+BUMP_RELEASE=yes
+CHANGELOG=kernel.changelog-9.99
+CHANGELOG_PREV=kernel.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
+DISTRO=fedora
+DISTRO_BUILD=6
+EARLY_YBUILD=
+EARLY_YRELEASE=
+FLAVOR=
+GITID=df0cc57e057f18e44dac8e6c18aba47ab53202f9
+GNUMAKEFLAGS=
+HEAD=df0cc57e057f
+INCLUDE_FEDORA_FILES=1
+INCLUDE_RHEL_FILES=1
+KABIDW=../redhat/kabi-dwarf
+KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-6.tar.bz2
+KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-6.tar.bz2
+KEXTRAVERSION=
+KVERSION=5.16.0
+LANG=C
+LOCVERFILE=../localversion
+MACH=x86_64
+MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.rhpkg
Makefile.cross
+MAKEFLAGS=w -- HEAD=df0cc57e057f DISTRO=fedora DIST=.fc25 RHSELFTESTDATA=1
+MARKER=v5.16
+MERGE_BASE=df0cc57e057f18e44dac8e6c18aba47ab53202f9
+PKGRELEASE=6.test
+PREBUILD=
+PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
+PROCESS_CONFIGS_OPTS=-n -w -c
+REDHAT=../redhat
+RELEASED_KERNEL=0
+RHDISTGIT="ssh://"shadowman"@pkgs.fedoraproject.org/rpms/kernel"
+RHDISTGIT_BRANCH=rawhide
+RHDISTGIT_TMP=/tmp
+RHDISTGIT_USER="shadowman"
+RHEL_MAJOR=9
+RHEL_MINOR=99
+RHEL_RELEASE=6
+RHPKG_BIN=fedpkg
+RHSELFTESTDATA=1
+RPM=../redhat/rpm
+RPMBUILD=rpmbuild
+RPMKEXTRAVERSION=
+RPMKPATCHLEVEL=16
+RPMKSUBLEVEL=0
+RPMKVERSION=5
+RPMVERSION=5.16.0-6.test
+SHELL=/bin/sh
+SINGLE_TARBALL=0
+SNAPSHOT=0
+SOURCES=../redhat/rpm/SOURCES
+SPECFILE=kernel.spec
+SPECRELEASE=6%{?buildid}%{?dist}
+SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-6.test.fc25.src.rpm
+SRPMS=../redhat/rpm/SRPMS
+TARBALL=../redhat/linux-5.16.tar.xz
+TARFILE=linux-5.16.tar.xz
+TARFILE_RELEASE=5.16
+TESTPATCH=../redhat/linux-kernel-test.patch
+TOPDIR=..
+UPSTREAM=aa5b537b0ecc16992577b013f11112d54c7ce869
+UPSTREAM_TARBALL_NAME=5.16
+VERSION_ON_UPSTREAM=1
+_OUTPUT=..
+_TAG=v5.16
+__YSTREAM=yes
+__ZSTREAM=no
+DIST_BRANCH="os-build"
+DIST=.fc25
+DISTRO=fedora
+UPSTREAM_BRANCH=master
+VERSION_ON_UPSTREAM=1
+RELEASED_KERNEL=0
+BUMP_RELEASE=yes
+INCLUDE_FEDORA_FILES=1
+INCLUDE_RHEL_FILES=1
+PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"
+PACKAGE_NAME=kernel
+GIT=git
+HEAD=HEAD
+BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
+BUILD_TARGET=--scratch temp-ark-rhel-8-test
+BUILD_PROFILE=
+BUILD_FLAGS=
+BUILD=6
+PREBUILD_GIT_ONLY=1
+RHGITURL=git@gitlab.com:cki-project/kernel-ark.git
+RHGITCOMMIT=HEAD
+RHJOBS=1
+NO_CONFIGCHECKS=
+RHSELFTESTDATA=
diff --git a/redhat/self-test/data/fedora-fce15c45d3fb.el7
b/redhat/self-test/data/fedora-fce15c45d3fb.el7
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/self-test/data/fedora-fce15c45d3fb.el7
@@ -0,0 +1,100 @@
+.DEFAULT_GOAL=dist-cross-download
+.SHELLSTATUS=0
+ARCHCONFIG=X86_64
+ARCH_LIST=aarch64 ppc64le s390x x86_64
+BUILD_FLAGS=
+BUMP_RELEASE=yes
+CHANGELOG=kernel.changelog-9.99
+CHANGELOG_PREV=kernel.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
+DISTRO=fedora
+DISTRO_BUILD=0.rc5.fce15c45d3fb.6
+EARLY_YBUILD=
+EARLY_YRELEASE=
+FLAVOR=
+GITID=fce15c45d3fbd9fc1feaaf3210d8e3f8b33dfd3a
+GNUMAKEFLAGS=
+HEAD=fce15c45d3fb
+INCLUDE_FEDORA_FILES=1
+INCLUDE_RHEL_FILES=1
+KABIDW=../redhat/kabi-dwarf
+KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.fce15c45d3fb.6.tar.bz2
+KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.fce15c45d3fb.6.tar.bz2
+KEXTRAVERSION=.rc5
+KVERSION=5.16.0
+LANG=C
+LOCVERFILE=../localversion
+MACH=x86_64
+MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.rhpkg
Makefile.cross
+MAKEFLAGS=w -- HEAD=fce15c45d3fb DISTRO=fedora DIST=.el7 RHSELFTESTDATA=1
+MARKER=fce15c45d3fb
+MERGE_BASE=fce15c45d3fbd9fc1feaaf3210d8e3f8b33dfd3a
+PKGRELEASE=0.rc5.fce15c45d3fb.6.test
+PREBUILD=0.rc5.fce15c45d3fb.
+PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
+PROCESS_CONFIGS_OPTS=-n -w -c
+REDHAT=../redhat
+RELEASED_KERNEL=0
+RHDISTGIT="ssh://"shadowman"@pkgs.fedoraproject.org/rpms/kernel"
+RHDISTGIT_BRANCH=rawhide
+RHDISTGIT_TMP=/tmp
+RHDISTGIT_USER="shadowman"
+RHEL_MAJOR=9
+RHEL_MINOR=99
+RHEL_RELEASE=6
+RHPKG_BIN=fedpkg
+RHSELFTESTDATA=1
+RPM=../redhat/rpm
+RPMBUILD=rpmbuild
+RPMKEXTRAVERSION=-rc5
+RPMKPATCHLEVEL=16
+RPMKSUBLEVEL=0
+RPMKVERSION=5
+RPMVERSION=5.16.0-0.rc5.fce15c45d3fb.6.test
+SHELL=/bin/sh
+SINGLE_TARBALL=0
+SNAPSHOT=1
+SOURCES=../redhat/rpm/SOURCES
+SPECFILE=kernel.spec
+SPECRELEASE=0.rc5.fce15c45d3fb.6%{?buildid}%{?dist}
+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
+TARFILE_RELEASE=5.16-rc5-1-gfce15c45d3fb
+TESTPATCH=../redhat/linux-kernel-test.patch
+TOPDIR=..
+UPSTREAM=aa5b537b0ecc16992577b013f11112d54c7ce869
+UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fb
+VERSION_ON_UPSTREAM=1
+_OUTPUT=..
+_TAG=v5.16-rc5-1-gfce15c45d3fb
+__YSTREAM=yes
+__ZSTREAM=no
+DIST_BRANCH="os-build"
+DIST=.el7
+DISTRO=fedora
+UPSTREAM_BRANCH=master
+VERSION_ON_UPSTREAM=1
+RELEASED_KERNEL=0
+BUMP_RELEASE=yes
+INCLUDE_FEDORA_FILES=1
+INCLUDE_RHEL_FILES=1
+PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"
+PACKAGE_NAME=kernel
+GIT=git
+HEAD=HEAD
+BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
+BUILD_TARGET=--scratch temp-ark-rhel-8-test
+BUILD_PROFILE=
+BUILD_FLAGS=
+BUILD=6
+PREBUILD_GIT_ONLY=1
+RHGITURL=git@gitlab.com:cki-project/kernel-ark.git
+RHGITCOMMIT=HEAD
+RHJOBS=1
+NO_CONFIGCHECKS=
+RHSELFTESTDATA=
diff --git a/redhat/self-test/data/fedora-fce15c45d3fb.fc25
b/redhat/self-test/data/fedora-fce15c45d3fb.fc25
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/self-test/data/fedora-fce15c45d3fb.fc25
@@ -0,0 +1,100 @@
+.DEFAULT_GOAL=dist-cross-download
+.SHELLSTATUS=0
+ARCHCONFIG=X86_64
+ARCH_LIST=aarch64 ppc64le s390x x86_64
+BUILD_FLAGS=
+BUMP_RELEASE=yes
+CHANGELOG=kernel.changelog-9.99
+CHANGELOG_PREV=kernel.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
+DISTRO=fedora
+DISTRO_BUILD=0.rc5.fce15c45d3fb.6
+EARLY_YBUILD=
+EARLY_YRELEASE=
+FLAVOR=
+GITID=fce15c45d3fbd9fc1feaaf3210d8e3f8b33dfd3a
+GNUMAKEFLAGS=
+HEAD=fce15c45d3fb
+INCLUDE_FEDORA_FILES=1
+INCLUDE_RHEL_FILES=1
+KABIDW=../redhat/kabi-dwarf
+KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.fce15c45d3fb.6.tar.bz2
+KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.fce15c45d3fb.6.tar.bz2
+KEXTRAVERSION=.rc5
+KVERSION=5.16.0
+LANG=C
+LOCVERFILE=../localversion
+MACH=x86_64
+MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.rhpkg
Makefile.cross
+MAKEFLAGS=w -- HEAD=fce15c45d3fb DISTRO=fedora DIST=.fc25 RHSELFTESTDATA=1
+MARKER=fce15c45d3fb
+MERGE_BASE=fce15c45d3fbd9fc1feaaf3210d8e3f8b33dfd3a
+PKGRELEASE=0.rc5.fce15c45d3fb.6.test
+PREBUILD=0.rc5.fce15c45d3fb.
+PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
+PROCESS_CONFIGS_OPTS=-n -w -c
+REDHAT=../redhat
+RELEASED_KERNEL=0
+RHDISTGIT="ssh://"shadowman"@pkgs.fedoraproject.org/rpms/kernel"
+RHDISTGIT_BRANCH=rawhide
+RHDISTGIT_TMP=/tmp
+RHDISTGIT_USER="shadowman"
+RHEL_MAJOR=9
+RHEL_MINOR=99
+RHEL_RELEASE=6
+RHPKG_BIN=fedpkg
+RHSELFTESTDATA=1
+RPM=../redhat/rpm
+RPMBUILD=rpmbuild
+RPMKEXTRAVERSION=-rc5
+RPMKPATCHLEVEL=16
+RPMKSUBLEVEL=0
+RPMKVERSION=5
+RPMVERSION=5.16.0-0.rc5.fce15c45d3fb.6.test
+SHELL=/bin/sh
+SINGLE_TARBALL=0
+SNAPSHOT=1
+SOURCES=../redhat/rpm/SOURCES
+SPECFILE=kernel.spec
+SPECRELEASE=0.rc5.fce15c45d3fb.6%{?buildid}%{?dist}
+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
+TARFILE_RELEASE=5.16-rc5-1-gfce15c45d3fb
+TESTPATCH=../redhat/linux-kernel-test.patch
+TOPDIR=..
+UPSTREAM=aa5b537b0ecc16992577b013f11112d54c7ce869
+UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fb
+VERSION_ON_UPSTREAM=1
+_OUTPUT=..
+_TAG=v5.16-rc5-1-gfce15c45d3fb
+__YSTREAM=yes
+__ZSTREAM=no
+DIST_BRANCH="os-build"
+DIST=.fc25
+DISTRO=fedora
+UPSTREAM_BRANCH=master
+VERSION_ON_UPSTREAM=1
+RELEASED_KERNEL=0
+BUMP_RELEASE=yes
+INCLUDE_FEDORA_FILES=1
+INCLUDE_RHEL_FILES=1
+PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"
+PACKAGE_NAME=kernel
+GIT=git
+HEAD=HEAD
+BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
+BUILD_TARGET=--scratch temp-ark-rhel-8-test
+BUILD_PROFILE=
+BUILD_FLAGS=
+BUILD=6
+PREBUILD_GIT_ONLY=1
+RHGITURL=git@gitlab.com:cki-project/kernel-ark.git
+RHGITCOMMIT=HEAD
+RHJOBS=1
+NO_CONFIGCHECKS=
+RHSELFTESTDATA=
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1706
4:34 p.m.
New subject: [OS-BUILD PATCHv6 2/16] redhat/self-test: Add better
dist-dump-variables test
From: Prarit Bhargava <prarit(a)redhat.com>
redhat/self-test: Add better dist-dump-variables test
The current dist-dump-variables test is not adequate in that it only tests
a small number of fields. Add a test to run create-data.sh and compare
that data against the stored "known good" output in self-test/data.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -29,6 +29,10 @@ endif
REDHAT:=$(TOPDIR)/redhat
include $(TOPDIR)/Makefile.rhelver
+ifndef RHDISTDATADIR
+ RHDISTDATADIR=${REDHAT}/self-test/data
+endif
+
RPMBUILD:=$(shell if [ -x "/usr/bin/rpmbuild" ]; then echo rpmbuild; \
else echo rpm; fi)
@@ -655,7 +659,7 @@ dist-self-test:
fi
dist-self-test-data:
- ./self-test/data/create-data.sh ${REDHAT}/self-test/data
+ ./self-test/data/create-data.sh
dist-help:
@echo 'Cleaning targets:'
diff --git a/redhat/Makefile.variables b/redhat/Makefile.variables
index blahblah..blahblah 100644
--- a/redhat/Makefile.variables
+++ b/redhat/Makefile.variables
@@ -123,3 +123,7 @@ NO_CONFIGCHECKS ?=
# This variable is only used to create self-test data. It should not be
# considered stable and may be changed or removed without warning.
RHSELFTESTDATA ?=
+
+# This variable is used by the redhat/self-tests. It should not be
+# considered stable and my be changed or removed without warning.
+RHDISTDATADIR ?=
diff --git a/redhat/self-test/1005-dist-dump-variables.bats
b/redhat/self-test/1005-dist-dump-variables.bats
index blahblah..blahblah 100644
--- a/redhat/self-test/1005-dist-dump-variables.bats
+++ b/redhat/self-test/1005-dist-dump-variables.bats
@@ -1,57 +1,12 @@
#!/usr/bin/env bats
-function prologue()
-{
- tag=$1
- ofile=$BATS_TMPDIR/$tag.out
- # Have to unset environment variables that may be inherited from supra-make:
- make dist-dump-variables | grep "=" | cut -d"=" -f1 | while read
VAR; do unset "$VAR"; done
- GIT=$BATS_TEST_DIRNAME/egit.sh HEAD=$tag EGIT_OVERRIDE_DESCRIBE=$tag DIST=.fc33 make
dist-dump-variables > $ofile
-}
-
-function checkversion()
-{
- echo "verifying _TAG=$1"
- grep -E "^_TAG=$1" $ofile
- echo "verifying RPMKVERSION=$2"
- grep -E "^RPMKVERSION=$2" $ofile
- echo "verifying RPMPATCHLEVEL=$3"
- grep -E "^RPMKPATCHLEVEL=$3" $ofile
- echo "verifying RPMSUBLEVEL=$4"
- grep -E "^RPMKSUBLEVEL=$4" $ofile
- echo "verifying RPMEXTRAVERSION=$5"
- grep -E "^RPMKEXTRAVERSION=$5" $ofile
- echo "verifying KEXTRAVERSION=$6"
- grep -E "^KEXTRAVERSION=$6" $ofile
- echo "verifying SNAPSHOT=$6"
- grep -E "^SNAPSHOT=$7" $ofile
- status=0
-}
-
-@test "dist-dump-variables v5.8" {
- tag=v5.8
- prologue $tag
- checkversion $tag "5" "8" "0" "" ""
"0"
- [ "$status" = 0 ]
-}
-
-@test "dist-dump-variables v5.8-rc7" {
- tag=v5.8-rc7
- prologue $tag
- checkversion $tag "5" "8" "0" "-rc7"
".rc7" "0"
- [ "$status" = 0 ]
-}
+@test "self-test-data check" {
+ mkdir -p $BATS_TMPDIR/data
+ RHDISTDATADIR=$BATS_TMPDIR/data make dist-self-test-data
-@test "dist-dump-variables v5.8-9-g565674d613d7" {
- tag=v5.8-9-g565674d613d7
- prologue $tag
- checkversion $tag "5" "9" "0" ""
".rc0" "1"
- [ "$status" = 0 ]
-}
+ redhat=$(make dist-dump-variables | grep "REDHAT=" | cut -d"=" -f2 |
xargs)
-@test "dist-dump-variables v5.8-rc5-99-g25ccd24ffd91" {
- tag=v5.8-rc5-99-g25ccd24ffd91
- prologue $tag
- checkversion $tag "5" "8" "0" "-rc5"
".rc5" "1"
- [ "$status" = 0 ]
+ echo "Diffing directories ${redhat}/self-test/data and $BATS_TMPDIR/data"
+ diff -urNp -x create-data.sh ${redhat}/self-test/data $BATS_TMPDIR/data
+ [ -d $BATS_TMPDIR ] && rm -rf $BATS_TMPDIR/data
}
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
@@ -69,7 +69,7 @@ TARFILE=linux-5.16.0-0.rc5.6.test.tar.xz
TARFILE_RELEASE=5.16.0-0.rc5.6.test
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
-UPSTREAM=aa5b537b0ecc16992577b013f11112d54c7ce869
+UPSTREAM=1930a6e739c4b4a654a69164dbe39e554d228915
UPSTREAM_TARBALL_NAME=5.16-rc5
VERSION_ON_UPSTREAM=1
_OUTPUT=..
@@ -95,7 +95,7 @@ BUILD_PROFILE=
BUILD_FLAGS=
BUILD=6
PREBUILD_GIT_ONLY=1
-RHGITURL=git@gitlab.com:cki-project/kernel-ark.git
+RHGITURL=git@gitlab.com:prarit/kernel-ark.git
RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
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
@@ -69,7 +69,7 @@ TARFILE=linux-5.16.0-0.rc5.6.test.tar.xz
TARFILE_RELEASE=5.16.0-0.rc5.6.test
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
-UPSTREAM=aa5b537b0ecc16992577b013f11112d54c7ce869
+UPSTREAM=1930a6e739c4b4a654a69164dbe39e554d228915
UPSTREAM_TARBALL_NAME=5.16-rc5
VERSION_ON_UPSTREAM=1
_OUTPUT=..
@@ -95,7 +95,7 @@ BUILD_PROFILE=
BUILD_FLAGS=
BUILD=6
PREBUILD_GIT_ONLY=1
-RHGITURL=git@gitlab.com:cki-project/kernel-ark.git
+RHGITURL=git@gitlab.com:prarit/kernel-ark.git
RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
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
@@ -69,7 +69,7 @@ TARFILE=linux-5.17.0-0.rc0.78e36f3b0dae.6.test.tar.xz
TARFILE_RELEASE=5.17.0-0.rc0.78e36f3b0dae.6.test
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
-UPSTREAM=aa5b537b0ecc16992577b013f11112d54c7ce869
+UPSTREAM=1930a6e739c4b4a654a69164dbe39e554d228915
UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae
VERSION_ON_UPSTREAM=1
_OUTPUT=..
@@ -95,7 +95,7 @@ BUILD_PROFILE=
BUILD_FLAGS=
BUILD=6
PREBUILD_GIT_ONLY=1
-RHGITURL=git@gitlab.com:cki-project/kernel-ark.git
+RHGITURL=git@gitlab.com:prarit/kernel-ark.git
RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
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
@@ -69,7 +69,7 @@ TARFILE=linux-5.17.0-0.rc0.78e36f3b0dae.6.test.tar.xz
TARFILE_RELEASE=5.17.0-0.rc0.78e36f3b0dae.6.test
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
-UPSTREAM=aa5b537b0ecc16992577b013f11112d54c7ce869
+UPSTREAM=1930a6e739c4b4a654a69164dbe39e554d228915
UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae
VERSION_ON_UPSTREAM=1
_OUTPUT=..
@@ -95,7 +95,7 @@ BUILD_PROFILE=
BUILD_FLAGS=
BUILD=6
PREBUILD_GIT_ONLY=1
-RHGITURL=git@gitlab.com:cki-project/kernel-ark.git
+RHGITURL=git@gitlab.com:prarit/kernel-ark.git
RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
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
@@ -69,7 +69,7 @@ TARFILE=linux-5.16.0-6.test.tar.xz
TARFILE_RELEASE=5.16.0-6.test
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
-UPSTREAM=aa5b537b0ecc16992577b013f11112d54c7ce869
+UPSTREAM=1930a6e739c4b4a654a69164dbe39e554d228915
UPSTREAM_TARBALL_NAME=5.16
VERSION_ON_UPSTREAM=1
_OUTPUT=..
@@ -95,7 +95,7 @@ BUILD_PROFILE=
BUILD_FLAGS=
BUILD=6
PREBUILD_GIT_ONLY=1
-RHGITURL=git@gitlab.com:cki-project/kernel-ark.git
+RHGITURL=git@gitlab.com:prarit/kernel-ark.git
RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
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
@@ -69,7 +69,7 @@ TARFILE=linux-5.16.0-6.test.tar.xz
TARFILE_RELEASE=5.16.0-6.test
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
-UPSTREAM=aa5b537b0ecc16992577b013f11112d54c7ce869
+UPSTREAM=1930a6e739c4b4a654a69164dbe39e554d228915
UPSTREAM_TARBALL_NAME=5.16
VERSION_ON_UPSTREAM=1
_OUTPUT=..
@@ -95,7 +95,7 @@ BUILD_PROFILE=
BUILD_FLAGS=
BUILD=6
PREBUILD_GIT_ONLY=1
-RHGITURL=git@gitlab.com:cki-project/kernel-ark.git
+RHGITURL=git@gitlab.com:prarit/kernel-ark.git
RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
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
@@ -69,7 +69,7 @@ TARFILE=linux-5.16.0-0.rc5.fce15c45d3fb.6.test.tar.xz
TARFILE_RELEASE=5.16.0-0.rc5.fce15c45d3fb.6.test
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
-UPSTREAM=aa5b537b0ecc16992577b013f11112d54c7ce869
+UPSTREAM=1930a6e739c4b4a654a69164dbe39e554d228915
UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fb
VERSION_ON_UPSTREAM=1
_OUTPUT=..
@@ -95,7 +95,7 @@ BUILD_PROFILE=
BUILD_FLAGS=
BUILD=6
PREBUILD_GIT_ONLY=1
-RHGITURL=git@gitlab.com:cki-project/kernel-ark.git
+RHGITURL=git@gitlab.com:prarit/kernel-ark.git
RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
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
@@ -69,7 +69,7 @@ TARFILE=linux-5.16.0-0.rc5.fce15c45d3fb.6.test.tar.xz
TARFILE_RELEASE=5.16.0-0.rc5.fce15c45d3fb.6.test
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
-UPSTREAM=aa5b537b0ecc16992577b013f11112d54c7ce869
+UPSTREAM=1930a6e739c4b4a654a69164dbe39e554d228915
UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fb
VERSION_ON_UPSTREAM=1
_OUTPUT=..
@@ -95,7 +95,7 @@ BUILD_PROFILE=
BUILD_FLAGS=
BUILD=6
PREBUILD_GIT_ONLY=1
-RHGITURL=git@gitlab.com:cki-project/kernel-ark.git
+RHGITURL=git@gitlab.com:prarit/kernel-ark.git
RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
diff --git a/redhat/self-test/data/create-data.sh b/redhat/self-test/data/create-data.sh
index blahblah..blahblah 100755
--- a/redhat/self-test/data/create-data.sh
+++ b/redhat/self-test/data/create-data.sh
@@ -1,7 +1,6 @@
#!/usr/bin/bash
-target_dir=$1
-[ -z "${target_dir}" ] && echo "Missing target directory."
&& exit 1
+[ -z "${RHDISTDATADIR}" ] && echo "ERROR: RHDISTDATADIR
undefined." && exit 1
# This script generates 'dist-dump-variables' output for various configurations
# using known ark commit IDs. It uses this information as well as setting
@@ -15,21 +14,19 @@ target_dir=$1
# fce15c45d3fb := 5.16-rc5 + 2 additional commits
#
-[ -z "$REDHAT" ] && echo "ERROR: execution only supported through
'make dist-self-test-data'" && exit 1
-
for DISTRO in fedora rhel centos
do
for commit in 78e36f3b0dae 2585cf9dfaad df0cc57e057f fce15c45d3fb
do
for DIST in .fc25 .el7
do
- varfilename="${DISTRO}-${commit}${DIST}"
+ varfilename="${RHDISTDATADIR}/${DISTRO}-${commit}${DIST}"
echo "building $varfilename"
# CURDIR is a make special target and cannot be easily changed. Omit
# CURDIR from the output.
- make RHSELFTESTDATA=1 DIST="${DIST}" DISTRO="${DISTRO}"
HEAD=${commit} dist-dump-variables | grep "=" | grep -v CURDIR >&
"${target_dir}"/"${varfilename}"
+ make RHSELFTESTDATA=1 DIST="${DIST}" DISTRO="${DISTRO}"
HEAD=${commit} dist-dump-variables | grep "=" | grep -v CURDIR >&
"${varfilename}"
# When executed from a script, the variables in Makefile.variables are
# listed as having origin 'environment'. This is because the script
@@ -38,7 +35,11 @@ do
# its output. As a workaround, read in the variables and output them to
# the data file.
# shellcheck disable=SC2002
- cat Makefile.variables | grep -v "^#" | sed '/^$/d' | tr -d "
" | awk -F "?=|:=" '{print $1}' | while read -r VAR; do echo
"$VAR=${!VAR}"; done >>
"${target_dir}"/"${varfilename}"
+ cat Makefile.variables | grep -v "^#" | sed '/^$/d' | tr -d "
" | awk -F "?=|:=" '{print $1}' | while read -r VAR
+ do
+ [ "$VAR" == "RHDISTDATADIR" ] && continue
+ echo "$VAR=${!VAR}"
+ done >> "${varfilename}"
done
done
done
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
@@ -67,7 +67,7 @@ TARFILE=linux-5.16-rc5.tar.xz
TARFILE_RELEASE=5.16-rc5
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
-UPSTREAM=aa5b537b0ecc16992577b013f11112d54c7ce869
+UPSTREAM=1930a6e739c4b4a654a69164dbe39e554d228915
UPSTREAM_TARBALL_NAME=5.16-rc5
VERSION_ON_UPSTREAM=1
_OUTPUT=..
@@ -93,7 +93,7 @@ BUILD_PROFILE=
BUILD_FLAGS=
BUILD=6
PREBUILD_GIT_ONLY=1
-RHGITURL=git@gitlab.com:cki-project/kernel-ark.git
+RHGITURL=git@gitlab.com:prarit/kernel-ark.git
RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
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
@@ -67,7 +67,7 @@ TARFILE=linux-5.16-rc5.tar.xz
TARFILE_RELEASE=5.16-rc5
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
-UPSTREAM=aa5b537b0ecc16992577b013f11112d54c7ce869
+UPSTREAM=1930a6e739c4b4a654a69164dbe39e554d228915
UPSTREAM_TARBALL_NAME=5.16-rc5
VERSION_ON_UPSTREAM=1
_OUTPUT=..
@@ -93,7 +93,7 @@ BUILD_PROFILE=
BUILD_FLAGS=
BUILD=6
PREBUILD_GIT_ONLY=1
-RHGITURL=git@gitlab.com:cki-project/kernel-ark.git
+RHGITURL=git@gitlab.com:prarit/kernel-ark.git
RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
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
@@ -67,7 +67,7 @@ TARFILE=linux-5.16-11523-g78e36f3b0dae.tar.xz
TARFILE_RELEASE=5.16-11523-g78e36f3b0dae
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
-UPSTREAM=aa5b537b0ecc16992577b013f11112d54c7ce869
+UPSTREAM=1930a6e739c4b4a654a69164dbe39e554d228915
UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae
VERSION_ON_UPSTREAM=1
_OUTPUT=..
@@ -93,7 +93,7 @@ BUILD_PROFILE=
BUILD_FLAGS=
BUILD=6
PREBUILD_GIT_ONLY=1
-RHGITURL=git@gitlab.com:cki-project/kernel-ark.git
+RHGITURL=git@gitlab.com:prarit/kernel-ark.git
RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
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
@@ -67,7 +67,7 @@ TARFILE=linux-5.16-11523-g78e36f3b0dae.tar.xz
TARFILE_RELEASE=5.16-11523-g78e36f3b0dae
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
-UPSTREAM=aa5b537b0ecc16992577b013f11112d54c7ce869
+UPSTREAM=1930a6e739c4b4a654a69164dbe39e554d228915
UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae
VERSION_ON_UPSTREAM=1
_OUTPUT=..
@@ -93,7 +93,7 @@ BUILD_PROFILE=
BUILD_FLAGS=
BUILD=6
PREBUILD_GIT_ONLY=1
-RHGITURL=git@gitlab.com:cki-project/kernel-ark.git
+RHGITURL=git@gitlab.com:prarit/kernel-ark.git
RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
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
@@ -67,7 +67,7 @@ TARFILE=linux-5.16.tar.xz
TARFILE_RELEASE=5.16
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
-UPSTREAM=aa5b537b0ecc16992577b013f11112d54c7ce869
+UPSTREAM=1930a6e739c4b4a654a69164dbe39e554d228915
UPSTREAM_TARBALL_NAME=5.16
VERSION_ON_UPSTREAM=1
_OUTPUT=..
@@ -93,7 +93,7 @@ BUILD_PROFILE=
BUILD_FLAGS=
BUILD=6
PREBUILD_GIT_ONLY=1
-RHGITURL=git@gitlab.com:cki-project/kernel-ark.git
+RHGITURL=git@gitlab.com:prarit/kernel-ark.git
RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
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
@@ -67,7 +67,7 @@ TARFILE=linux-5.16.tar.xz
TARFILE_RELEASE=5.16
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
-UPSTREAM=aa5b537b0ecc16992577b013f11112d54c7ce869
+UPSTREAM=1930a6e739c4b4a654a69164dbe39e554d228915
UPSTREAM_TARBALL_NAME=5.16
VERSION_ON_UPSTREAM=1
_OUTPUT=..
@@ -93,7 +93,7 @@ BUILD_PROFILE=
BUILD_FLAGS=
BUILD=6
PREBUILD_GIT_ONLY=1
-RHGITURL=git@gitlab.com:cki-project/kernel-ark.git
+RHGITURL=git@gitlab.com:prarit/kernel-ark.git
RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
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
@@ -67,7 +67,7 @@ TARFILE=linux-5.16-rc5-1-gfce15c45d3fb.tar.xz
TARFILE_RELEASE=5.16-rc5-1-gfce15c45d3fb
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
-UPSTREAM=aa5b537b0ecc16992577b013f11112d54c7ce869
+UPSTREAM=1930a6e739c4b4a654a69164dbe39e554d228915
UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fb
VERSION_ON_UPSTREAM=1
_OUTPUT=..
@@ -93,7 +93,7 @@ BUILD_PROFILE=
BUILD_FLAGS=
BUILD=6
PREBUILD_GIT_ONLY=1
-RHGITURL=git@gitlab.com:cki-project/kernel-ark.git
+RHGITURL=git@gitlab.com:prarit/kernel-ark.git
RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
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
@@ -67,7 +67,7 @@ TARFILE=linux-5.16-rc5-1-gfce15c45d3fb.tar.xz
TARFILE_RELEASE=5.16-rc5-1-gfce15c45d3fb
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
-UPSTREAM=aa5b537b0ecc16992577b013f11112d54c7ce869
+UPSTREAM=1930a6e739c4b4a654a69164dbe39e554d228915
UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fb
VERSION_ON_UPSTREAM=1
_OUTPUT=..
@@ -93,7 +93,7 @@ BUILD_PROFILE=
BUILD_FLAGS=
BUILD=6
PREBUILD_GIT_ONLY=1
-RHGITURL=git@gitlab.com:cki-project/kernel-ark.git
+RHGITURL=git@gitlab.com:prarit/kernel-ark.git
RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1706
4:34 p.m.
New subject: [OS-BUILD PATCHv6 3/16] redhat/self-test: Add spec file data
From: Prarit Bhargava <prarit(a)redhat.com>
redhat/self-test: Add spec file data
Add spec file examples for various release types and modify create-data.sh
to create the data. This data will be used as a baseline for testing of
Makefile changes.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.el7.spec
b/redhat/self-test/data/centos-2585cf9dfaad.el7.spec
new file mode 100755
index blahblah..blahblah 100755
--- /dev/null
+++ b/redhat/self-test/data/centos-2585cf9dfaad.el7.spec
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec
b/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec
new file mode 100755
index blahblah..blahblah 100755
--- /dev/null
+++ b/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec
diff --git a/redhat/self-test/data/centos-78e36f3b0dae.el7.spec
b/redhat/self-test/data/centos-78e36f3b0dae.el7.spec
new file mode 100755
index blahblah..blahblah 100755
--- /dev/null
+++ b/redhat/self-test/data/centos-78e36f3b0dae.el7.spec
diff --git a/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec
b/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec
new file mode 100755
index blahblah..blahblah 100755
--- /dev/null
+++ b/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec
diff --git a/redhat/self-test/data/centos-df0cc57e057f.el7.spec
b/redhat/self-test/data/centos-df0cc57e057f.el7.spec
new file mode 100755
index blahblah..blahblah 100755
--- /dev/null
+++ b/redhat/self-test/data/centos-df0cc57e057f.el7.spec
diff --git a/redhat/self-test/data/centos-df0cc57e057f.fc25.spec
b/redhat/self-test/data/centos-df0cc57e057f.fc25.spec
new file mode 100755
index blahblah..blahblah 100755
--- /dev/null
+++ b/redhat/self-test/data/centos-df0cc57e057f.fc25.spec
diff --git a/redhat/self-test/data/centos-fce15c45d3fb.el7.spec
b/redhat/self-test/data/centos-fce15c45d3fb.el7.spec
new file mode 100755
index blahblah..blahblah 100755
--- /dev/null
+++ b/redhat/self-test/data/centos-fce15c45d3fb.el7.spec
diff --git a/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec
b/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec
new file mode 100755
index blahblah..blahblah 100755
--- /dev/null
+++ b/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec
diff --git a/redhat/self-test/data/create-data.sh b/redhat/self-test/data/create-data.sh
index blahblah..blahblah 100755
--- a/redhat/self-test/data/create-data.sh
+++ b/redhat/self-test/data/create-data.sh
@@ -40,6 +40,10 @@ do
[ "$VAR" == "RHDISTDATADIR" ] && continue
echo "$VAR=${!VAR}"
done >> "${varfilename}"
+
+ echo "building ${varfilename}.spec"
+ make RHSELFTESTDATA=1 DIST="${DIST}" DISTRO="${DISTRO}"
HEAD=${commit} setup-source
+ cp "${SOURCES}"/kernel.spec "${varfilename}".spec
done
done
done
diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.el7.spec
b/redhat/self-test/data/fedora-2585cf9dfaad.el7.spec
new file mode 100755
index blahblah..blahblah 100755
--- /dev/null
+++ b/redhat/self-test/data/fedora-2585cf9dfaad.el7.spec
diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec
b/redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec
new file mode 100755
index blahblah..blahblah 100755
--- /dev/null
+++ b/redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec
diff --git a/redhat/self-test/data/fedora-78e36f3b0dae.el7.spec
b/redhat/self-test/data/fedora-78e36f3b0dae.el7.spec
new file mode 100755
index blahblah..blahblah 100755
--- /dev/null
+++ b/redhat/self-test/data/fedora-78e36f3b0dae.el7.spec
diff --git a/redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec
b/redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec
new file mode 100755
index blahblah..blahblah 100755
--- /dev/null
+++ b/redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec
diff --git a/redhat/self-test/data/fedora-df0cc57e057f.el7.spec
b/redhat/self-test/data/fedora-df0cc57e057f.el7.spec
new file mode 100755
index blahblah..blahblah 100755
--- /dev/null
+++ b/redhat/self-test/data/fedora-df0cc57e057f.el7.spec
diff --git a/redhat/self-test/data/fedora-df0cc57e057f.fc25.spec
b/redhat/self-test/data/fedora-df0cc57e057f.fc25.spec
new file mode 100755
index blahblah..blahblah 100755
--- /dev/null
+++ b/redhat/self-test/data/fedora-df0cc57e057f.fc25.spec
diff --git a/redhat/self-test/data/fedora-fce15c45d3fb.el7.spec
b/redhat/self-test/data/fedora-fce15c45d3fb.el7.spec
new file mode 100755
index blahblah..blahblah 100755
--- /dev/null
+++ b/redhat/self-test/data/fedora-fce15c45d3fb.el7.spec
diff --git a/redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec
b/redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec
new file mode 100755
index blahblah..blahblah 100755
--- /dev/null
+++ b/redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec
diff --git a/redhat/self-test/data/rhel-2585cf9dfaad.el7.spec
b/redhat/self-test/data/rhel-2585cf9dfaad.el7.spec
new file mode 100755
index blahblah..blahblah 100755
--- /dev/null
+++ b/redhat/self-test/data/rhel-2585cf9dfaad.el7.spec
diff --git a/redhat/self-test/data/rhel-2585cf9dfaad.fc25.spec
b/redhat/self-test/data/rhel-2585cf9dfaad.fc25.spec
new file mode 100755
index blahblah..blahblah 100755
--- /dev/null
+++ b/redhat/self-test/data/rhel-2585cf9dfaad.fc25.spec
diff --git a/redhat/self-test/data/rhel-78e36f3b0dae.el7.spec
b/redhat/self-test/data/rhel-78e36f3b0dae.el7.spec
new file mode 100755
index blahblah..blahblah 100755
--- /dev/null
+++ b/redhat/self-test/data/rhel-78e36f3b0dae.el7.spec
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1706
4:34 p.m.
New subject: [OS-BUILD PATCHv6 4/16] redhat/genspec.sh: Rearrange genspec.sh
From: Prarit Bhargava <prarit(a)redhat.com>
redhat/genspec.sh: Rearrange genspec.sh
genspec.sh takes a long time to run when executed to create test
examples. The script does three things: creates a changelog, creates a
patch file, and creates the specfile. Reorganize the code so that the
specfile is created first, and exit if the file is created for a test
examples.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
diff --git a/redhat/genspec.sh b/redhat/genspec.sh
index blahblah..blahblah 100755
--- a/redhat/genspec.sh
+++ b/redhat/genspec.sh
@@ -10,6 +10,82 @@ HIDE_UNSUPPORTED_ARCH=1;
LC_TIME=
# STAMP=$(echo $MARKER | cut -f 1 -d '-' | sed -e "s/v//"); # unused
+UPSTREAM=$(git rev-parse -q --verify origin/"${UPSTREAM_BRANCH}" || \
+ git rev-parse -q --verify "${UPSTREAM_BRANCH}")
+
+if [ "$SNAPSHOT" = 0 ]; then
+ # This is based off a tag on Linus's tree (e.g. v5.5 or v5.5-rc5).
+ # Two kernels are built, one with debug configuration and one without.
+ DEBUG_BUILDS_ENABLED=1
+else
+ # All kernels are built with debug configurations.
+ DEBUG_BUILDS_ENABLED=0
+fi
+
+if [ -n "$BUILDID" ]; then
+ BUILDID_DEFINE=$(printf "%%define buildid %s" "$BUILDID")
+else
+ BUILDID_DEFINE="# define buildid .local"
+fi
+
+EXCLUDE_FILES=":(exclude,top).get_maintainer.conf \
+ :(exclude,top).gitattributes \
+ :(exclude,top).gitignore \
+ :(exclude,top).gitlab-ci.yml \
+ :(exclude,top)makefile \
+ :(exclude,top)Makefile.rhelver \
+ :(exclude,top)redhat \
+ :(exclude,top)configs"
+
+# If PATCHLIST_URL is not set to "none", generate Patchlist.changelog file
that
+# holds the shas and commits not included upstream and git commit url.
+PATCHLIST_CHANGELOG=0
+if [ "$PATCHLIST_URL" != "none" ]; then
+ # sed convert
+ # <sha> <description>
+ # to
+ # <ark_commit_url>/<sha>
+ # <sha> <description>
+ #
+ # May need to preserve word splitting in EXCLUDE_FILES
+ # shellcheck disable=SC2086
+ git log --no-merges --pretty=oneline --no-decorate ${UPSTREAM}.. $EXCLUDE_FILES | \
+ sed "s!^\([^ ]*\)!$PATCHLIST_URL/\1\n &!; s!\$!\n!" \
+ > "$SOURCES"/Patchlist.changelog
+ PATCHLIST_CHANGELOG=1
+fi
+
+test -f "$SOURCES/$SPECFILE" &&
+ sed -i -e "
+ /%%CHANGELOG%%/r $SOURCES/$CHANGELOG
+ /%%CHANGELOG%%/d
+ s/%%BUILDID%%/$BUILDID_DEFINE/
+ s/%%RPMKVERSION%%/$RPMKVERSION/
+ s/%%RPMKPATCHLEVEL%%/$RPMKPATCHLEVEL/
+ s/%%RPMKSUBLEVEL%%/$RPMKSUBLEVEL/
+ s/%%PKGRELEASE%%/$PKGRELEASE/
+ s/%%SPECRELEASE%%/$SPECRELEASE/
+ s/%%DISTRO_BUILD%%/$DISTRO_BUILD/
+ s/%%RELEASED_KERNEL%%/$RELEASED_KERNEL/
+ s/%%DEBUG_BUILDS_ENABLED%%/$DEBUG_BUILDS_ENABLED/
+ s/%%INCLUDE_FEDORA_FILES%%/$INCLUDE_FEDORA_FILES/
+ s/%%INCLUDE_RHEL_FILES%%/$INCLUDE_RHEL_FILES/
+ s/%%PATCHLIST_CHANGELOG%%/$PATCHLIST_CHANGELOG/
+ s/%%TARFILE_RELEASE%%/$TARFILE_RELEASE/" "$SOURCES/$SPECFILE"
+
+# We depend on work splitting of BUILDOPTS
+# shellcheck disable=SC2086
+for opt in $BUILDOPTS; do
+ add_opt=
+ [ -z "${opt##+*}" ] && add_opt="_with_${opt#?}"
+ [ -z "${opt##-*}" ] && add_opt="_without_${opt#?}"
+ [ -n "$add_opt" ] && sed -i "s/^\\(# The following build
options\\)/%define $add_opt 1\\n\\1/" "$SOURCES/$SPECFILE"
+done
+
+# The self-test data doesn't currently have tests for the changelog or patch file, so
the
+# rest of the script can be ignored.
+[ -n "$RHSELFTESTDATA" ] && exit 0
+
echo > "$clogf"
lasttag=$(git rev-list --first-parent --grep="^\[redhat\]
kernel-${RPMKVERSION}.${RPMKPATCHLEVEL}" --max-count=1 HEAD)
@@ -25,9 +101,7 @@ if [[ -z $lasttag ]]; then
fi
echo "Gathering new log entries since $lasttag"
# master is expected to track mainline.
-UPSTREAM=$(git rev-parse -q --verify origin/"${UPSTREAM_BRANCH}" || \
- git rev-parse -q --verify "${UPSTREAM_BRANCH}")
-
+
git log --topo-order --reverse --no-merges -z --format="- %s (%an)%n%b" \
^"${UPSTREAM}" "$lasttag".. -- ':!/redhat/rhdocs' |
"${0%/*}"/genlog.py >> "$clogf"
@@ -85,66 +159,6 @@ fi
cat "$clogf.rev" "$SOURCES/$CHANGELOG" > "$clogf.full"
mv -f "$clogf.full" "$SOURCES/$CHANGELOG"
-if [ "$SNAPSHOT" = 0 ]; then
- # This is based off a tag on Linus's tree (e.g. v5.5 or v5.5-rc5).
- # Two kernels are built, one with debug configuration and one without.
- DEBUG_BUILDS_ENABLED=1
-else
- # All kernels are built with debug configurations.
- DEBUG_BUILDS_ENABLED=0
-fi
-
-if [ -n "$BUILDID" ]; then
- BUILDID_DEFINE=$(printf "%%define buildid %s" "$BUILDID")
-else
- BUILDID_DEFINE="# define buildid .local"
-fi
-
-EXCLUDE_FILES=":(exclude,top).get_maintainer.conf \
- :(exclude,top).gitattributes \
- :(exclude,top).gitignore \
- :(exclude,top).gitlab-ci.yml \
- :(exclude,top)makefile \
- :(exclude,top)Makefile.rhelver \
- :(exclude,top)redhat \
- :(exclude,top)configs"
-
-# If PATCHLIST_URL is not set to "none", generate Patchlist.changelog file
that
-# holds the shas and commits not included upstream and git commit url.
-PATCHLIST_CHANGELOG=0
-if [ "$PATCHLIST_URL" != "none" ]; then
- # sed convert
- # <sha> <description>
- # to
- # <ark_commit_url>/<sha>
- # <sha> <description>
- #
- # May need to preserve word splitting in EXCLUDE_FILES
- # shellcheck disable=SC2086
- git log --no-merges --pretty=oneline --no-decorate ${UPSTREAM}.. $EXCLUDE_FILES | \
- sed "s!^\([^ ]*\)!$PATCHLIST_URL/\1\n &!; s!\$!\n!" \
- > "$SOURCES"/Patchlist.changelog
- PATCHLIST_CHANGELOG=1
-fi
-
-test -f "$SOURCES/$SPECFILE" &&
- sed -i -e "
- /%%CHANGELOG%%/r $SOURCES/$CHANGELOG
- /%%CHANGELOG%%/d
- s/%%BUILDID%%/$BUILDID_DEFINE/
- s/%%RPMKVERSION%%/$RPMKVERSION/
- s/%%RPMKPATCHLEVEL%%/$RPMKPATCHLEVEL/
- s/%%RPMKSUBLEVEL%%/$RPMKSUBLEVEL/
- s/%%PKGRELEASE%%/$PKGRELEASE/
- s/%%SPECRELEASE%%/$SPECRELEASE/
- s/%%DISTRO_BUILD%%/$DISTRO_BUILD/
- s/%%RELEASED_KERNEL%%/$RELEASED_KERNEL/
- s/%%DEBUG_BUILDS_ENABLED%%/$DEBUG_BUILDS_ENABLED/
- s/%%INCLUDE_FEDORA_FILES%%/$INCLUDE_FEDORA_FILES/
- s/%%INCLUDE_RHEL_FILES%%/$INCLUDE_RHEL_FILES/
- s/%%PATCHLIST_CHANGELOG%%/$PATCHLIST_CHANGELOG/
- s/%%TARFILE_RELEASE%%/$TARFILE_RELEASE/" "$SOURCES/$SPECFILE"
-
echo "MARKER is $MARKER"
if [ "$SINGLE_TARBALL" = 0 ]; then
@@ -157,13 +171,4 @@ else
touch "${SOURCES}/patch-${RPMKVERSION}.${RPMKPATCHLEVEL}"-redhat.patch
fi
-# We depend on work splitting of BUILDOPTS
-# shellcheck disable=SC2086
-for opt in $BUILDOPTS; do
- add_opt=
- [ -z "${opt##+*}" ] && add_opt="_with_${opt#?}"
- [ -z "${opt##-*}" ] && add_opt="_without_${opt#?}"
- [ -n "$add_opt" ] && sed -i "s/^\\(# The following build
options\\)/%define $add_opt 1\\n\\1/" "$SOURCES/$SPECFILE"
-done
-
rm -f "$clogf"{,.rev,.stripped};
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.el7.spec
b/redhat/self-test/data/centos-2585cf9dfaad.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-2585cf9dfaad.el7.spec
+++ b/redhat/self-test/data/centos-2585cf9dfaad.el7.spec
@@ -3022,18 +3022,6 @@ fi
#
#
%changelog
-* Tue Mar 29 2022 Prarit Bhargava <prarit(a)redhat.com> [5.16.0-0.rc5.6.test]
-- v5.16-rc5 rebase
-- redhat/self-test: Add spec file data (Prarit Bhargava)
-- redhat/self-test: Add better dist-dump-variables test (Prarit Bhargava)
-- redhat/self-test: Add variable test data (Prarit Bhargava)
-- Fedora config updates to fix process_configs (Justin M. Forbes)
-- redhat: Fix release tagging (Prarit Bhargava)
-- redhat/self-test: Fix version tag test (Prarit Bhargava)
-- redhat/self-test: Fix BUILD verification test (Prarit Bhargava)
-- redhat/self-test: Cleanup SRPM related self-tests (Prarit Bhargava)
-- redhat/self-test: Fix shellcheck test (Prarit Bhargava)
-
* Fri Mar 25 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org>
[5.18-0.rc0.34af78c4e616.5]
- redhat/configs: Disable watchdog components (Prarit Bhargava)
- redhat/README.Makefile: Add a Makefile README file (Prarit Bhargava)
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec
b/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec
+++ b/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec
@@ -3022,18 +3022,6 @@ fi
#
#
%changelog
-* Tue Mar 29 2022 Prarit Bhargava <prarit(a)redhat.com> [5.16.0-0.rc5.6.test]
-- v5.16-rc5 rebase
-- redhat/self-test: Add spec file data (Prarit Bhargava)
-- redhat/self-test: Add better dist-dump-variables test (Prarit Bhargava)
-- redhat/self-test: Add variable test data (Prarit Bhargava)
-- Fedora config updates to fix process_configs (Justin M. Forbes)
-- redhat: Fix release tagging (Prarit Bhargava)
-- redhat/self-test: Fix version tag test (Prarit Bhargava)
-- redhat/self-test: Fix BUILD verification test (Prarit Bhargava)
-- redhat/self-test: Cleanup SRPM related self-tests (Prarit Bhargava)
-- redhat/self-test: Fix shellcheck test (Prarit Bhargava)
-
* Fri Mar 25 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org>
[5.18-0.rc0.34af78c4e616.5]
- redhat/configs: Disable watchdog components (Prarit Bhargava)
- redhat/README.Makefile: Add a Makefile README file (Prarit Bhargava)
diff --git a/redhat/self-test/data/centos-78e36f3b0dae.el7.spec
b/redhat/self-test/data/centos-78e36f3b0dae.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-78e36f3b0dae.el7.spec
+++ b/redhat/self-test/data/centos-78e36f3b0dae.el7.spec
@@ -3022,18 +3022,6 @@ fi
#
#
%changelog
-* Tue Mar 29 2022 Prarit Bhargava <prarit(a)redhat.com>
[5.17.0-0.rc0.78e36f3b0dae.6.test]
-- 78e36f3b0dae rebase
-- redhat/self-test: Add spec file data (Prarit Bhargava)
-- redhat/self-test: Add better dist-dump-variables test (Prarit Bhargava)
-- redhat/self-test: Add variable test data (Prarit Bhargava)
-- Fedora config updates to fix process_configs (Justin M. Forbes)
-- redhat: Fix release tagging (Prarit Bhargava)
-- redhat/self-test: Fix version tag test (Prarit Bhargava)
-- redhat/self-test: Fix BUILD verification test (Prarit Bhargava)
-- redhat/self-test: Cleanup SRPM related self-tests (Prarit Bhargava)
-- redhat/self-test: Fix shellcheck test (Prarit Bhargava)
-
* Fri Mar 25 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org>
[5.18-0.rc0.34af78c4e616.5]
- redhat/configs: Disable watchdog components (Prarit Bhargava)
- redhat/README.Makefile: Add a Makefile README file (Prarit Bhargava)
diff --git a/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec
b/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec
+++ b/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec
@@ -3022,18 +3022,6 @@ fi
#
#
%changelog
-* Tue Mar 29 2022 Prarit Bhargava <prarit(a)redhat.com>
[5.17.0-0.rc0.78e36f3b0dae.6.test]
-- 78e36f3b0dae rebase
-- redhat/self-test: Add spec file data (Prarit Bhargava)
-- redhat/self-test: Add better dist-dump-variables test (Prarit Bhargava)
-- redhat/self-test: Add variable test data (Prarit Bhargava)
-- Fedora config updates to fix process_configs (Justin M. Forbes)
-- redhat: Fix release tagging (Prarit Bhargava)
-- redhat/self-test: Fix version tag test (Prarit Bhargava)
-- redhat/self-test: Fix BUILD verification test (Prarit Bhargava)
-- redhat/self-test: Cleanup SRPM related self-tests (Prarit Bhargava)
-- redhat/self-test: Fix shellcheck test (Prarit Bhargava)
-
* Fri Mar 25 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org>
[5.18-0.rc0.34af78c4e616.5]
- redhat/configs: Disable watchdog components (Prarit Bhargava)
- redhat/README.Makefile: Add a Makefile README file (Prarit Bhargava)
diff --git a/redhat/self-test/data/centos-df0cc57e057f.el7.spec
b/redhat/self-test/data/centos-df0cc57e057f.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-df0cc57e057f.el7.spec
+++ b/redhat/self-test/data/centos-df0cc57e057f.el7.spec
@@ -3022,18 +3022,6 @@ fi
#
#
%changelog
-* Tue Mar 29 2022 Prarit Bhargava <prarit(a)redhat.com> [5.16.0-6.test]
-- v5.16 rebase
-- redhat/self-test: Add spec file data (Prarit Bhargava)
-- redhat/self-test: Add better dist-dump-variables test (Prarit Bhargava)
-- redhat/self-test: Add variable test data (Prarit Bhargava)
-- Fedora config updates to fix process_configs (Justin M. Forbes)
-- redhat: Fix release tagging (Prarit Bhargava)
-- redhat/self-test: Fix version tag test (Prarit Bhargava)
-- redhat/self-test: Fix BUILD verification test (Prarit Bhargava)
-- redhat/self-test: Cleanup SRPM related self-tests (Prarit Bhargava)
-- redhat/self-test: Fix shellcheck test (Prarit Bhargava)
-
* Fri Mar 25 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org>
[5.18-0.rc0.34af78c4e616.5]
- redhat/configs: Disable watchdog components (Prarit Bhargava)
- redhat/README.Makefile: Add a Makefile README file (Prarit Bhargava)
diff --git a/redhat/self-test/data/centos-df0cc57e057f.fc25.spec
b/redhat/self-test/data/centos-df0cc57e057f.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-df0cc57e057f.fc25.spec
+++ b/redhat/self-test/data/centos-df0cc57e057f.fc25.spec
@@ -3022,18 +3022,6 @@ fi
#
#
%changelog
-* Tue Mar 29 2022 Prarit Bhargava <prarit(a)redhat.com> [5.16.0-6.test]
-- v5.16 rebase
-- redhat/self-test: Add spec file data (Prarit Bhargava)
-- redhat/self-test: Add better dist-dump-variables test (Prarit Bhargava)
-- redhat/self-test: Add variable test data (Prarit Bhargava)
-- Fedora config updates to fix process_configs (Justin M. Forbes)
-- redhat: Fix release tagging (Prarit Bhargava)
-- redhat/self-test: Fix version tag test (Prarit Bhargava)
-- redhat/self-test: Fix BUILD verification test (Prarit Bhargava)
-- redhat/self-test: Cleanup SRPM related self-tests (Prarit Bhargava)
-- redhat/self-test: Fix shellcheck test (Prarit Bhargava)
-
* Fri Mar 25 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org>
[5.18-0.rc0.34af78c4e616.5]
- redhat/configs: Disable watchdog components (Prarit Bhargava)
- redhat/README.Makefile: Add a Makefile README file (Prarit Bhargava)
diff --git a/redhat/self-test/data/centos-fce15c45d3fb.el7.spec
b/redhat/self-test/data/centos-fce15c45d3fb.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-fce15c45d3fb.el7.spec
+++ b/redhat/self-test/data/centos-fce15c45d3fb.el7.spec
@@ -3022,18 +3022,6 @@ fi
#
#
%changelog
-* Tue Mar 29 2022 Prarit Bhargava <prarit(a)redhat.com>
[5.16.0-0.rc5.fce15c45d3fb.6.test]
-- fce15c45d3fb rebase
-- redhat/self-test: Add spec file data (Prarit Bhargava)
-- redhat/self-test: Add better dist-dump-variables test (Prarit Bhargava)
-- redhat/self-test: Add variable test data (Prarit Bhargava)
-- Fedora config updates to fix process_configs (Justin M. Forbes)
-- redhat: Fix release tagging (Prarit Bhargava)
-- redhat/self-test: Fix version tag test (Prarit Bhargava)
-- redhat/self-test: Fix BUILD verification test (Prarit Bhargava)
-- redhat/self-test: Cleanup SRPM related self-tests (Prarit Bhargava)
-- redhat/self-test: Fix shellcheck test (Prarit Bhargava)
-
* Fri Mar 25 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org>
[5.18-0.rc0.34af78c4e616.5]
- redhat/configs: Disable watchdog components (Prarit Bhargava)
- redhat/README.Makefile: Add a Makefile README file (Prarit Bhargava)
diff --git a/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec
b/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec
+++ b/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec
@@ -3022,18 +3022,6 @@ fi
#
#
%changelog
-* Tue Mar 29 2022 Prarit Bhargava <prarit(a)redhat.com>
[5.16.0-0.rc5.fce15c45d3fb.6.test]
-- fce15c45d3fb rebase
-- redhat/self-test: Add spec file data (Prarit Bhargava)
-- redhat/self-test: Add better dist-dump-variables test (Prarit Bhargava)
-- redhat/self-test: Add variable test data (Prarit Bhargava)
-- Fedora config updates to fix process_configs (Justin M. Forbes)
-- redhat: Fix release tagging (Prarit Bhargava)
-- redhat/self-test: Fix version tag test (Prarit Bhargava)
-- redhat/self-test: Fix BUILD verification test (Prarit Bhargava)
-- redhat/self-test: Cleanup SRPM related self-tests (Prarit Bhargava)
-- redhat/self-test: Fix shellcheck test (Prarit Bhargava)
-
* Fri Mar 25 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org>
[5.18-0.rc0.34af78c4e616.5]
- redhat/configs: Disable watchdog components (Prarit Bhargava)
- redhat/README.Makefile: Add a Makefile README file (Prarit Bhargava)
diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.el7.spec
b/redhat/self-test/data/fedora-2585cf9dfaad.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-2585cf9dfaad.el7.spec
+++ b/redhat/self-test/data/fedora-2585cf9dfaad.el7.spec
@@ -3022,18 +3022,6 @@ fi
#
#
%changelog
-* Tue Mar 29 2022 Prarit Bhargava <prarit(a)redhat.com> [5.16.0-0.rc5.6.test]
-- v5.16-rc5 rebase
-- redhat/self-test: Add spec file data (Prarit Bhargava)
-- redhat/self-test: Add better dist-dump-variables test (Prarit Bhargava)
-- redhat/self-test: Add variable test data (Prarit Bhargava)
-- Fedora config updates to fix process_configs (Justin M. Forbes)
-- redhat: Fix release tagging (Prarit Bhargava)
-- redhat/self-test: Fix version tag test (Prarit Bhargava)
-- redhat/self-test: Fix BUILD verification test (Prarit Bhargava)
-- redhat/self-test: Cleanup SRPM related self-tests (Prarit Bhargava)
-- redhat/self-test: Fix shellcheck test (Prarit Bhargava)
-
* Fri Mar 25 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org>
[5.18-0.rc0.34af78c4e616.5]
- redhat/configs: Disable watchdog components (Prarit Bhargava)
- redhat/README.Makefile: Add a Makefile README file (Prarit Bhargava)
diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec
b/redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec
+++ b/redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec
@@ -3022,18 +3022,6 @@ fi
#
#
%changelog
-* Tue Mar 29 2022 Prarit Bhargava <prarit(a)redhat.com> [5.16.0-0.rc5.6.test]
-- v5.16-rc5 rebase
-- redhat/self-test: Add spec file data (Prarit Bhargava)
-- redhat/self-test: Add better dist-dump-variables test (Prarit Bhargava)
-- redhat/self-test: Add variable test data (Prarit Bhargava)
-- Fedora config updates to fix process_configs (Justin M. Forbes)
-- redhat: Fix release tagging (Prarit Bhargava)
-- redhat/self-test: Fix version tag test (Prarit Bhargava)
-- redhat/self-test: Fix BUILD verification test (Prarit Bhargava)
-- redhat/self-test: Cleanup SRPM related self-tests (Prarit Bhargava)
-- redhat/self-test: Fix shellcheck test (Prarit Bhargava)
-
* Fri Mar 25 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org>
[5.18-0.rc0.34af78c4e616.5]
- redhat/configs: Disable watchdog components (Prarit Bhargava)
- redhat/README.Makefile: Add a Makefile README file (Prarit Bhargava)
diff --git a/redhat/self-test/data/fedora-78e36f3b0dae.el7.spec
b/redhat/self-test/data/fedora-78e36f3b0dae.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-78e36f3b0dae.el7.spec
+++ b/redhat/self-test/data/fedora-78e36f3b0dae.el7.spec
@@ -3022,18 +3022,6 @@ fi
#
#
%changelog
-* Tue Mar 29 2022 Prarit Bhargava <prarit(a)redhat.com>
[5.17.0-0.rc0.78e36f3b0dae.6.test]
-- 78e36f3b0dae rebase
-- redhat/self-test: Add spec file data (Prarit Bhargava)
-- redhat/self-test: Add better dist-dump-variables test (Prarit Bhargava)
-- redhat/self-test: Add variable test data (Prarit Bhargava)
-- Fedora config updates to fix process_configs (Justin M. Forbes)
-- redhat: Fix release tagging (Prarit Bhargava)
-- redhat/self-test: Fix version tag test (Prarit Bhargava)
-- redhat/self-test: Fix BUILD verification test (Prarit Bhargava)
-- redhat/self-test: Cleanup SRPM related self-tests (Prarit Bhargava)
-- redhat/self-test: Fix shellcheck test (Prarit Bhargava)
-
* Fri Mar 25 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org>
[5.18-0.rc0.34af78c4e616.5]
- redhat/configs: Disable watchdog components (Prarit Bhargava)
- redhat/README.Makefile: Add a Makefile README file (Prarit Bhargava)
diff --git a/redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec
b/redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec
+++ b/redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec
@@ -3022,18 +3022,6 @@ fi
#
#
%changelog
-* Tue Mar 29 2022 Prarit Bhargava <prarit(a)redhat.com>
[5.17.0-0.rc0.78e36f3b0dae.6.test]
-- 78e36f3b0dae rebase
-- redhat/self-test: Add spec file data (Prarit Bhargava)
-- redhat/self-test: Add better dist-dump-variables test (Prarit Bhargava)
-- redhat/self-test: Add variable test data (Prarit Bhargava)
-- Fedora config updates to fix process_configs (Justin M. Forbes)
-- redhat: Fix release tagging (Prarit Bhargava)
-- redhat/self-test: Fix version tag test (Prarit Bhargava)
-- redhat/self-test: Fix BUILD verification test (Prarit Bhargava)
-- redhat/self-test: Cleanup SRPM related self-tests (Prarit Bhargava)
-- redhat/self-test: Fix shellcheck test (Prarit Bhargava)
-
* Fri Mar 25 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org>
[5.18-0.rc0.34af78c4e616.5]
- redhat/configs: Disable watchdog components (Prarit Bhargava)
- redhat/README.Makefile: Add a Makefile README file (Prarit Bhargava)
diff --git a/redhat/self-test/data/fedora-df0cc57e057f.el7.spec
b/redhat/self-test/data/fedora-df0cc57e057f.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-df0cc57e057f.el7.spec
+++ b/redhat/self-test/data/fedora-df0cc57e057f.el7.spec
@@ -3022,18 +3022,6 @@ fi
#
#
%changelog
-* Tue Mar 29 2022 Prarit Bhargava <prarit(a)redhat.com> [5.16.0-6.test]
-- v5.16 rebase
-- redhat/self-test: Add spec file data (Prarit Bhargava)
-- redhat/self-test: Add better dist-dump-variables test (Prarit Bhargava)
-- redhat/self-test: Add variable test data (Prarit Bhargava)
-- Fedora config updates to fix process_configs (Justin M. Forbes)
-- redhat: Fix release tagging (Prarit Bhargava)
-- redhat/self-test: Fix version tag test (Prarit Bhargava)
-- redhat/self-test: Fix BUILD verification test (Prarit Bhargava)
-- redhat/self-test: Cleanup SRPM related self-tests (Prarit Bhargava)
-- redhat/self-test: Fix shellcheck test (Prarit Bhargava)
-
* Fri Mar 25 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org>
[5.18-0.rc0.34af78c4e616.5]
- redhat/configs: Disable watchdog components (Prarit Bhargava)
- redhat/README.Makefile: Add a Makefile README file (Prarit Bhargava)
diff --git a/redhat/self-test/data/fedora-df0cc57e057f.fc25.spec
b/redhat/self-test/data/fedora-df0cc57e057f.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-df0cc57e057f.fc25.spec
+++ b/redhat/self-test/data/fedora-df0cc57e057f.fc25.spec
@@ -3022,18 +3022,6 @@ fi
#
#
%changelog
-* Tue Mar 29 2022 Prarit Bhargava <prarit(a)redhat.com> [5.16.0-6.test]
-- v5.16 rebase
-- redhat/self-test: Add spec file data (Prarit Bhargava)
-- redhat/self-test: Add better dist-dump-variables test (Prarit Bhargava)
-- redhat/self-test: Add variable test data (Prarit Bhargava)
-- Fedora config updates to fix process_configs (Justin M. Forbes)
-- redhat: Fix release tagging (Prarit Bhargava)
-- redhat/self-test: Fix version tag test (Prarit Bhargava)
-- redhat/self-test: Fix BUILD verification test (Prarit Bhargava)
-- redhat/self-test: Cleanup SRPM related self-tests (Prarit Bhargava)
-- redhat/self-test: Fix shellcheck test (Prarit Bhargava)
-
* Fri Mar 25 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org>
[5.18-0.rc0.34af78c4e616.5]
- redhat/configs: Disable watchdog components (Prarit Bhargava)
- redhat/README.Makefile: Add a Makefile README file (Prarit Bhargava)
diff --git a/redhat/self-test/data/fedora-fce15c45d3fb.el7.spec
b/redhat/self-test/data/fedora-fce15c45d3fb.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-fce15c45d3fb.el7.spec
+++ b/redhat/self-test/data/fedora-fce15c45d3fb.el7.spec
@@ -3022,18 +3022,6 @@ fi
#
#
%changelog
-* Tue Mar 29 2022 Prarit Bhargava <prarit(a)redhat.com>
[5.16.0-0.rc5.fce15c45d3fb.6.test]
-- fce15c45d3fb rebase
-- redhat/self-test: Add spec file data (Prarit Bhargava)
-- redhat/self-test: Add better dist-dump-variables test (Prarit Bhargava)
-- redhat/self-test: Add variable test data (Prarit Bhargava)
-- Fedora config updates to fix process_configs (Justin M. Forbes)
-- redhat: Fix release tagging (Prarit Bhargava)
-- redhat/self-test: Fix version tag test (Prarit Bhargava)
-- redhat/self-test: Fix BUILD verification test (Prarit Bhargava)
-- redhat/self-test: Cleanup SRPM related self-tests (Prarit Bhargava)
-- redhat/self-test: Fix shellcheck test (Prarit Bhargava)
-
* Fri Mar 25 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org>
[5.18-0.rc0.34af78c4e616.5]
- redhat/configs: Disable watchdog components (Prarit Bhargava)
- redhat/README.Makefile: Add a Makefile README file (Prarit Bhargava)
diff --git a/redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec
b/redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec
+++ b/redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec
@@ -3022,18 +3022,6 @@ fi
#
#
%changelog
-* Tue Mar 29 2022 Prarit Bhargava <prarit(a)redhat.com>
[5.16.0-0.rc5.fce15c45d3fb.6.test]
-- fce15c45d3fb rebase
-- redhat/self-test: Add spec file data (Prarit Bhargava)
-- redhat/self-test: Add better dist-dump-variables test (Prarit Bhargava)
-- redhat/self-test: Add variable test data (Prarit Bhargava)
-- Fedora config updates to fix process_configs (Justin M. Forbes)
-- redhat: Fix release tagging (Prarit Bhargava)
-- redhat/self-test: Fix version tag test (Prarit Bhargava)
-- redhat/self-test: Fix BUILD verification test (Prarit Bhargava)
-- redhat/self-test: Cleanup SRPM related self-tests (Prarit Bhargava)
-- redhat/self-test: Fix shellcheck test (Prarit Bhargava)
-
* Fri Mar 25 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org>
[5.18-0.rc0.34af78c4e616.5]
- redhat/configs: Disable watchdog components (Prarit Bhargava)
- redhat/README.Makefile: Add a Makefile README file (Prarit Bhargava)
diff --git a/redhat/self-test/data/rhel-2585cf9dfaad.el7.spec
b/redhat/self-test/data/rhel-2585cf9dfaad.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/rhel-2585cf9dfaad.el7.spec
+++ b/redhat/self-test/data/rhel-2585cf9dfaad.el7.spec
@@ -3022,18 +3022,6 @@ fi
#
#
%changelog
-* Tue Mar 29 2022 Prarit Bhargava <prarit(a)redhat.com> [5.16.0-0.rc5.6.test]
-- v5.16-rc5 rebase
-- redhat/self-test: Add spec file data (Prarit Bhargava)
-- redhat/self-test: Add better dist-dump-variables test (Prarit Bhargava)
-- redhat/self-test: Add variable test data (Prarit Bhargava)
-- Fedora config updates to fix process_configs (Justin M. Forbes)
-- redhat: Fix release tagging (Prarit Bhargava)
-- redhat/self-test: Fix version tag test (Prarit Bhargava)
-- redhat/self-test: Fix BUILD verification test (Prarit Bhargava)
-- redhat/self-test: Cleanup SRPM related self-tests (Prarit Bhargava)
-- redhat/self-test: Fix shellcheck test (Prarit Bhargava)
-
* Fri Mar 25 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org>
[5.18-0.rc0.34af78c4e616.5]
- redhat/configs: Disable watchdog components (Prarit Bhargava)
- redhat/README.Makefile: Add a Makefile README file (Prarit Bhargava)
diff --git a/redhat/self-test/data/rhel-2585cf9dfaad.fc25.spec
b/redhat/self-test/data/rhel-2585cf9dfaad.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/rhel-2585cf9dfaad.fc25.spec
+++ b/redhat/self-test/data/rhel-2585cf9dfaad.fc25.spec
@@ -3022,18 +3022,6 @@ fi
#
#
%changelog
-* Tue Mar 29 2022 Prarit Bhargava <prarit(a)redhat.com> [5.16.0-0.rc5.6.test]
-- v5.16-rc5 rebase
-- redhat/self-test: Add spec file data (Prarit Bhargava)
-- redhat/self-test: Add better dist-dump-variables test (Prarit Bhargava)
-- redhat/self-test: Add variable test data (Prarit Bhargava)
-- Fedora config updates to fix process_configs (Justin M. Forbes)
-- redhat: Fix release tagging (Prarit Bhargava)
-- redhat/self-test: Fix version tag test (Prarit Bhargava)
-- redhat/self-test: Fix BUILD verification test (Prarit Bhargava)
-- redhat/self-test: Cleanup SRPM related self-tests (Prarit Bhargava)
-- redhat/self-test: Fix shellcheck test (Prarit Bhargava)
-
* Fri Mar 25 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org>
[5.18-0.rc0.34af78c4e616.5]
- redhat/configs: Disable watchdog components (Prarit Bhargava)
- redhat/README.Makefile: Add a Makefile README file (Prarit Bhargava)
diff --git a/redhat/self-test/data/rhel-78e36f3b0dae.el7.spec
b/redhat/self-test/data/rhel-78e36f3b0dae.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/rhel-78e36f3b0dae.el7.spec
+++ b/redhat/self-test/data/rhel-78e36f3b0dae.el7.spec
@@ -3022,18 +3022,6 @@ fi
#
#
%changelog
-* Tue Mar 29 2022 Prarit Bhargava <prarit(a)redhat.com>
[5.17.0-0.rc0.78e36f3b0dae.6.test]
-- 78e36f3b0dae rebase
-- redhat/self-test: Add spec file data (Prarit Bhargava)
-- redhat/self-test: Add better dist-dump-variables test (Prarit Bhargava)
-- redhat/self-test: Add variable test data (Prarit Bhargava)
-- Fedora config updates to fix process_configs (Justin M. Forbes)
-- redhat: Fix release tagging (Prarit Bhargava)
-- redhat/self-test: Fix version tag test (Prarit Bhargava)
-- redhat/self-test: Fix BUILD verification test (Prarit Bhargava)
-- redhat/self-test: Cleanup SRPM related self-tests (Prarit Bhargava)
-- redhat/self-test: Fix shellcheck test (Prarit Bhargava)
-
* Fri Mar 25 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org>
[5.18-0.rc0.34af78c4e616.5]
- redhat/configs: Disable watchdog components (Prarit Bhargava)
- redhat/README.Makefile: Add a Makefile README file (Prarit Bhargava)
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1706
4:34 p.m.
New subject: [OS-BUILD PATCHv6 5/16] redhat/self-test: Remove changelog from spec
files
From: Prarit Bhargava <prarit(a)redhat.com>
redhat/self-test: Remove changelog from spec files
Remove the changelog entries from spec files and replace it with a generic
one line entry. We currently do not have changelog tests, and removing
them at this time will make testing easier.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -453,7 +453,11 @@ setup-source: dist-git-version-check dist-clean-sources
echo "Creating $(CHANGELOG) as copy of $(CHANGELOG_PREV)"; \
cp $(REDHAT)/$(CHANGELOG_PREV) $(REDHAT)/$(CHANGELOG); \
fi
- @cp $(REDHAT)/$(CHANGELOG) $(SOURCES)/$(CHANGELOG)
+ @if [ -z "$(RHSELFTESTDATA)" ]; then \
+ cp $(REDHAT)/$(CHANGELOG) $(SOURCES)/$(CHANGELOG); \
+ else \
+ echo "Mon Mar 28 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org>
[$(RPMVERSION)]" > $(SOURCES)/$(CHANGELOG); \
+ fi
@if [ -z "$(PATCHLIST_URL)" ]; then \
echo "Error: PATCHLIST_URL must be set (to 'none' or any URL)"; \
exit 1; \
diff --git a/redhat/genspec.sh b/redhat/genspec.sh
index blahblah..blahblah 100755
--- a/redhat/genspec.sh
+++ b/redhat/genspec.sh
@@ -83,7 +83,8 @@ for opt in $BUILDOPTS; do
done
# The self-test data doesn't currently have tests for the changelog or patch file, so
the
-# rest of the script can be ignored.
+# rest of the script can be ignored. See redhat/Makefile setup-source target for
related
+# test changes.
[ -n "$RHSELFTESTDATA" ] && exit 0
echo > "$clogf"
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.el7.spec
b/redhat/self-test/data/centos-2585cf9dfaad.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-2585cf9dfaad.el7.spec
+++ b/redhat/self-test/data/centos-2585cf9dfaad.el7.spec
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec
b/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec
+++ b/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec
diff --git a/redhat/self-test/data/centos-78e36f3b0dae.el7.spec
b/redhat/self-test/data/centos-78e36f3b0dae.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-78e36f3b0dae.el7.spec
+++ b/redhat/self-test/data/centos-78e36f3b0dae.el7.spec
diff --git a/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec
b/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec
+++ b/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec
diff --git a/redhat/self-test/data/centos-df0cc57e057f.el7.spec
b/redhat/self-test/data/centos-df0cc57e057f.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-df0cc57e057f.el7.spec
+++ b/redhat/self-test/data/centos-df0cc57e057f.el7.spec
diff --git a/redhat/self-test/data/centos-df0cc57e057f.fc25.spec
b/redhat/self-test/data/centos-df0cc57e057f.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-df0cc57e057f.fc25.spec
+++ b/redhat/self-test/data/centos-df0cc57e057f.fc25.spec
diff --git a/redhat/self-test/data/centos-fce15c45d3fb.el7.spec
b/redhat/self-test/data/centos-fce15c45d3fb.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-fce15c45d3fb.el7.spec
+++ b/redhat/self-test/data/centos-fce15c45d3fb.el7.spec
diff --git a/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec
b/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec
+++ b/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec
diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.el7.spec
b/redhat/self-test/data/fedora-2585cf9dfaad.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-2585cf9dfaad.el7.spec
+++ b/redhat/self-test/data/fedora-2585cf9dfaad.el7.spec
diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec
b/redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec
+++ b/redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec
diff --git a/redhat/self-test/data/fedora-78e36f3b0dae.el7.spec
b/redhat/self-test/data/fedora-78e36f3b0dae.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-78e36f3b0dae.el7.spec
+++ b/redhat/self-test/data/fedora-78e36f3b0dae.el7.spec
diff --git a/redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec
b/redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec
+++ b/redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec
diff --git a/redhat/self-test/data/fedora-df0cc57e057f.el7.spec
b/redhat/self-test/data/fedora-df0cc57e057f.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-df0cc57e057f.el7.spec
+++ b/redhat/self-test/data/fedora-df0cc57e057f.el7.spec
diff --git a/redhat/self-test/data/fedora-df0cc57e057f.fc25.spec
b/redhat/self-test/data/fedora-df0cc57e057f.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-df0cc57e057f.fc25.spec
+++ b/redhat/self-test/data/fedora-df0cc57e057f.fc25.spec
diff --git a/redhat/self-test/data/fedora-fce15c45d3fb.el7.spec
b/redhat/self-test/data/fedora-fce15c45d3fb.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-fce15c45d3fb.el7.spec
+++ b/redhat/self-test/data/fedora-fce15c45d3fb.el7.spec
diff --git a/redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec
b/redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec
+++ b/redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec
diff --git a/redhat/self-test/data/rhel-2585cf9dfaad.el7.spec
b/redhat/self-test/data/rhel-2585cf9dfaad.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/rhel-2585cf9dfaad.el7.spec
+++ b/redhat/self-test/data/rhel-2585cf9dfaad.el7.spec
diff --git a/redhat/self-test/data/rhel-2585cf9dfaad.fc25.spec
b/redhat/self-test/data/rhel-2585cf9dfaad.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/rhel-2585cf9dfaad.fc25.spec
+++ b/redhat/self-test/data/rhel-2585cf9dfaad.fc25.spec
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1706
4:34 p.m.
New subject: [OS-BUILD PATCHv6 6/16] redhat/Makefile.variables: Extend git hash
length to
15
From: Prarit Bhargava <prarit(a)redhat.com>
redhat/Makefile.variables: Extend git hash length to 15
While testing the dist-self-test-data target, dzickus noticed that the git
hash lengths were 13 and not 12 on his output. After discussion, and to
avoid future problems, we have decided to default the hash length to 15.
Extend the git hash length to 15.
Suggested-by: Don Zickus <dzickus(a)redhat.com>
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
diff --git a/redhat/Makefile.variables b/redhat/Makefile.variables
index blahblah..blahblah 100644
--- a/redhat/Makefile.variables
+++ b/redhat/Makefile.variables
@@ -70,7 +70,7 @@ PACKAGE_NAME ?= kernel
# This is the executable for 'git' commands. It is used by the redhat/self-test
# tests to provide testing information on git hashes (see redhat/self-test/egit.sh)
-GIT ?= git
+GIT ?= git -c "core.abbrev=15"
# This is the referenced HEAD commit for git commands and can be used to change
# the "top of tree" commit ID. This is useful in cases where users want to
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
@@ -69,7 +69,7 @@ TARFILE=linux-5.16.0-0.rc5.6.test.tar.xz
TARFILE_RELEASE=5.16.0-0.rc5.6.test
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
-UPSTREAM=1930a6e739c4b4a654a69164dbe39e554d228915
+UPSTREAM=ae085d7f9365de7da27ab5c0d16b12d51ea7fca9
UPSTREAM_TARBALL_NAME=5.16-rc5
VERSION_ON_UPSTREAM=1
_OUTPUT=..
@@ -87,7 +87,7 @@ INCLUDE_FEDORA_FILES=1
INCLUDE_RHEL_FILES=1
PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"
PACKAGE_NAME=kernel
-GIT=git
+GIT=git -c "core.abbrev=15"
HEAD=HEAD
BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
BUILD_TARGET=--scratch temp-ark-rhel-8-test
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.fc25
b/redhat/self-test/data/centos-2585cf9dfaad.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-2585cf9dfaad.fc25
+++ b/redhat/self-test/data/centos-2585cf9dfaad.fc25
@@ -69,7 +69,7 @@ TARFILE=linux-5.16.0-0.rc5.6.test.tar.xz
TARFILE_RELEASE=5.16.0-0.rc5.6.test
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
-UPSTREAM=1930a6e739c4b4a654a69164dbe39e554d228915
+UPSTREAM=ae085d7f9365de7da27ab5c0d16b12d51ea7fca9
UPSTREAM_TARBALL_NAME=5.16-rc5
VERSION_ON_UPSTREAM=1
_OUTPUT=..
@@ -87,7 +87,7 @@ INCLUDE_FEDORA_FILES=1
INCLUDE_RHEL_FILES=1
PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"
PACKAGE_NAME=kernel
-GIT=git
+GIT=git -c "core.abbrev=15"
HEAD=HEAD
BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
BUILD_TARGET=--scratch temp-ark-rhel-8-test
diff --git a/redhat/self-test/data/centos-78e36f3b0dae.el7
b/redhat/self-test/data/centos-78e36f3b0dae.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-78e36f3b0dae.el7
+++ b/redhat/self-test/data/centos-78e36f3b0dae.el7
@@ -12,7 +12,7 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir
../redhat/rpm/SOURCES" --define "_b
CURARCH=x86_64
DIST=.el7
DISTRO=centos
-DISTRO_BUILD=0.rc0.78e36f3b0dae.6
+DISTRO_BUILD=0.rc0.78e36f3b0dae586.6
EARLY_YBUILD=
EARLY_YRELEASE=
FLAVOR=
@@ -23,8 +23,8 @@ HEAD=78e36f3b0dae
INCLUDE_FEDORA_FILES=1
INCLUDE_RHEL_FILES=1
KABIDW=../redhat/kabi-dwarf
-KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae.6.tar.bz2
-KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.tar.bz2
+KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae586.6.tar.bz2
+KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae586.6.tar.bz2
KEXTRAVERSION=.rc0
KVERSION=5.17.0
LANG=C
@@ -32,10 +32,10 @@ LOCVERFILE=../localversion
MACH=x86_64
MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.rhpkg
Makefile.cross
MAKEFLAGS=w -- HEAD=78e36f3b0dae DISTRO=centos DIST=.el7 RHSELFTESTDATA=1
-MARKER=78e36f3b0dae
+MARKER=78e36f3b0dae586
MERGE_BASE=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1
-PKGRELEASE=0.rc0.78e36f3b0dae.6.test
-PREBUILD=0.rc0.78e36f3b0dae.
+PKGRELEASE=0.rc0.78e36f3b0dae586.6.test
+PREBUILD=0.rc0.78e36f3b0dae586.
PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
@@ -55,25 +55,25 @@ RPMKEXTRAVERSION=
RPMKPATCHLEVEL=17
RPMKSUBLEVEL=0
RPMKVERSION=5
-RPMVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test
+RPMVERSION=5.17.0-0.rc0.78e36f3b0dae586.6.test
SHELL=/bin/sh
SINGLE_TARBALL=1
SNAPSHOT=1
SOURCES=../redhat/rpm/SOURCES
SPECFILE=kernel.spec
-SPECRELEASE=0.rc0.78e36f3b0dae.6%{?buildid}%{?dist}
-SRPM=../redhat/rpm/SRPMS/kernel-5.17.0-0.rc0.78e36f3b0dae.6.test.el7.src.rpm
+SPECRELEASE=0.rc0.78e36f3b0dae586.6%{?buildid}%{?dist}
+SRPM=../redhat/rpm/SRPMS/kernel-5.17.0-0.rc0.78e36f3b0dae586.6.test.el7.src.rpm
SRPMS=../redhat/rpm/SRPMS
-TARBALL=../redhat/linux-5.17.0-0.rc0.78e36f3b0dae.6.test.tar.xz
-TARFILE=linux-5.17.0-0.rc0.78e36f3b0dae.6.test.tar.xz
-TARFILE_RELEASE=5.17.0-0.rc0.78e36f3b0dae.6.test
+TARBALL=../redhat/linux-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.xz
+TARFILE=linux-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.xz
+TARFILE_RELEASE=5.17.0-0.rc0.78e36f3b0dae586.6.test
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
-UPSTREAM=1930a6e739c4b4a654a69164dbe39e554d228915
-UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae
+UPSTREAM=ae085d7f9365de7da27ab5c0d16b12d51ea7fca9
+UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae586
VERSION_ON_UPSTREAM=1
_OUTPUT=..
-_TAG=v5.16-11523-g78e36f3b0dae
+_TAG=v5.16-11523-g78e36f3b0dae586
__YSTREAM=yes
__ZSTREAM=no
DIST_BRANCH="os-build"
@@ -87,7 +87,7 @@ INCLUDE_FEDORA_FILES=1
INCLUDE_RHEL_FILES=1
PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"
PACKAGE_NAME=kernel
-GIT=git
+GIT=git -c "core.abbrev=15"
HEAD=HEAD
BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
BUILD_TARGET=--scratch temp-ark-rhel-8-test
diff --git a/redhat/self-test/data/centos-78e36f3b0dae.el7.spec
b/redhat/self-test/data/centos-78e36f3b0dae.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-78e36f3b0dae.el7.spec
+++ b/redhat/self-test/data/centos-78e36f3b0dae.el7.spec
@@ -87,7 +87,7 @@ Summary: The Linux kernel
# the --with-release option overrides this setting.)
%define debugbuildsenabled 0
-%global distro_build 0.rc0.78e36f3b0dae.6
+%global distro_build 0.rc0.78e36f3b0dae586.6
%if 0%{?fedora}
%define secure_boot_arch x86_64
@@ -132,13 +132,13 @@ Summary: The Linux kernel
%define rpmversion 5.17.0
%define patchversion 5.17
-%define pkgrelease 0.rc0.78e36f3b0dae.6.test
+%define pkgrelease 0.rc0.78e36f3b0dae586.6.test
# This is needed to do merge window version magic
%define patchlevel 17
# allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc0.78e36f3b0dae.6%{?buildid}%{?dist}
+%define specrelease 0.rc0.78e36f3b0dae586.6%{?buildid}%{?dist}
%define pkg_release %{specrelease}
@@ -698,7 +698,7 @@ BuildRequires: lld
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.17.0-0.rc0.78e36f3b0dae.6.test.tar.xz
+Source0: linux-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.xz
Source1: Makefile.rhelver
@@ -1394,8 +1394,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.17.0-0.rc0.78e36f3b0dae.6.test -c
-mv linux-5.17.0-0.rc0.78e36f3b0dae.6.test linux-%{KVERREL}
+%setup -q -n kernel-5.17.0-0.rc0.78e36f3b0dae586.6.test -c
+mv linux-5.17.0-0.rc0.78e36f3b0dae586.6.test linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
@@ -3022,7 +3022,7 @@ fi
#
#
%changelog
-Mon Mar 28 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org>
[5.17.0-0.rc0.78e36f3b0dae.6.test]
+Mon Mar 28 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org>
[5.17.0-0.rc0.78e36f3b0dae586.6.test]
###
# The following Emacs magic makes C-c C-e use UTC dates.
diff --git a/redhat/self-test/data/centos-78e36f3b0dae.fc25
b/redhat/self-test/data/centos-78e36f3b0dae.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-78e36f3b0dae.fc25
+++ b/redhat/self-test/data/centos-78e36f3b0dae.fc25
@@ -12,7 +12,7 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir
../redhat/rpm/SOURCES" --define "_b
CURARCH=x86_64
DIST=.fc25
DISTRO=centos
-DISTRO_BUILD=0.rc0.78e36f3b0dae.6
+DISTRO_BUILD=0.rc0.78e36f3b0dae586.6
EARLY_YBUILD=
EARLY_YRELEASE=
FLAVOR=
@@ -23,8 +23,8 @@ HEAD=78e36f3b0dae
INCLUDE_FEDORA_FILES=1
INCLUDE_RHEL_FILES=1
KABIDW=../redhat/kabi-dwarf
-KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae.6.tar.bz2
-KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.tar.bz2
+KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae586.6.tar.bz2
+KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae586.6.tar.bz2
KEXTRAVERSION=.rc0
KVERSION=5.17.0
LANG=C
@@ -32,10 +32,10 @@ LOCVERFILE=../localversion
MACH=x86_64
MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.rhpkg
Makefile.cross
MAKEFLAGS=w -- HEAD=78e36f3b0dae DISTRO=centos DIST=.fc25 RHSELFTESTDATA=1
-MARKER=78e36f3b0dae
+MARKER=78e36f3b0dae586
MERGE_BASE=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1
-PKGRELEASE=0.rc0.78e36f3b0dae.6.test
-PREBUILD=0.rc0.78e36f3b0dae.
+PKGRELEASE=0.rc0.78e36f3b0dae586.6.test
+PREBUILD=0.rc0.78e36f3b0dae586.
PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
@@ -55,25 +55,25 @@ RPMKEXTRAVERSION=
RPMKPATCHLEVEL=17
RPMKSUBLEVEL=0
RPMKVERSION=5
-RPMVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test
+RPMVERSION=5.17.0-0.rc0.78e36f3b0dae586.6.test
SHELL=/bin/sh
SINGLE_TARBALL=1
SNAPSHOT=1
SOURCES=../redhat/rpm/SOURCES
SPECFILE=kernel.spec
-SPECRELEASE=0.rc0.78e36f3b0dae.6%{?buildid}%{?dist}
-SRPM=../redhat/rpm/SRPMS/kernel-5.17.0-0.rc0.78e36f3b0dae.6.test.fc25.src.rpm
+SPECRELEASE=0.rc0.78e36f3b0dae586.6%{?buildid}%{?dist}
+SRPM=../redhat/rpm/SRPMS/kernel-5.17.0-0.rc0.78e36f3b0dae586.6.test.fc25.src.rpm
SRPMS=../redhat/rpm/SRPMS
-TARBALL=../redhat/linux-5.17.0-0.rc0.78e36f3b0dae.6.test.tar.xz
-TARFILE=linux-5.17.0-0.rc0.78e36f3b0dae.6.test.tar.xz
-TARFILE_RELEASE=5.17.0-0.rc0.78e36f3b0dae.6.test
+TARBALL=../redhat/linux-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.xz
+TARFILE=linux-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.xz
+TARFILE_RELEASE=5.17.0-0.rc0.78e36f3b0dae586.6.test
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
-UPSTREAM=1930a6e739c4b4a654a69164dbe39e554d228915
-UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae
+UPSTREAM=ae085d7f9365de7da27ab5c0d16b12d51ea7fca9
+UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae586
VERSION_ON_UPSTREAM=1
_OUTPUT=..
-_TAG=v5.16-11523-g78e36f3b0dae
+_TAG=v5.16-11523-g78e36f3b0dae586
__YSTREAM=yes
__ZSTREAM=no
DIST_BRANCH="os-build"
@@ -87,7 +87,7 @@ INCLUDE_FEDORA_FILES=1
INCLUDE_RHEL_FILES=1
PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"
PACKAGE_NAME=kernel
-GIT=git
+GIT=git -c "core.abbrev=15"
HEAD=HEAD
BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
BUILD_TARGET=--scratch temp-ark-rhel-8-test
diff --git a/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec
b/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec
+++ b/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec
@@ -87,7 +87,7 @@ Summary: The Linux kernel
# the --with-release option overrides this setting.)
%define debugbuildsenabled 0
-%global distro_build 0.rc0.78e36f3b0dae.6
+%global distro_build 0.rc0.78e36f3b0dae586.6
%if 0%{?fedora}
%define secure_boot_arch x86_64
@@ -132,13 +132,13 @@ Summary: The Linux kernel
%define rpmversion 5.17.0
%define patchversion 5.17
-%define pkgrelease 0.rc0.78e36f3b0dae.6.test
+%define pkgrelease 0.rc0.78e36f3b0dae586.6.test
# This is needed to do merge window version magic
%define patchlevel 17
# allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc0.78e36f3b0dae.6%{?buildid}%{?dist}
+%define specrelease 0.rc0.78e36f3b0dae586.6%{?buildid}%{?dist}
%define pkg_release %{specrelease}
@@ -698,7 +698,7 @@ BuildRequires: lld
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.17.0-0.rc0.78e36f3b0dae.6.test.tar.xz
+Source0: linux-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.xz
Source1: Makefile.rhelver
@@ -1394,8 +1394,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.17.0-0.rc0.78e36f3b0dae.6.test -c
-mv linux-5.17.0-0.rc0.78e36f3b0dae.6.test linux-%{KVERREL}
+%setup -q -n kernel-5.17.0-0.rc0.78e36f3b0dae586.6.test -c
+mv linux-5.17.0-0.rc0.78e36f3b0dae586.6.test linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
@@ -3022,7 +3022,7 @@ fi
#
#
%changelog
-Mon Mar 28 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org>
[5.17.0-0.rc0.78e36f3b0dae.6.test]
+Mon Mar 28 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org>
[5.17.0-0.rc0.78e36f3b0dae586.6.test]
###
# The following Emacs magic makes C-c C-e use UTC dates.
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
@@ -69,7 +69,7 @@ TARFILE=linux-5.16.0-6.test.tar.xz
TARFILE_RELEASE=5.16.0-6.test
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
-UPSTREAM=1930a6e739c4b4a654a69164dbe39e554d228915
+UPSTREAM=ae085d7f9365de7da27ab5c0d16b12d51ea7fca9
UPSTREAM_TARBALL_NAME=5.16
VERSION_ON_UPSTREAM=1
_OUTPUT=..
@@ -87,7 +87,7 @@ INCLUDE_FEDORA_FILES=1
INCLUDE_RHEL_FILES=1
PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"
PACKAGE_NAME=kernel
-GIT=git
+GIT=git -c "core.abbrev=15"
HEAD=HEAD
BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
BUILD_TARGET=--scratch temp-ark-rhel-8-test
diff --git a/redhat/self-test/data/centos-df0cc57e057f.fc25
b/redhat/self-test/data/centos-df0cc57e057f.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-df0cc57e057f.fc25
+++ b/redhat/self-test/data/centos-df0cc57e057f.fc25
@@ -69,7 +69,7 @@ TARFILE=linux-5.16.0-6.test.tar.xz
TARFILE_RELEASE=5.16.0-6.test
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
-UPSTREAM=1930a6e739c4b4a654a69164dbe39e554d228915
+UPSTREAM=ae085d7f9365de7da27ab5c0d16b12d51ea7fca9
UPSTREAM_TARBALL_NAME=5.16
VERSION_ON_UPSTREAM=1
_OUTPUT=..
@@ -87,7 +87,7 @@ INCLUDE_FEDORA_FILES=1
INCLUDE_RHEL_FILES=1
PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"
PACKAGE_NAME=kernel
-GIT=git
+GIT=git -c "core.abbrev=15"
HEAD=HEAD
BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
BUILD_TARGET=--scratch temp-ark-rhel-8-test
diff --git a/redhat/self-test/data/centos-fce15c45d3fb.el7
b/redhat/self-test/data/centos-fce15c45d3fb.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-fce15c45d3fb.el7
+++ b/redhat/self-test/data/centos-fce15c45d3fb.el7
@@ -12,7 +12,7 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir
../redhat/rpm/SOURCES" --define "_b
CURARCH=x86_64
DIST=.el7
DISTRO=centos
-DISTRO_BUILD=0.rc5.fce15c45d3fb.6
+DISTRO_BUILD=0.rc5.fce15c45d3fbd9f.6
EARLY_YBUILD=
EARLY_YRELEASE=
FLAVOR=
@@ -23,8 +23,8 @@ HEAD=fce15c45d3fb
INCLUDE_FEDORA_FILES=1
INCLUDE_RHEL_FILES=1
KABIDW=../redhat/kabi-dwarf
-KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.fce15c45d3fb.6.tar.bz2
-KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.fce15c45d3fb.6.tar.bz2
+KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.fce15c45d3fbd9f.6.tar.bz2
+KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.fce15c45d3fbd9f.6.tar.bz2
KEXTRAVERSION=.rc5
KVERSION=5.16.0
LANG=C
@@ -32,10 +32,10 @@ LOCVERFILE=../localversion
MACH=x86_64
MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.rhpkg
Makefile.cross
MAKEFLAGS=w -- HEAD=fce15c45d3fb DISTRO=centos DIST=.el7 RHSELFTESTDATA=1
-MARKER=fce15c45d3fb
+MARKER=fce15c45d3fbd9f
MERGE_BASE=fce15c45d3fbd9fc1feaaf3210d8e3f8b33dfd3a
-PKGRELEASE=0.rc5.fce15c45d3fb.6.test
-PREBUILD=0.rc5.fce15c45d3fb.
+PKGRELEASE=0.rc5.fce15c45d3fbd9f.6.test
+PREBUILD=0.rc5.fce15c45d3fbd9f.
PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
@@ -55,25 +55,25 @@ RPMKEXTRAVERSION=-rc5
RPMKPATCHLEVEL=16
RPMKSUBLEVEL=0
RPMKVERSION=5
-RPMVERSION=5.16.0-0.rc5.fce15c45d3fb.6.test
+RPMVERSION=5.16.0-0.rc5.fce15c45d3fbd9f.6.test
SHELL=/bin/sh
SINGLE_TARBALL=1
SNAPSHOT=1
SOURCES=../redhat/rpm/SOURCES
SPECFILE=kernel.spec
-SPECRELEASE=0.rc5.fce15c45d3fb.6%{?buildid}%{?dist}
-SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.fce15c45d3fb.6.test.el7.src.rpm
+SPECRELEASE=0.rc5.fce15c45d3fbd9f.6%{?buildid}%{?dist}
+SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.el7.src.rpm
SRPMS=../redhat/rpm/SRPMS
-TARBALL=../redhat/linux-5.16.0-0.rc5.fce15c45d3fb.6.test.tar.xz
-TARFILE=linux-5.16.0-0.rc5.fce15c45d3fb.6.test.tar.xz
-TARFILE_RELEASE=5.16.0-0.rc5.fce15c45d3fb.6.test
+TARBALL=../redhat/linux-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.tar.xz
+TARFILE=linux-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.tar.xz
+TARFILE_RELEASE=5.16.0-0.rc5.fce15c45d3fbd9f.6.test
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
-UPSTREAM=1930a6e739c4b4a654a69164dbe39e554d228915
-UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fb
+UPSTREAM=ae085d7f9365de7da27ab5c0d16b12d51ea7fca9
+UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fbd9f
VERSION_ON_UPSTREAM=1
_OUTPUT=..
-_TAG=v5.16-rc5-1-gfce15c45d3fb
+_TAG=v5.16-rc5-1-gfce15c45d3fbd9f
__YSTREAM=yes
__ZSTREAM=no
DIST_BRANCH="os-build"
@@ -87,7 +87,7 @@ INCLUDE_FEDORA_FILES=1
INCLUDE_RHEL_FILES=1
PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"
PACKAGE_NAME=kernel
-GIT=git
+GIT=git -c "core.abbrev=15"
HEAD=HEAD
BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
BUILD_TARGET=--scratch temp-ark-rhel-8-test
diff --git a/redhat/self-test/data/centos-fce15c45d3fb.el7.spec
b/redhat/self-test/data/centos-fce15c45d3fb.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-fce15c45d3fb.el7.spec
+++ b/redhat/self-test/data/centos-fce15c45d3fb.el7.spec
@@ -87,7 +87,7 @@ Summary: The Linux kernel
# the --with-release option overrides this setting.)
%define debugbuildsenabled 0
-%global distro_build 0.rc5.fce15c45d3fb.6
+%global distro_build 0.rc5.fce15c45d3fbd9f.6
%if 0%{?fedora}
%define secure_boot_arch x86_64
@@ -132,13 +132,13 @@ Summary: The Linux kernel
%define rpmversion 5.16.0
%define patchversion 5.16
-%define pkgrelease 0.rc5.fce15c45d3fb.6.test
+%define pkgrelease 0.rc5.fce15c45d3fbd9f.6.test
# This is needed to do merge window version magic
%define patchlevel 16
# allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc5.fce15c45d3fb.6%{?buildid}%{?dist}
+%define specrelease 0.rc5.fce15c45d3fbd9f.6%{?buildid}%{?dist}
%define pkg_release %{specrelease}
@@ -698,7 +698,7 @@ BuildRequires: lld
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.16.0-0.rc5.fce15c45d3fb.6.test.tar.xz
+Source0: linux-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.tar.xz
Source1: Makefile.rhelver
@@ -1394,8 +1394,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.16.0-0.rc5.fce15c45d3fb.6.test -c
-mv linux-5.16.0-0.rc5.fce15c45d3fb.6.test linux-%{KVERREL}
+%setup -q -n kernel-5.16.0-0.rc5.fce15c45d3fbd9f.6.test -c
+mv linux-5.16.0-0.rc5.fce15c45d3fbd9f.6.test linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
@@ -3022,7 +3022,7 @@ fi
#
#
%changelog
-Mon Mar 28 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org>
[5.16.0-0.rc5.fce15c45d3fb.6.test]
+Mon Mar 28 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org>
[5.16.0-0.rc5.fce15c45d3fbd9f.6.test]
###
# The following Emacs magic makes C-c C-e use UTC dates.
diff --git a/redhat/self-test/data/centos-fce15c45d3fb.fc25
b/redhat/self-test/data/centos-fce15c45d3fb.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-fce15c45d3fb.fc25
+++ b/redhat/self-test/data/centos-fce15c45d3fb.fc25
@@ -12,7 +12,7 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir
../redhat/rpm/SOURCES" --define "_b
CURARCH=x86_64
DIST=.fc25
DISTRO=centos
-DISTRO_BUILD=0.rc5.fce15c45d3fb.6
+DISTRO_BUILD=0.rc5.fce15c45d3fbd9f.6
EARLY_YBUILD=
EARLY_YRELEASE=
FLAVOR=
@@ -23,8 +23,8 @@ HEAD=fce15c45d3fb
INCLUDE_FEDORA_FILES=1
INCLUDE_RHEL_FILES=1
KABIDW=../redhat/kabi-dwarf
-KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.fce15c45d3fb.6.tar.bz2
-KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.fce15c45d3fb.6.tar.bz2
+KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.fce15c45d3fbd9f.6.tar.bz2
+KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.fce15c45d3fbd9f.6.tar.bz2
KEXTRAVERSION=.rc5
KVERSION=5.16.0
LANG=C
@@ -32,10 +32,10 @@ LOCVERFILE=../localversion
MACH=x86_64
MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.rhpkg
Makefile.cross
MAKEFLAGS=w -- HEAD=fce15c45d3fb DISTRO=centos DIST=.fc25 RHSELFTESTDATA=1
-MARKER=fce15c45d3fb
+MARKER=fce15c45d3fbd9f
MERGE_BASE=fce15c45d3fbd9fc1feaaf3210d8e3f8b33dfd3a
-PKGRELEASE=0.rc5.fce15c45d3fb.6.test
-PREBUILD=0.rc5.fce15c45d3fb.
+PKGRELEASE=0.rc5.fce15c45d3fbd9f.6.test
+PREBUILD=0.rc5.fce15c45d3fbd9f.
PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
@@ -55,25 +55,25 @@ RPMKEXTRAVERSION=-rc5
RPMKPATCHLEVEL=16
RPMKSUBLEVEL=0
RPMKVERSION=5
-RPMVERSION=5.16.0-0.rc5.fce15c45d3fb.6.test
+RPMVERSION=5.16.0-0.rc5.fce15c45d3fbd9f.6.test
SHELL=/bin/sh
SINGLE_TARBALL=1
SNAPSHOT=1
SOURCES=../redhat/rpm/SOURCES
SPECFILE=kernel.spec
-SPECRELEASE=0.rc5.fce15c45d3fb.6%{?buildid}%{?dist}
-SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.fce15c45d3fb.6.test.fc25.src.rpm
+SPECRELEASE=0.rc5.fce15c45d3fbd9f.6%{?buildid}%{?dist}
+SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.fc25.src.rpm
SRPMS=../redhat/rpm/SRPMS
-TARBALL=../redhat/linux-5.16.0-0.rc5.fce15c45d3fb.6.test.tar.xz
-TARFILE=linux-5.16.0-0.rc5.fce15c45d3fb.6.test.tar.xz
-TARFILE_RELEASE=5.16.0-0.rc5.fce15c45d3fb.6.test
+TARBALL=../redhat/linux-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.tar.xz
+TARFILE=linux-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.tar.xz
+TARFILE_RELEASE=5.16.0-0.rc5.fce15c45d3fbd9f.6.test
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
-UPSTREAM=1930a6e739c4b4a654a69164dbe39e554d228915
-UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fb
+UPSTREAM=ae085d7f9365de7da27ab5c0d16b12d51ea7fca9
+UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fbd9f
VERSION_ON_UPSTREAM=1
_OUTPUT=..
-_TAG=v5.16-rc5-1-gfce15c45d3fb
+_TAG=v5.16-rc5-1-gfce15c45d3fbd9f
__YSTREAM=yes
__ZSTREAM=no
DIST_BRANCH="os-build"
@@ -87,7 +87,7 @@ INCLUDE_FEDORA_FILES=1
INCLUDE_RHEL_FILES=1
PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"
PACKAGE_NAME=kernel
-GIT=git
+GIT=git -c "core.abbrev=15"
HEAD=HEAD
BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
BUILD_TARGET=--scratch temp-ark-rhel-8-test
diff --git a/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec
b/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec
+++ b/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec
@@ -87,7 +87,7 @@ Summary: The Linux kernel
# the --with-release option overrides this setting.)
%define debugbuildsenabled 0
-%global distro_build 0.rc5.fce15c45d3fb.6
+%global distro_build 0.rc5.fce15c45d3fbd9f.6
%if 0%{?fedora}
%define secure_boot_arch x86_64
@@ -132,13 +132,13 @@ Summary: The Linux kernel
%define rpmversion 5.16.0
%define patchversion 5.16
-%define pkgrelease 0.rc5.fce15c45d3fb.6.test
+%define pkgrelease 0.rc5.fce15c45d3fbd9f.6.test
# This is needed to do merge window version magic
%define patchlevel 16
# allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc5.fce15c45d3fb.6%{?buildid}%{?dist}
+%define specrelease 0.rc5.fce15c45d3fbd9f.6%{?buildid}%{?dist}
%define pkg_release %{specrelease}
@@ -698,7 +698,7 @@ BuildRequires: lld
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.16.0-0.rc5.fce15c45d3fb.6.test.tar.xz
+Source0: linux-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.tar.xz
Source1: Makefile.rhelver
@@ -1394,8 +1394,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.16.0-0.rc5.fce15c45d3fb.6.test -c
-mv linux-5.16.0-0.rc5.fce15c45d3fb.6.test linux-%{KVERREL}
+%setup -q -n kernel-5.16.0-0.rc5.fce15c45d3fbd9f.6.test -c
+mv linux-5.16.0-0.rc5.fce15c45d3fbd9f.6.test linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
@@ -3022,7 +3022,7 @@ fi
#
#
%changelog
-Mon Mar 28 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org>
[5.16.0-0.rc5.fce15c45d3fb.6.test]
+Mon Mar 28 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org>
[5.16.0-0.rc5.fce15c45d3fbd9f.6.test]
###
# The following Emacs magic makes C-c C-e use UTC dates.
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
@@ -67,7 +67,7 @@ TARFILE=linux-5.16-rc5.tar.xz
TARFILE_RELEASE=5.16-rc5
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
-UPSTREAM=1930a6e739c4b4a654a69164dbe39e554d228915
+UPSTREAM=ae085d7f9365de7da27ab5c0d16b12d51ea7fca9
UPSTREAM_TARBALL_NAME=5.16-rc5
VERSION_ON_UPSTREAM=1
_OUTPUT=..
@@ -85,7 +85,7 @@ INCLUDE_FEDORA_FILES=1
INCLUDE_RHEL_FILES=1
PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"
PACKAGE_NAME=kernel
-GIT=git
+GIT=git -c "core.abbrev=15"
HEAD=HEAD
BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
BUILD_TARGET=--scratch temp-ark-rhel-8-test
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
@@ -67,7 +67,7 @@ TARFILE=linux-5.16-rc5.tar.xz
TARFILE_RELEASE=5.16-rc5
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
-UPSTREAM=1930a6e739c4b4a654a69164dbe39e554d228915
+UPSTREAM=ae085d7f9365de7da27ab5c0d16b12d51ea7fca9
UPSTREAM_TARBALL_NAME=5.16-rc5
VERSION_ON_UPSTREAM=1
_OUTPUT=..
@@ -85,7 +85,7 @@ INCLUDE_FEDORA_FILES=1
INCLUDE_RHEL_FILES=1
PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"
PACKAGE_NAME=kernel
-GIT=git
+GIT=git -c "core.abbrev=15"
HEAD=HEAD
BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
BUILD_TARGET=--scratch temp-ark-rhel-8-test
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
@@ -11,7 +11,7 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir
../redhat/rpm/SOURCES" --define "_b
CURARCH=x86_64
DIST=.el7
DISTRO=fedora
-DISTRO_BUILD=0.rc0.78e36f3b0dae.6
+DISTRO_BUILD=0.rc0.78e36f3b0dae586.6
EARLY_YBUILD=
EARLY_YRELEASE=
FLAVOR=
@@ -21,8 +21,8 @@ HEAD=78e36f3b0dae
INCLUDE_FEDORA_FILES=1
INCLUDE_RHEL_FILES=1
KABIDW=../redhat/kabi-dwarf
-KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae.6.tar.bz2
-KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.tar.bz2
+KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae586.6.tar.bz2
+KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae586.6.tar.bz2
KEXTRAVERSION=.rc0
KVERSION=5.17.0
LANG=C
@@ -30,10 +30,10 @@ LOCVERFILE=../localversion
MACH=x86_64
MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.rhpkg
Makefile.cross
MAKEFLAGS=w -- HEAD=78e36f3b0dae DISTRO=fedora DIST=.el7 RHSELFTESTDATA=1
-MARKER=78e36f3b0dae
+MARKER=78e36f3b0dae586
MERGE_BASE=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1
-PKGRELEASE=0.rc0.78e36f3b0dae.6.test
-PREBUILD=0.rc0.78e36f3b0dae.
+PKGRELEASE=0.rc0.78e36f3b0dae586.6.test
+PREBUILD=0.rc0.78e36f3b0dae586.
PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
@@ -53,25 +53,25 @@ RPMKEXTRAVERSION=
RPMKPATCHLEVEL=17
RPMKSUBLEVEL=0
RPMKVERSION=5
-RPMVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test
+RPMVERSION=5.17.0-0.rc0.78e36f3b0dae586.6.test
SHELL=/bin/sh
SINGLE_TARBALL=0
SNAPSHOT=1
SOURCES=../redhat/rpm/SOURCES
SPECFILE=kernel.spec
-SPECRELEASE=0.rc0.78e36f3b0dae.6%{?buildid}%{?dist}
-SRPM=../redhat/rpm/SRPMS/kernel-5.17.0-0.rc0.78e36f3b0dae.6.test.el7.src.rpm
+SPECRELEASE=0.rc0.78e36f3b0dae586.6%{?buildid}%{?dist}
+SRPM=../redhat/rpm/SRPMS/kernel-5.17.0-0.rc0.78e36f3b0dae586.6.test.el7.src.rpm
SRPMS=../redhat/rpm/SRPMS
-TARBALL=../redhat/linux-5.16-11523-g78e36f3b0dae.tar.xz
-TARFILE=linux-5.16-11523-g78e36f3b0dae.tar.xz
-TARFILE_RELEASE=5.16-11523-g78e36f3b0dae
+TARBALL=../redhat/linux-5.16-11523-g78e36f3b0dae586.tar.xz
+TARFILE=linux-5.16-11523-g78e36f3b0dae586.tar.xz
+TARFILE_RELEASE=5.16-11523-g78e36f3b0dae586
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
-UPSTREAM=1930a6e739c4b4a654a69164dbe39e554d228915
-UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae
+UPSTREAM=ae085d7f9365de7da27ab5c0d16b12d51ea7fca9
+UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae586
VERSION_ON_UPSTREAM=1
_OUTPUT=..
-_TAG=v5.16-11523-g78e36f3b0dae
+_TAG=v5.16-11523-g78e36f3b0dae586
__YSTREAM=yes
__ZSTREAM=no
DIST_BRANCH="os-build"
@@ -85,7 +85,7 @@ INCLUDE_FEDORA_FILES=1
INCLUDE_RHEL_FILES=1
PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"
PACKAGE_NAME=kernel
-GIT=git
+GIT=git -c "core.abbrev=15"
HEAD=HEAD
BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
BUILD_TARGET=--scratch temp-ark-rhel-8-test
diff --git a/redhat/self-test/data/fedora-78e36f3b0dae.el7.spec
b/redhat/self-test/data/fedora-78e36f3b0dae.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-78e36f3b0dae.el7.spec
+++ b/redhat/self-test/data/fedora-78e36f3b0dae.el7.spec
@@ -87,7 +87,7 @@ Summary: The Linux kernel
# the --with-release option overrides this setting.)
%define debugbuildsenabled 0
-%global distro_build 0.rc0.78e36f3b0dae.6
+%global distro_build 0.rc0.78e36f3b0dae586.6
%if 0%{?fedora}
%define secure_boot_arch x86_64
@@ -132,13 +132,13 @@ Summary: The Linux kernel
%define rpmversion 5.17.0
%define patchversion 5.17
-%define pkgrelease 0.rc0.78e36f3b0dae.6.test
+%define pkgrelease 0.rc0.78e36f3b0dae586.6.test
# This is needed to do merge window version magic
%define patchlevel 17
# allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc0.78e36f3b0dae.6%{?buildid}%{?dist}
+%define specrelease 0.rc0.78e36f3b0dae586.6%{?buildid}%{?dist}
%define pkg_release %{specrelease}
@@ -698,7 +698,7 @@ BuildRequires: lld
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.16-11523-g78e36f3b0dae.tar.xz
+Source0: linux-5.16-11523-g78e36f3b0dae586.tar.xz
Source1: Makefile.rhelver
@@ -1394,8 +1394,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.16-11523-g78e36f3b0dae -c
-mv linux-5.16-11523-g78e36f3b0dae linux-%{KVERREL}
+%setup -q -n kernel-5.16-11523-g78e36f3b0dae586 -c
+mv linux-5.16-11523-g78e36f3b0dae586 linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
@@ -3022,7 +3022,7 @@ fi
#
#
%changelog
-Mon Mar 28 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org>
[5.17.0-0.rc0.78e36f3b0dae.6.test]
+Mon Mar 28 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org>
[5.17.0-0.rc0.78e36f3b0dae586.6.test]
###
# The following Emacs magic makes C-c C-e use UTC dates.
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
@@ -11,7 +11,7 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir
../redhat/rpm/SOURCES" --define "_b
CURARCH=x86_64
DIST=.fc25
DISTRO=fedora
-DISTRO_BUILD=0.rc0.78e36f3b0dae.6
+DISTRO_BUILD=0.rc0.78e36f3b0dae586.6
EARLY_YBUILD=
EARLY_YRELEASE=
FLAVOR=
@@ -21,8 +21,8 @@ HEAD=78e36f3b0dae
INCLUDE_FEDORA_FILES=1
INCLUDE_RHEL_FILES=1
KABIDW=../redhat/kabi-dwarf
-KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae.6.tar.bz2
-KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.tar.bz2
+KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae586.6.tar.bz2
+KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae586.6.tar.bz2
KEXTRAVERSION=.rc0
KVERSION=5.17.0
LANG=C
@@ -30,10 +30,10 @@ LOCVERFILE=../localversion
MACH=x86_64
MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.rhpkg
Makefile.cross
MAKEFLAGS=w -- HEAD=78e36f3b0dae DISTRO=fedora DIST=.fc25 RHSELFTESTDATA=1
-MARKER=78e36f3b0dae
+MARKER=78e36f3b0dae586
MERGE_BASE=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1
-PKGRELEASE=0.rc0.78e36f3b0dae.6.test
-PREBUILD=0.rc0.78e36f3b0dae.
+PKGRELEASE=0.rc0.78e36f3b0dae586.6.test
+PREBUILD=0.rc0.78e36f3b0dae586.
PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
@@ -53,25 +53,25 @@ RPMKEXTRAVERSION=
RPMKPATCHLEVEL=17
RPMKSUBLEVEL=0
RPMKVERSION=5
-RPMVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test
+RPMVERSION=5.17.0-0.rc0.78e36f3b0dae586.6.test
SHELL=/bin/sh
SINGLE_TARBALL=0
SNAPSHOT=1
SOURCES=../redhat/rpm/SOURCES
SPECFILE=kernel.spec
-SPECRELEASE=0.rc0.78e36f3b0dae.6%{?buildid}%{?dist}
-SRPM=../redhat/rpm/SRPMS/kernel-5.17.0-0.rc0.78e36f3b0dae.6.test.fc25.src.rpm
+SPECRELEASE=0.rc0.78e36f3b0dae586.6%{?buildid}%{?dist}
+SRPM=../redhat/rpm/SRPMS/kernel-5.17.0-0.rc0.78e36f3b0dae586.6.test.fc25.src.rpm
SRPMS=../redhat/rpm/SRPMS
-TARBALL=../redhat/linux-5.16-11523-g78e36f3b0dae.tar.xz
-TARFILE=linux-5.16-11523-g78e36f3b0dae.tar.xz
-TARFILE_RELEASE=5.16-11523-g78e36f3b0dae
+TARBALL=../redhat/linux-5.16-11523-g78e36f3b0dae586.tar.xz
+TARFILE=linux-5.16-11523-g78e36f3b0dae586.tar.xz
+TARFILE_RELEASE=5.16-11523-g78e36f3b0dae586
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
-UPSTREAM=1930a6e739c4b4a654a69164dbe39e554d228915
-UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae
+UPSTREAM=ae085d7f9365de7da27ab5c0d16b12d51ea7fca9
+UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae586
VERSION_ON_UPSTREAM=1
_OUTPUT=..
-_TAG=v5.16-11523-g78e36f3b0dae
+_TAG=v5.16-11523-g78e36f3b0dae586
__YSTREAM=yes
__ZSTREAM=no
DIST_BRANCH="os-build"
@@ -85,7 +85,7 @@ INCLUDE_FEDORA_FILES=1
INCLUDE_RHEL_FILES=1
PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"
PACKAGE_NAME=kernel
-GIT=git
+GIT=git -c "core.abbrev=15"
HEAD=HEAD
BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
BUILD_TARGET=--scratch temp-ark-rhel-8-test
diff --git a/redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec
b/redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec
+++ b/redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec
@@ -87,7 +87,7 @@ Summary: The Linux kernel
# the --with-release option overrides this setting.)
%define debugbuildsenabled 0
-%global distro_build 0.rc0.78e36f3b0dae.6
+%global distro_build 0.rc0.78e36f3b0dae586.6
%if 0%{?fedora}
%define secure_boot_arch x86_64
@@ -132,13 +132,13 @@ Summary: The Linux kernel
%define rpmversion 5.17.0
%define patchversion 5.17
-%define pkgrelease 0.rc0.78e36f3b0dae.6.test
+%define pkgrelease 0.rc0.78e36f3b0dae586.6.test
# This is needed to do merge window version magic
%define patchlevel 17
# allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc0.78e36f3b0dae.6%{?buildid}%{?dist}
+%define specrelease 0.rc0.78e36f3b0dae586.6%{?buildid}%{?dist}
%define pkg_release %{specrelease}
@@ -698,7 +698,7 @@ BuildRequires: lld
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.16-11523-g78e36f3b0dae.tar.xz
+Source0: linux-5.16-11523-g78e36f3b0dae586.tar.xz
Source1: Makefile.rhelver
@@ -1394,8 +1394,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.16-11523-g78e36f3b0dae -c
-mv linux-5.16-11523-g78e36f3b0dae linux-%{KVERREL}
+%setup -q -n kernel-5.16-11523-g78e36f3b0dae586 -c
+mv linux-5.16-11523-g78e36f3b0dae586 linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
@@ -3022,7 +3022,7 @@ fi
#
#
%changelog
-Mon Mar 28 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org>
[5.17.0-0.rc0.78e36f3b0dae.6.test]
+Mon Mar 28 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org>
[5.17.0-0.rc0.78e36f3b0dae586.6.test]
###
# The following Emacs magic makes C-c C-e use UTC dates.
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
@@ -67,7 +67,7 @@ TARFILE=linux-5.16.tar.xz
TARFILE_RELEASE=5.16
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
-UPSTREAM=1930a6e739c4b4a654a69164dbe39e554d228915
+UPSTREAM=ae085d7f9365de7da27ab5c0d16b12d51ea7fca9
UPSTREAM_TARBALL_NAME=5.16
VERSION_ON_UPSTREAM=1
_OUTPUT=..
@@ -85,7 +85,7 @@ INCLUDE_FEDORA_FILES=1
INCLUDE_RHEL_FILES=1
PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"
PACKAGE_NAME=kernel
-GIT=git
+GIT=git -c "core.abbrev=15"
HEAD=HEAD
BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
BUILD_TARGET=--scratch temp-ark-rhel-8-test
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1706
4:34 p.m.
New subject: [OS-BUILD PATCHv6 7/16] redhat/self-tests: Ignore RHGITURL
From: Prarit Bhargava <prarit(a)redhat.com>
redhat/self-tests: Ignore RHGITURL
While testing, dzickus noticed that his RHGITURL was different from the
RHGITURL in the default data. This is because RHGITURL is dependent on
the user's local git configuration and therefore cannot be guaranteed to
be unique across all users.
Ignore RHGITURL from the data set.
Reported-by: Don Zickus <dzickus(a)redhat.com>
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
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
@@ -95,7 +95,6 @@ BUILD_PROFILE=
BUILD_FLAGS=
BUILD=6
PREBUILD_GIT_ONLY=1
-RHGITURL=git@gitlab.com:prarit/kernel-ark.git
RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
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
@@ -95,7 +95,6 @@ BUILD_PROFILE=
BUILD_FLAGS=
BUILD=6
PREBUILD_GIT_ONLY=1
-RHGITURL=git@gitlab.com:prarit/kernel-ark.git
RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
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
@@ -95,7 +95,6 @@ BUILD_PROFILE=
BUILD_FLAGS=
BUILD=6
PREBUILD_GIT_ONLY=1
-RHGITURL=git@gitlab.com:prarit/kernel-ark.git
RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
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
@@ -95,7 +95,6 @@ BUILD_PROFILE=
BUILD_FLAGS=
BUILD=6
PREBUILD_GIT_ONLY=1
-RHGITURL=git@gitlab.com:prarit/kernel-ark.git
RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
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
@@ -95,7 +95,6 @@ BUILD_PROFILE=
BUILD_FLAGS=
BUILD=6
PREBUILD_GIT_ONLY=1
-RHGITURL=git@gitlab.com:prarit/kernel-ark.git
RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
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
@@ -95,7 +95,6 @@ BUILD_PROFILE=
BUILD_FLAGS=
BUILD=6
PREBUILD_GIT_ONLY=1
-RHGITURL=git@gitlab.com:prarit/kernel-ark.git
RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
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
@@ -95,7 +95,6 @@ BUILD_PROFILE=
BUILD_FLAGS=
BUILD=6
PREBUILD_GIT_ONLY=1
-RHGITURL=git@gitlab.com:prarit/kernel-ark.git
RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
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
@@ -95,7 +95,6 @@ BUILD_PROFILE=
BUILD_FLAGS=
BUILD=6
PREBUILD_GIT_ONLY=1
-RHGITURL=git@gitlab.com:prarit/kernel-ark.git
RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
diff --git a/redhat/self-test/data/create-data.sh b/redhat/self-test/data/create-data.sh
index blahblah..blahblah 100755
--- a/redhat/self-test/data/create-data.sh
+++ b/redhat/self-test/data/create-data.sh
@@ -38,6 +38,7 @@ do
cat Makefile.variables | grep -v "^#" | sed '/^$/d' | tr -d "
" | awk -F "?=|:=" '{print $1}' | while read -r VAR
do
[ "$VAR" == "RHDISTDATADIR" ] && continue
+ [ "$VAR" == "RHGITURL" ] && continue
echo "$VAR=${!VAR}"
done >> "${varfilename}"
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
@@ -93,7 +93,6 @@ BUILD_PROFILE=
BUILD_FLAGS=
BUILD=6
PREBUILD_GIT_ONLY=1
-RHGITURL=git@gitlab.com:prarit/kernel-ark.git
RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
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
@@ -93,7 +93,6 @@ BUILD_PROFILE=
BUILD_FLAGS=
BUILD=6
PREBUILD_GIT_ONLY=1
-RHGITURL=git@gitlab.com:prarit/kernel-ark.git
RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
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
@@ -93,7 +93,6 @@ BUILD_PROFILE=
BUILD_FLAGS=
BUILD=6
PREBUILD_GIT_ONLY=1
-RHGITURL=git@gitlab.com:prarit/kernel-ark.git
RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
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
@@ -93,7 +93,6 @@ BUILD_PROFILE=
BUILD_FLAGS=
BUILD=6
PREBUILD_GIT_ONLY=1
-RHGITURL=git@gitlab.com:prarit/kernel-ark.git
RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
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
@@ -93,7 +93,6 @@ BUILD_PROFILE=
BUILD_FLAGS=
BUILD=6
PREBUILD_GIT_ONLY=1
-RHGITURL=git@gitlab.com:prarit/kernel-ark.git
RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
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
@@ -93,7 +93,6 @@ BUILD_PROFILE=
BUILD_FLAGS=
BUILD=6
PREBUILD_GIT_ONLY=1
-RHGITURL=git@gitlab.com:prarit/kernel-ark.git
RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
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
@@ -93,7 +93,6 @@ BUILD_PROFILE=
BUILD_FLAGS=
BUILD=6
PREBUILD_GIT_ONLY=1
-RHGITURL=git@gitlab.com:prarit/kernel-ark.git
RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
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
@@ -93,7 +93,6 @@ BUILD_PROFILE=
BUILD_FLAGS=
BUILD=6
PREBUILD_GIT_ONLY=1
-RHGITURL=git@gitlab.com:prarit/kernel-ark.git
RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
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
@@ -93,7 +93,6 @@ BUILD_PROFILE=
BUILD_FLAGS=
BUILD=6
PREBUILD_GIT_ONLY=1
-RHGITURL=git@gitlab.com:prarit/kernel-ark.git
RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
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
@@ -93,7 +93,6 @@ BUILD_PROFILE=
BUILD_FLAGS=
BUILD=6
PREBUILD_GIT_ONLY=1
-RHGITURL=git@gitlab.com:prarit/kernel-ark.git
RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
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
@@ -93,7 +93,6 @@ BUILD_PROFILE=
BUILD_FLAGS=
BUILD=6
PREBUILD_GIT_ONLY=1
-RHGITURL=git@gitlab.com:prarit/kernel-ark.git
RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1706
4:34 p.m.
New subject: [OS-BUILD PATCHv6 8/16] redhat/self-tests: Ignore UPSTREAM
From: Prarit Bhargava <prarit(a)redhat.com>
redhat/self-tests: Ignore UPSTREAM
While testing, dzickus noticed that his UPSTREAM was different from the
UPSTREAM in the default data. This is because UPSTREAM is the base
merge commit and will change as the repository is updated.
Ignore UPSTREAM from the data set.
Reported-by: Don Zickus <dzickus(a)redhat.com>
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
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
@@ -69,7 +69,6 @@ TARFILE=linux-5.16.0-0.rc5.6.test.tar.xz
TARFILE_RELEASE=5.16.0-0.rc5.6.test
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
-UPSTREAM=ae085d7f9365de7da27ab5c0d16b12d51ea7fca9
UPSTREAM_TARBALL_NAME=5.16-rc5
VERSION_ON_UPSTREAM=1
_OUTPUT=..
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
@@ -69,7 +69,6 @@ TARFILE=linux-5.16.0-0.rc5.6.test.tar.xz
TARFILE_RELEASE=5.16.0-0.rc5.6.test
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
-UPSTREAM=ae085d7f9365de7da27ab5c0d16b12d51ea7fca9
UPSTREAM_TARBALL_NAME=5.16-rc5
VERSION_ON_UPSTREAM=1
_OUTPUT=..
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
@@ -69,7 +69,6 @@ TARFILE=linux-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.xz
TARFILE_RELEASE=5.17.0-0.rc0.78e36f3b0dae586.6.test
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
-UPSTREAM=ae085d7f9365de7da27ab5c0d16b12d51ea7fca9
UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae586
VERSION_ON_UPSTREAM=1
_OUTPUT=..
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
@@ -69,7 +69,6 @@ TARFILE=linux-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.xz
TARFILE_RELEASE=5.17.0-0.rc0.78e36f3b0dae586.6.test
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
-UPSTREAM=ae085d7f9365de7da27ab5c0d16b12d51ea7fca9
UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae586
VERSION_ON_UPSTREAM=1
_OUTPUT=..
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
@@ -69,7 +69,6 @@ TARFILE=linux-5.16.0-6.test.tar.xz
TARFILE_RELEASE=5.16.0-6.test
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
-UPSTREAM=ae085d7f9365de7da27ab5c0d16b12d51ea7fca9
UPSTREAM_TARBALL_NAME=5.16
VERSION_ON_UPSTREAM=1
_OUTPUT=..
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
@@ -69,7 +69,6 @@ TARFILE=linux-5.16.0-6.test.tar.xz
TARFILE_RELEASE=5.16.0-6.test
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
-UPSTREAM=ae085d7f9365de7da27ab5c0d16b12d51ea7fca9
UPSTREAM_TARBALL_NAME=5.16
VERSION_ON_UPSTREAM=1
_OUTPUT=..
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
@@ -69,7 +69,6 @@ TARFILE=linux-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.tar.xz
TARFILE_RELEASE=5.16.0-0.rc5.fce15c45d3fbd9f.6.test
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
-UPSTREAM=ae085d7f9365de7da27ab5c0d16b12d51ea7fca9
UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fbd9f
VERSION_ON_UPSTREAM=1
_OUTPUT=..
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
@@ -69,7 +69,6 @@ TARFILE=linux-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.tar.xz
TARFILE_RELEASE=5.16.0-0.rc5.fce15c45d3fbd9f.6.test
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
-UPSTREAM=ae085d7f9365de7da27ab5c0d16b12d51ea7fca9
UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fbd9f
VERSION_ON_UPSTREAM=1
_OUTPUT=..
diff --git a/redhat/self-test/data/create-data.sh b/redhat/self-test/data/create-data.sh
index blahblah..blahblah 100755
--- a/redhat/self-test/data/create-data.sh
+++ b/redhat/self-test/data/create-data.sh
@@ -26,7 +26,9 @@ do
# CURDIR is a make special target and cannot be easily changed. Omit
# CURDIR from the output.
- make RHSELFTESTDATA=1 DIST="${DIST}" DISTRO="${DISTRO}"
HEAD=${commit} dist-dump-variables | grep "=" | grep -v CURDIR >&
"${varfilename}"
+ # UPSTREAM is the base merge commit and can change from day-to-day as
+ # the tree is changed. Omit UPSTREAM from the output.
+ make RHSELFTESTDATA=1 DIST="${DIST}" DISTRO="${DISTRO}"
HEAD=${commit} dist-dump-variables | grep "=" | grep -v CURDIR | grep -v -w
UPSTREAM >& "${varfilename}"
# When executed from a script, the variables in Makefile.variables are
# listed as having origin 'environment'. This is because the script
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
@@ -67,7 +67,6 @@ TARFILE=linux-5.16-rc5.tar.xz
TARFILE_RELEASE=5.16-rc5
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
-UPSTREAM=ae085d7f9365de7da27ab5c0d16b12d51ea7fca9
UPSTREAM_TARBALL_NAME=5.16-rc5
VERSION_ON_UPSTREAM=1
_OUTPUT=..
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
@@ -67,7 +67,6 @@ TARFILE=linux-5.16-rc5.tar.xz
TARFILE_RELEASE=5.16-rc5
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
-UPSTREAM=ae085d7f9365de7da27ab5c0d16b12d51ea7fca9
UPSTREAM_TARBALL_NAME=5.16-rc5
VERSION_ON_UPSTREAM=1
_OUTPUT=..
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
@@ -67,7 +67,6 @@ TARFILE=linux-5.16-11523-g78e36f3b0dae586.tar.xz
TARFILE_RELEASE=5.16-11523-g78e36f3b0dae586
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
-UPSTREAM=ae085d7f9365de7da27ab5c0d16b12d51ea7fca9
UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae586
VERSION_ON_UPSTREAM=1
_OUTPUT=..
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
@@ -67,7 +67,6 @@ TARFILE=linux-5.16-11523-g78e36f3b0dae586.tar.xz
TARFILE_RELEASE=5.16-11523-g78e36f3b0dae586
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
-UPSTREAM=ae085d7f9365de7da27ab5c0d16b12d51ea7fca9
UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae586
VERSION_ON_UPSTREAM=1
_OUTPUT=..
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
@@ -67,7 +67,6 @@ TARFILE=linux-5.16.tar.xz
TARFILE_RELEASE=5.16
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
-UPSTREAM=ae085d7f9365de7da27ab5c0d16b12d51ea7fca9
UPSTREAM_TARBALL_NAME=5.16
VERSION_ON_UPSTREAM=1
_OUTPUT=..
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
@@ -67,7 +67,6 @@ TARFILE=linux-5.16.tar.xz
TARFILE_RELEASE=5.16
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
-UPSTREAM=ae085d7f9365de7da27ab5c0d16b12d51ea7fca9
UPSTREAM_TARBALL_NAME=5.16
VERSION_ON_UPSTREAM=1
_OUTPUT=..
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
@@ -67,7 +67,6 @@ TARFILE=linux-5.16-rc5-1-gfce15c45d3fbd9f.tar.xz
TARFILE_RELEASE=5.16-rc5-1-gfce15c45d3fbd9f
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
-UPSTREAM=ae085d7f9365de7da27ab5c0d16b12d51ea7fca9
UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fbd9f
VERSION_ON_UPSTREAM=1
_OUTPUT=..
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
@@ -67,7 +67,6 @@ TARFILE=linux-5.16-rc5-1-gfce15c45d3fbd9f.tar.xz
TARFILE_RELEASE=5.16-rc5-1-gfce15c45d3fbd9f
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
-UPSTREAM=ae085d7f9365de7da27ab5c0d16b12d51ea7fca9
UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fbd9f
VERSION_ON_UPSTREAM=1
_OUTPUT=..
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
@@ -67,7 +67,6 @@ TARFILE=linux-5.16.0-0.rc5.6.test.tar.xz
TARFILE_RELEASE=5.16.0-0.rc5.6.test
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
-UPSTREAM=ae085d7f9365de7da27ab5c0d16b12d51ea7fca9
UPSTREAM_TARBALL_NAME=5.16-rc5
VERSION_ON_UPSTREAM=1
_OUTPUT=..
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
@@ -67,7 +67,6 @@ TARFILE=linux-5.16.0-0.rc5.6.test.tar.xz
TARFILE_RELEASE=5.16.0-0.rc5.6.test
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
-UPSTREAM=ae085d7f9365de7da27ab5c0d16b12d51ea7fca9
UPSTREAM_TARBALL_NAME=5.16-rc5
VERSION_ON_UPSTREAM=1
_OUTPUT=..
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
@@ -67,7 +67,6 @@ TARFILE=linux-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.xz
TARFILE_RELEASE=5.17.0-0.rc0.78e36f3b0dae586.6.test
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
-UPSTREAM=ae085d7f9365de7da27ab5c0d16b12d51ea7fca9
UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae586
VERSION_ON_UPSTREAM=1
_OUTPUT=..
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1706
4:34 p.m.
New subject: [OS-BUILD PATCHv6 9/16] redhat/configs/generate_all_configs.sh: Use
Makefile
variables
From: Prarit Bhargava <prarit(a)redhat.com>
redhat/configs/generate_all_configs.sh: Use Makefile variables
Use Makefile variables in generate_all_configs.sh.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -344,11 +344,11 @@ dist-kabi-dw-check: dist-kabi
@rm -rf $(KABIDW)/base/$(CURARCH).tmp
dist-configs-commit: dist-configs-prep
- +@cd $(REDHAT)/configs; VERSION=$(KVERSION) ./generate_all_configs.sh
"$(FLAVOR)" 1; \
+ +@cd $(REDHAT)/configs; ./generate_all_configs.sh; 1\
./process_configs.sh -z "$(PACKAGE_NAME)" "$(KVERSION)" ""
"$(FLAVOR)" "$(RHJOBS)"
dist-configs: dist-configs-prep
- +@cd $(REDHAT)/configs; VERSION=$(KVERSION) ./generate_all_configs.sh
"$(FLAVOR)" 1; \
+ +@cd $(REDHAT)/configs; ./generate_all_configs.sh; 1\
./process_configs.sh $(PROCESS_CONFIGS_OPTS) "$(PACKAGE_NAME)"
"$(KVERSION)" "" "" "$(RHJOBS)"
dist-fedora-configs: FLAVOR = fedora
diff --git a/redhat/configs/generate_all_configs.sh
b/redhat/configs/generate_all_configs.sh
index blahblah..blahblah 100755
--- a/redhat/configs/generate_all_configs.sh
+++ b/redhat/configs/generate_all_configs.sh
@@ -1,30 +1,24 @@
#!/bin/sh
# Adjusts the configuration options to build the variants correctly
-#
-# arg1: configuration to go in the primary variant
-# arg2: are we only generating debug configs
-
-PRIMARY=$1
-DEBUGBUILDSENABLED=$2
-
-if [ -z "$2" ]; then
+DEBUGBUILDSENABLED=$1
+if [ -z "$DEBUGBUILDSENABLED" ]; then
exit 1
fi
-if [ -z "$PRIMARY" ]; then
- PRIMARY=rhel
+if [ -z "$FLAVOR" ]; then
+ FLAVOR=rhel
fi
-if [ "$PRIMARY" = "fedora" ]; then
+if [ "$FLAVOR" = "fedora" ]; then
SECONDARY=rhel
else
SECONDARY=fedora
fi
-for i in kernel-*-"$PRIMARY".config; do
- NEW=kernel-"$VERSION"-$(echo "$i" | cut -d - -f2- | sed
s/-"$PRIMARY"//)
+for i in kernel-*-"$FLAVOR".config; do
+ NEW=kernel-"$KVERSION"-$(echo "$i" | cut -d - -f2- | sed
s/-"$FLAVOR"//)
#echo $NEW
mv "$i" "$NEW"
done
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100755
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -1451,7 +1451,7 @@ cp %{SOURCE80} .
cp %{SOURCE3000} .
# kernel-local
cp %{SOURCE3001} .
-VERSION=%{version} ./generate_all_configs.sh %{primary_target} %{debugbuildsenabled}
+FLAVOR=%{primary_target} KVERSION=%{version} ./generate_all_configs.sh
%{debugbuildsenabled}
# Merge in any user-provided local config option changes
%ifnarch %nobuildarches
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.el7.spec
b/redhat/self-test/data/centos-2585cf9dfaad.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-2585cf9dfaad.el7.spec
+++ b/redhat/self-test/data/centos-2585cf9dfaad.el7.spec
@@ -1451,7 +1451,7 @@ cp %{SOURCE80} .
cp %{SOURCE3000} .
# kernel-local
cp %{SOURCE3001} .
-VERSION=%{version} ./generate_all_configs.sh %{primary_target} %{debugbuildsenabled}
+FLAVOR=%{primary_target} KVERSION=%{version} ./generate_all_configs.sh
%{debugbuildsenabled}
# Merge in any user-provided local config option changes
%ifnarch %nobuildarches
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec
b/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec
+++ b/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec
@@ -1451,7 +1451,7 @@ cp %{SOURCE80} .
cp %{SOURCE3000} .
# kernel-local
cp %{SOURCE3001} .
-VERSION=%{version} ./generate_all_configs.sh %{primary_target} %{debugbuildsenabled}
+FLAVOR=%{primary_target} KVERSION=%{version} ./generate_all_configs.sh
%{debugbuildsenabled}
# Merge in any user-provided local config option changes
%ifnarch %nobuildarches
diff --git a/redhat/self-test/data/centos-78e36f3b0dae.el7.spec
b/redhat/self-test/data/centos-78e36f3b0dae.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-78e36f3b0dae.el7.spec
+++ b/redhat/self-test/data/centos-78e36f3b0dae.el7.spec
@@ -1451,7 +1451,7 @@ cp %{SOURCE80} .
cp %{SOURCE3000} .
# kernel-local
cp %{SOURCE3001} .
-VERSION=%{version} ./generate_all_configs.sh %{primary_target} %{debugbuildsenabled}
+FLAVOR=%{primary_target} KVERSION=%{version} ./generate_all_configs.sh
%{debugbuildsenabled}
# Merge in any user-provided local config option changes
%ifnarch %nobuildarches
diff --git a/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec
b/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec
+++ b/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec
@@ -1451,7 +1451,7 @@ cp %{SOURCE80} .
cp %{SOURCE3000} .
# kernel-local
cp %{SOURCE3001} .
-VERSION=%{version} ./generate_all_configs.sh %{primary_target} %{debugbuildsenabled}
+FLAVOR=%{primary_target} KVERSION=%{version} ./generate_all_configs.sh
%{debugbuildsenabled}
# Merge in any user-provided local config option changes
%ifnarch %nobuildarches
diff --git a/redhat/self-test/data/centos-df0cc57e057f.el7.spec
b/redhat/self-test/data/centos-df0cc57e057f.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-df0cc57e057f.el7.spec
+++ b/redhat/self-test/data/centos-df0cc57e057f.el7.spec
@@ -1451,7 +1451,7 @@ cp %{SOURCE80} .
cp %{SOURCE3000} .
# kernel-local
cp %{SOURCE3001} .
-VERSION=%{version} ./generate_all_configs.sh %{primary_target} %{debugbuildsenabled}
+FLAVOR=%{primary_target} KVERSION=%{version} ./generate_all_configs.sh
%{debugbuildsenabled}
# Merge in any user-provided local config option changes
%ifnarch %nobuildarches
diff --git a/redhat/self-test/data/centos-df0cc57e057f.fc25.spec
b/redhat/self-test/data/centos-df0cc57e057f.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-df0cc57e057f.fc25.spec
+++ b/redhat/self-test/data/centos-df0cc57e057f.fc25.spec
@@ -1451,7 +1451,7 @@ cp %{SOURCE80} .
cp %{SOURCE3000} .
# kernel-local
cp %{SOURCE3001} .
-VERSION=%{version} ./generate_all_configs.sh %{primary_target} %{debugbuildsenabled}
+FLAVOR=%{primary_target} KVERSION=%{version} ./generate_all_configs.sh
%{debugbuildsenabled}
# Merge in any user-provided local config option changes
%ifnarch %nobuildarches
diff --git a/redhat/self-test/data/centos-fce15c45d3fb.el7.spec
b/redhat/self-test/data/centos-fce15c45d3fb.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-fce15c45d3fb.el7.spec
+++ b/redhat/self-test/data/centos-fce15c45d3fb.el7.spec
@@ -1451,7 +1451,7 @@ cp %{SOURCE80} .
cp %{SOURCE3000} .
# kernel-local
cp %{SOURCE3001} .
-VERSION=%{version} ./generate_all_configs.sh %{primary_target} %{debugbuildsenabled}
+FLAVOR=%{primary_target} KVERSION=%{version} ./generate_all_configs.sh
%{debugbuildsenabled}
# Merge in any user-provided local config option changes
%ifnarch %nobuildarches
diff --git a/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec
b/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec
+++ b/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec
@@ -1451,7 +1451,7 @@ cp %{SOURCE80} .
cp %{SOURCE3000} .
# kernel-local
cp %{SOURCE3001} .
-VERSION=%{version} ./generate_all_configs.sh %{primary_target} %{debugbuildsenabled}
+FLAVOR=%{primary_target} KVERSION=%{version} ./generate_all_configs.sh
%{debugbuildsenabled}
# Merge in any user-provided local config option changes
%ifnarch %nobuildarches
diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.el7.spec
b/redhat/self-test/data/fedora-2585cf9dfaad.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-2585cf9dfaad.el7.spec
+++ b/redhat/self-test/data/fedora-2585cf9dfaad.el7.spec
@@ -1451,7 +1451,7 @@ cp %{SOURCE80} .
cp %{SOURCE3000} .
# kernel-local
cp %{SOURCE3001} .
-VERSION=%{version} ./generate_all_configs.sh %{primary_target} %{debugbuildsenabled}
+FLAVOR=%{primary_target} KVERSION=%{version} ./generate_all_configs.sh
%{debugbuildsenabled}
# Merge in any user-provided local config option changes
%ifnarch %nobuildarches
diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec
b/redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec
+++ b/redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec
@@ -1451,7 +1451,7 @@ cp %{SOURCE80} .
cp %{SOURCE3000} .
# kernel-local
cp %{SOURCE3001} .
-VERSION=%{version} ./generate_all_configs.sh %{primary_target} %{debugbuildsenabled}
+FLAVOR=%{primary_target} KVERSION=%{version} ./generate_all_configs.sh
%{debugbuildsenabled}
# Merge in any user-provided local config option changes
%ifnarch %nobuildarches
diff --git a/redhat/self-test/data/fedora-78e36f3b0dae.el7.spec
b/redhat/self-test/data/fedora-78e36f3b0dae.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-78e36f3b0dae.el7.spec
+++ b/redhat/self-test/data/fedora-78e36f3b0dae.el7.spec
@@ -1451,7 +1451,7 @@ cp %{SOURCE80} .
cp %{SOURCE3000} .
# kernel-local
cp %{SOURCE3001} .
-VERSION=%{version} ./generate_all_configs.sh %{primary_target} %{debugbuildsenabled}
+FLAVOR=%{primary_target} KVERSION=%{version} ./generate_all_configs.sh
%{debugbuildsenabled}
# Merge in any user-provided local config option changes
%ifnarch %nobuildarches
diff --git a/redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec
b/redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec
+++ b/redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec
@@ -1451,7 +1451,7 @@ cp %{SOURCE80} .
cp %{SOURCE3000} .
# kernel-local
cp %{SOURCE3001} .
-VERSION=%{version} ./generate_all_configs.sh %{primary_target} %{debugbuildsenabled}
+FLAVOR=%{primary_target} KVERSION=%{version} ./generate_all_configs.sh
%{debugbuildsenabled}
# Merge in any user-provided local config option changes
%ifnarch %nobuildarches
diff --git a/redhat/self-test/data/fedora-df0cc57e057f.el7.spec
b/redhat/self-test/data/fedora-df0cc57e057f.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-df0cc57e057f.el7.spec
+++ b/redhat/self-test/data/fedora-df0cc57e057f.el7.spec
@@ -1451,7 +1451,7 @@ cp %{SOURCE80} .
cp %{SOURCE3000} .
# kernel-local
cp %{SOURCE3001} .
-VERSION=%{version} ./generate_all_configs.sh %{primary_target} %{debugbuildsenabled}
+FLAVOR=%{primary_target} KVERSION=%{version} ./generate_all_configs.sh
%{debugbuildsenabled}
# Merge in any user-provided local config option changes
%ifnarch %nobuildarches
diff --git a/redhat/self-test/data/fedora-df0cc57e057f.fc25.spec
b/redhat/self-test/data/fedora-df0cc57e057f.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-df0cc57e057f.fc25.spec
+++ b/redhat/self-test/data/fedora-df0cc57e057f.fc25.spec
@@ -1451,7 +1451,7 @@ cp %{SOURCE80} .
cp %{SOURCE3000} .
# kernel-local
cp %{SOURCE3001} .
-VERSION=%{version} ./generate_all_configs.sh %{primary_target} %{debugbuildsenabled}
+FLAVOR=%{primary_target} KVERSION=%{version} ./generate_all_configs.sh
%{debugbuildsenabled}
# Merge in any user-provided local config option changes
%ifnarch %nobuildarches
diff --git a/redhat/self-test/data/fedora-fce15c45d3fb.el7.spec
b/redhat/self-test/data/fedora-fce15c45d3fb.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-fce15c45d3fb.el7.spec
+++ b/redhat/self-test/data/fedora-fce15c45d3fb.el7.spec
@@ -1451,7 +1451,7 @@ cp %{SOURCE80} .
cp %{SOURCE3000} .
# kernel-local
cp %{SOURCE3001} .
-VERSION=%{version} ./generate_all_configs.sh %{primary_target} %{debugbuildsenabled}
+FLAVOR=%{primary_target} KVERSION=%{version} ./generate_all_configs.sh
%{debugbuildsenabled}
# Merge in any user-provided local config option changes
%ifnarch %nobuildarches
diff --git a/redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec
b/redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec
+++ b/redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec
@@ -1451,7 +1451,7 @@ cp %{SOURCE80} .
cp %{SOURCE3000} .
# kernel-local
cp %{SOURCE3001} .
-VERSION=%{version} ./generate_all_configs.sh %{primary_target} %{debugbuildsenabled}
+FLAVOR=%{primary_target} KVERSION=%{version} ./generate_all_configs.sh
%{debugbuildsenabled}
# Merge in any user-provided local config option changes
%ifnarch %nobuildarches
diff --git a/redhat/self-test/data/rhel-2585cf9dfaad.el7.spec
b/redhat/self-test/data/rhel-2585cf9dfaad.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/rhel-2585cf9dfaad.el7.spec
+++ b/redhat/self-test/data/rhel-2585cf9dfaad.el7.spec
@@ -1451,7 +1451,7 @@ cp %{SOURCE80} .
cp %{SOURCE3000} .
# kernel-local
cp %{SOURCE3001} .
-VERSION=%{version} ./generate_all_configs.sh %{primary_target} %{debugbuildsenabled}
+FLAVOR=%{primary_target} KVERSION=%{version} ./generate_all_configs.sh
%{debugbuildsenabled}
# Merge in any user-provided local config option changes
%ifnarch %nobuildarches
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1706
4:34 p.m.
New subject: [OS-BUILD PATCHv6 10/16] redhat/kernel.spec.template: Use
RPM_BUILD_NCPUS
From: Prarit Bhargava <prarit(a)redhat.com>
redhat/kernel.spec.template: Use RPM_BUILD_NCPUS
RPM_BUILD_NCPUS allows users to modify the max number of cpus used by the
RPM build.
Use the RPM_BUILD_NCPUS variable in the spec file.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100755
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -115,7 +115,6 @@ Summary: The Linux kernel
%if %{zipmodules}
%global zipsed -e 's/\.ko$/\.ko.xz/'
# for parallel xz processes, replace with 1 to go back to single process
-%global zcpu `nproc --all`
%endif
%%BUILDID%%
@@ -2349,7 +2348,7 @@ find Documentation -type d | xargs chmod u+w
fi \
fi \
if [ "%{zipmodules}" -eq "1" ]; then \
- find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs -P%{zcpu} xz;
\
+ find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs
-P${RPM_BUILD_NCPUS} xz; \
fi \
%{nil}
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.el7.spec
b/redhat/self-test/data/centos-2585cf9dfaad.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-2585cf9dfaad.el7.spec
+++ b/redhat/self-test/data/centos-2585cf9dfaad.el7.spec
@@ -115,7 +115,6 @@ Summary: The Linux kernel
%if %{zipmodules}
%global zipsed -e 's/\.ko$/\.ko.xz/'
# for parallel xz processes, replace with 1 to go back to single process
-%global zcpu `nproc --all`
%endif
%define buildid .test
@@ -2349,7 +2348,7 @@ find Documentation -type d | xargs chmod u+w
fi \
fi \
if [ "%{zipmodules}" -eq "1" ]; then \
- find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs -P%{zcpu} xz;
\
+ find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs
-P${RPM_BUILD_NCPUS} xz; \
fi \
%{nil}
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec
b/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec
+++ b/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec
@@ -115,7 +115,6 @@ Summary: The Linux kernel
%if %{zipmodules}
%global zipsed -e 's/\.ko$/\.ko.xz/'
# for parallel xz processes, replace with 1 to go back to single process
-%global zcpu `nproc --all`
%endif
%define buildid .test
@@ -2349,7 +2348,7 @@ find Documentation -type d | xargs chmod u+w
fi \
fi \
if [ "%{zipmodules}" -eq "1" ]; then \
- find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs -P%{zcpu} xz;
\
+ find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs
-P${RPM_BUILD_NCPUS} xz; \
fi \
%{nil}
diff --git a/redhat/self-test/data/centos-78e36f3b0dae.el7.spec
b/redhat/self-test/data/centos-78e36f3b0dae.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-78e36f3b0dae.el7.spec
+++ b/redhat/self-test/data/centos-78e36f3b0dae.el7.spec
@@ -115,7 +115,6 @@ Summary: The Linux kernel
%if %{zipmodules}
%global zipsed -e 's/\.ko$/\.ko.xz/'
# for parallel xz processes, replace with 1 to go back to single process
-%global zcpu `nproc --all`
%endif
%define buildid .test
@@ -2349,7 +2348,7 @@ find Documentation -type d | xargs chmod u+w
fi \
fi \
if [ "%{zipmodules}" -eq "1" ]; then \
- find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs -P%{zcpu} xz;
\
+ find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs
-P${RPM_BUILD_NCPUS} xz; \
fi \
%{nil}
diff --git a/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec
b/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec
+++ b/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec
@@ -115,7 +115,6 @@ Summary: The Linux kernel
%if %{zipmodules}
%global zipsed -e 's/\.ko$/\.ko.xz/'
# for parallel xz processes, replace with 1 to go back to single process
-%global zcpu `nproc --all`
%endif
%define buildid .test
@@ -2349,7 +2348,7 @@ find Documentation -type d | xargs chmod u+w
fi \
fi \
if [ "%{zipmodules}" -eq "1" ]; then \
- find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs -P%{zcpu} xz;
\
+ find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs
-P${RPM_BUILD_NCPUS} xz; \
fi \
%{nil}
diff --git a/redhat/self-test/data/centos-df0cc57e057f.el7.spec
b/redhat/self-test/data/centos-df0cc57e057f.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-df0cc57e057f.el7.spec
+++ b/redhat/self-test/data/centos-df0cc57e057f.el7.spec
@@ -115,7 +115,6 @@ Summary: The Linux kernel
%if %{zipmodules}
%global zipsed -e 's/\.ko$/\.ko.xz/'
# for parallel xz processes, replace with 1 to go back to single process
-%global zcpu `nproc --all`
%endif
%define buildid .test
@@ -2349,7 +2348,7 @@ find Documentation -type d | xargs chmod u+w
fi \
fi \
if [ "%{zipmodules}" -eq "1" ]; then \
- find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs -P%{zcpu} xz;
\
+ find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs
-P${RPM_BUILD_NCPUS} xz; \
fi \
%{nil}
diff --git a/redhat/self-test/data/centos-df0cc57e057f.fc25.spec
b/redhat/self-test/data/centos-df0cc57e057f.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-df0cc57e057f.fc25.spec
+++ b/redhat/self-test/data/centos-df0cc57e057f.fc25.spec
@@ -115,7 +115,6 @@ Summary: The Linux kernel
%if %{zipmodules}
%global zipsed -e 's/\.ko$/\.ko.xz/'
# for parallel xz processes, replace with 1 to go back to single process
-%global zcpu `nproc --all`
%endif
%define buildid .test
@@ -2349,7 +2348,7 @@ find Documentation -type d | xargs chmod u+w
fi \
fi \
if [ "%{zipmodules}" -eq "1" ]; then \
- find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs -P%{zcpu} xz;
\
+ find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs
-P${RPM_BUILD_NCPUS} xz; \
fi \
%{nil}
diff --git a/redhat/self-test/data/centos-fce15c45d3fb.el7.spec
b/redhat/self-test/data/centos-fce15c45d3fb.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-fce15c45d3fb.el7.spec
+++ b/redhat/self-test/data/centos-fce15c45d3fb.el7.spec
@@ -115,7 +115,6 @@ Summary: The Linux kernel
%if %{zipmodules}
%global zipsed -e 's/\.ko$/\.ko.xz/'
# for parallel xz processes, replace with 1 to go back to single process
-%global zcpu `nproc --all`
%endif
%define buildid .test
@@ -2349,7 +2348,7 @@ find Documentation -type d | xargs chmod u+w
fi \
fi \
if [ "%{zipmodules}" -eq "1" ]; then \
- find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs -P%{zcpu} xz;
\
+ find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs
-P${RPM_BUILD_NCPUS} xz; \
fi \
%{nil}
diff --git a/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec
b/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec
+++ b/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec
@@ -115,7 +115,6 @@ Summary: The Linux kernel
%if %{zipmodules}
%global zipsed -e 's/\.ko$/\.ko.xz/'
# for parallel xz processes, replace with 1 to go back to single process
-%global zcpu `nproc --all`
%endif
%define buildid .test
@@ -2349,7 +2348,7 @@ find Documentation -type d | xargs chmod u+w
fi \
fi \
if [ "%{zipmodules}" -eq "1" ]; then \
- find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs -P%{zcpu} xz;
\
+ find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs
-P${RPM_BUILD_NCPUS} xz; \
fi \
%{nil}
diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.el7.spec
b/redhat/self-test/data/fedora-2585cf9dfaad.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-2585cf9dfaad.el7.spec
+++ b/redhat/self-test/data/fedora-2585cf9dfaad.el7.spec
@@ -115,7 +115,6 @@ Summary: The Linux kernel
%if %{zipmodules}
%global zipsed -e 's/\.ko$/\.ko.xz/'
# for parallel xz processes, replace with 1 to go back to single process
-%global zcpu `nproc --all`
%endif
%define buildid .test
@@ -2349,7 +2348,7 @@ find Documentation -type d | xargs chmod u+w
fi \
fi \
if [ "%{zipmodules}" -eq "1" ]; then \
- find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs -P%{zcpu} xz;
\
+ find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs
-P${RPM_BUILD_NCPUS} xz; \
fi \
%{nil}
diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec
b/redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec
+++ b/redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec
@@ -115,7 +115,6 @@ Summary: The Linux kernel
%if %{zipmodules}
%global zipsed -e 's/\.ko$/\.ko.xz/'
# for parallel xz processes, replace with 1 to go back to single process
-%global zcpu `nproc --all`
%endif
%define buildid .test
@@ -2349,7 +2348,7 @@ find Documentation -type d | xargs chmod u+w
fi \
fi \
if [ "%{zipmodules}" -eq "1" ]; then \
- find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs -P%{zcpu} xz;
\
+ find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs
-P${RPM_BUILD_NCPUS} xz; \
fi \
%{nil}
diff --git a/redhat/self-test/data/fedora-78e36f3b0dae.el7.spec
b/redhat/self-test/data/fedora-78e36f3b0dae.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-78e36f3b0dae.el7.spec
+++ b/redhat/self-test/data/fedora-78e36f3b0dae.el7.spec
@@ -115,7 +115,6 @@ Summary: The Linux kernel
%if %{zipmodules}
%global zipsed -e 's/\.ko$/\.ko.xz/'
# for parallel xz processes, replace with 1 to go back to single process
-%global zcpu `nproc --all`
%endif
%define buildid .test
@@ -2349,7 +2348,7 @@ find Documentation -type d | xargs chmod u+w
fi \
fi \
if [ "%{zipmodules}" -eq "1" ]; then \
- find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs -P%{zcpu} xz;
\
+ find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs
-P${RPM_BUILD_NCPUS} xz; \
fi \
%{nil}
diff --git a/redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec
b/redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec
+++ b/redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec
@@ -115,7 +115,6 @@ Summary: The Linux kernel
%if %{zipmodules}
%global zipsed -e 's/\.ko$/\.ko.xz/'
# for parallel xz processes, replace with 1 to go back to single process
-%global zcpu `nproc --all`
%endif
%define buildid .test
@@ -2349,7 +2348,7 @@ find Documentation -type d | xargs chmod u+w
fi \
fi \
if [ "%{zipmodules}" -eq "1" ]; then \
- find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs -P%{zcpu} xz;
\
+ find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs
-P${RPM_BUILD_NCPUS} xz; \
fi \
%{nil}
diff --git a/redhat/self-test/data/fedora-df0cc57e057f.el7.spec
b/redhat/self-test/data/fedora-df0cc57e057f.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-df0cc57e057f.el7.spec
+++ b/redhat/self-test/data/fedora-df0cc57e057f.el7.spec
@@ -115,7 +115,6 @@ Summary: The Linux kernel
%if %{zipmodules}
%global zipsed -e 's/\.ko$/\.ko.xz/'
# for parallel xz processes, replace with 1 to go back to single process
-%global zcpu `nproc --all`
%endif
%define buildid .test
@@ -2349,7 +2348,7 @@ find Documentation -type d | xargs chmod u+w
fi \
fi \
if [ "%{zipmodules}" -eq "1" ]; then \
- find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs -P%{zcpu} xz;
\
+ find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs
-P${RPM_BUILD_NCPUS} xz; \
fi \
%{nil}
diff --git a/redhat/self-test/data/fedora-df0cc57e057f.fc25.spec
b/redhat/self-test/data/fedora-df0cc57e057f.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-df0cc57e057f.fc25.spec
+++ b/redhat/self-test/data/fedora-df0cc57e057f.fc25.spec
@@ -115,7 +115,6 @@ Summary: The Linux kernel
%if %{zipmodules}
%global zipsed -e 's/\.ko$/\.ko.xz/'
# for parallel xz processes, replace with 1 to go back to single process
-%global zcpu `nproc --all`
%endif
%define buildid .test
@@ -2349,7 +2348,7 @@ find Documentation -type d | xargs chmod u+w
fi \
fi \
if [ "%{zipmodules}" -eq "1" ]; then \
- find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs -P%{zcpu} xz;
\
+ find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs
-P${RPM_BUILD_NCPUS} xz; \
fi \
%{nil}
diff --git a/redhat/self-test/data/fedora-fce15c45d3fb.el7.spec
b/redhat/self-test/data/fedora-fce15c45d3fb.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-fce15c45d3fb.el7.spec
+++ b/redhat/self-test/data/fedora-fce15c45d3fb.el7.spec
@@ -115,7 +115,6 @@ Summary: The Linux kernel
%if %{zipmodules}
%global zipsed -e 's/\.ko$/\.ko.xz/'
# for parallel xz processes, replace with 1 to go back to single process
-%global zcpu `nproc --all`
%endif
%define buildid .test
@@ -2349,7 +2348,7 @@ find Documentation -type d | xargs chmod u+w
fi \
fi \
if [ "%{zipmodules}" -eq "1" ]; then \
- find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs -P%{zcpu} xz;
\
+ find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs
-P${RPM_BUILD_NCPUS} xz; \
fi \
%{nil}
diff --git a/redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec
b/redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec
+++ b/redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec
@@ -115,7 +115,6 @@ Summary: The Linux kernel
%if %{zipmodules}
%global zipsed -e 's/\.ko$/\.ko.xz/'
# for parallel xz processes, replace with 1 to go back to single process
-%global zcpu `nproc --all`
%endif
%define buildid .test
@@ -2349,7 +2348,7 @@ find Documentation -type d | xargs chmod u+w
fi \
fi \
if [ "%{zipmodules}" -eq "1" ]; then \
- find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs -P%{zcpu} xz;
\
+ find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs
-P${RPM_BUILD_NCPUS} xz; \
fi \
%{nil}
diff --git a/redhat/self-test/data/rhel-2585cf9dfaad.el7.spec
b/redhat/self-test/data/rhel-2585cf9dfaad.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/rhel-2585cf9dfaad.el7.spec
+++ b/redhat/self-test/data/rhel-2585cf9dfaad.el7.spec
@@ -115,7 +115,6 @@ Summary: The Linux kernel
%if %{zipmodules}
%global zipsed -e 's/\.ko$/\.ko.xz/'
# for parallel xz processes, replace with 1 to go back to single process
-%global zcpu `nproc --all`
%endif
%define buildid .test
@@ -2349,7 +2348,7 @@ find Documentation -type d | xargs chmod u+w
fi \
fi \
if [ "%{zipmodules}" -eq "1" ]; then \
- find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs -P%{zcpu} xz;
\
+ find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs
-P${RPM_BUILD_NCPUS} xz; \
fi \
%{nil}
diff --git a/redhat/self-test/data/rhel-2585cf9dfaad.fc25.spec
b/redhat/self-test/data/rhel-2585cf9dfaad.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/rhel-2585cf9dfaad.fc25.spec
+++ b/redhat/self-test/data/rhel-2585cf9dfaad.fc25.spec
@@ -115,7 +115,6 @@ Summary: The Linux kernel
%if %{zipmodules}
%global zipsed -e 's/\.ko$/\.ko.xz/'
# for parallel xz processes, replace with 1 to go back to single process
-%global zcpu `nproc --all`
%endif
%define buildid .test
@@ -2349,7 +2348,7 @@ find Documentation -type d | xargs chmod u+w
fi \
fi \
if [ "%{zipmodules}" -eq "1" ]; then \
- find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs -P%{zcpu} xz;
\
+ find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs
-P${RPM_BUILD_NCPUS} xz; \
fi \
%{nil}
diff --git a/redhat/self-test/data/rhel-78e36f3b0dae.el7.spec
b/redhat/self-test/data/rhel-78e36f3b0dae.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/rhel-78e36f3b0dae.el7.spec
+++ b/redhat/self-test/data/rhel-78e36f3b0dae.el7.spec
@@ -115,7 +115,6 @@ Summary: The Linux kernel
%if %{zipmodules}
%global zipsed -e 's/\.ko$/\.ko.xz/'
# for parallel xz processes, replace with 1 to go back to single process
-%global zcpu `nproc --all`
%endif
%define buildid .test
@@ -2349,7 +2348,7 @@ find Documentation -type d | xargs chmod u+w
fi \
fi \
if [ "%{zipmodules}" -eq "1" ]; then \
- find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs -P%{zcpu} xz;
\
+ find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs
-P${RPM_BUILD_NCPUS} xz; \
fi \
%{nil}
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1706
4:34 p.m.
New subject: [OS-BUILD PATCHv6 11/16] redhat/configs/process_configs.sh: Use
Makefile
variables
From: Prarit Bhargava <prarit(a)redhat.com>
redhat/configs/process_configs.sh: Use Makefile variables
Cleanup up parameters and use Makefile variables in process_config.sh.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -345,11 +345,11 @@ dist-kabi-dw-check: dist-kabi
dist-configs-commit: dist-configs-prep
+@cd $(REDHAT)/configs; ./generate_all_configs.sh; 1\
- ./process_configs.sh -z "$(PACKAGE_NAME)" "$(KVERSION)" ""
"$(FLAVOR)" "$(RHJOBS)"
+ ./process_configs.sh -z "$(KVERSION)" "$(FLAVOR)"
dist-configs: dist-configs-prep
+@cd $(REDHAT)/configs; ./generate_all_configs.sh; 1\
- ./process_configs.sh $(PROCESS_CONFIGS_OPTS) "$(PACKAGE_NAME)"
"$(KVERSION)" "" "" "$(RHJOBS)"
+ ./process_configs.sh $(PROCESS_CONFIGS_OPTS) "$(KVERSION)" ""
dist-fedora-configs: FLAVOR = fedora
dist-fedora-configs: dist-configs
@@ -360,7 +360,7 @@ dist-rhel-configs: dist-configs
rh-configs: dist-rhel-configs
dist-configs-check: dist-configs-prep
- +cd $(REDHAT)/configs; ./process_configs.sh $(PROCESS_CONFIGS_CHECK_OPTS)
$(PACKAGE_NAME) "" "" "" "$(RHJOBS)"
+ +cd $(REDHAT)/configs; ./process_configs.sh $(PROCESS_CONFIGS_CHECK_OPTS)
dist-configs-prep: dist-clean-configs dist-buildreq-check
+cd $(REDHAT)/configs; ./build_configs.sh "partial" "$(ARCH_MACH)"
"snip" "$(RHJOBS)"
diff --git a/redhat/configs/process_configs.sh b/redhat/configs/process_configs.sh
index blahblah..blahblah 100755
--- a/redhat/configs/process_configs.sh
+++ b/redhat/configs/process_configs.sh
@@ -192,7 +192,7 @@ function commit_new_configs()
# assume we are in $source_tree/configs, need to get to top level
pushd "$(switch_to_toplevel)" &>/dev/null
- for cfg in "$SCRIPT_DIR/${PACKAGE_NAME}${KVERREL}${SUBARCH}"*.config
+ for cfg in "$SCRIPT_DIR/${PACKAGE_NAME}${KVERREL}"*.config
do
arch=$(head -1 "$cfg" | cut -b 3-)
cfgtmp="${cfg}.tmp"
@@ -306,7 +306,7 @@ function process_configs()
[ -f .mismatches ] && rm -f .mismatches
count=0
- for cfg in "$SCRIPT_DIR/${PACKAGE_NAME}${KVERREL}${SUBARCH}"*.config
+ for cfg in "$SCRIPT_DIR/${PACKAGE_NAME}${KVERREL}"*.config
do
if [ "$count" -eq 0 ]; then
# do the first one by itself so that tools are built
@@ -393,12 +393,9 @@ do
shift
done
-PACKAGE_NAME="${1:-kernel}" # defines the package name used
-KVERREL="$(test -n "$2" && echo "-$2" || echo
"")"
-SUBARCH="$(test -n "$3" && echo "-$3" || echo
"")"
-FLAVOR="$(test -n "$4" && echo "-$4" || echo
"-ark")"
+KVERREL="$(test -n "$1" && echo "-$1" || echo
"")"
+FLAVOR="$(test -n "$2" && echo "-$2" || echo
"-ark")"
# shellcheck disable=SC2015
-RHJOBS="$(test -n "$5" && echo "$5" || nproc
--all)"
SCRIPT=$(readlink -f "$0")
SCRIPT_DIR=$(dirname "$SCRIPT")
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100755
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -1501,7 +1501,7 @@ for opt in %{clang_make_opts}; do
OPTS="$OPTS -m $opt"
done
%endif
-./process_configs.sh $OPTS kernel %{rpmversion}
+RHJOBS=$RPM_BUILD_NCPUS PACKAGE_NAME=kernel ./process_configs.sh $OPTS ${rpmversion}
cp %{SOURCE82} .
RPM_SOURCE_DIR=$RPM_SOURCE_DIR ./update_scripts.sh %{primary_target}
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.el7.spec
b/redhat/self-test/data/centos-2585cf9dfaad.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-2585cf9dfaad.el7.spec
+++ b/redhat/self-test/data/centos-2585cf9dfaad.el7.spec
@@ -1501,7 +1501,7 @@ for opt in %{clang_make_opts}; do
OPTS="$OPTS -m $opt"
done
%endif
-./process_configs.sh $OPTS kernel %{rpmversion}
+RHJOBS=$RPM_BUILD_NCPUS PACKAGE_NAME=kernel ./process_configs.sh $OPTS ${rpmversion}
cp %{SOURCE82} .
RPM_SOURCE_DIR=$RPM_SOURCE_DIR ./update_scripts.sh %{primary_target}
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec
b/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec
+++ b/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec
@@ -1501,7 +1501,7 @@ for opt in %{clang_make_opts}; do
OPTS="$OPTS -m $opt"
done
%endif
-./process_configs.sh $OPTS kernel %{rpmversion}
+RHJOBS=$RPM_BUILD_NCPUS PACKAGE_NAME=kernel ./process_configs.sh $OPTS ${rpmversion}
cp %{SOURCE82} .
RPM_SOURCE_DIR=$RPM_SOURCE_DIR ./update_scripts.sh %{primary_target}
diff --git a/redhat/self-test/data/centos-78e36f3b0dae.el7.spec
b/redhat/self-test/data/centos-78e36f3b0dae.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-78e36f3b0dae.el7.spec
+++ b/redhat/self-test/data/centos-78e36f3b0dae.el7.spec
@@ -1501,7 +1501,7 @@ for opt in %{clang_make_opts}; do
OPTS="$OPTS -m $opt"
done
%endif
-./process_configs.sh $OPTS kernel %{rpmversion}
+RHJOBS=$RPM_BUILD_NCPUS PACKAGE_NAME=kernel ./process_configs.sh $OPTS ${rpmversion}
cp %{SOURCE82} .
RPM_SOURCE_DIR=$RPM_SOURCE_DIR ./update_scripts.sh %{primary_target}
diff --git a/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec
b/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec
+++ b/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec
@@ -1501,7 +1501,7 @@ for opt in %{clang_make_opts}; do
OPTS="$OPTS -m $opt"
done
%endif
-./process_configs.sh $OPTS kernel %{rpmversion}
+RHJOBS=$RPM_BUILD_NCPUS PACKAGE_NAME=kernel ./process_configs.sh $OPTS ${rpmversion}
cp %{SOURCE82} .
RPM_SOURCE_DIR=$RPM_SOURCE_DIR ./update_scripts.sh %{primary_target}
diff --git a/redhat/self-test/data/centos-df0cc57e057f.el7.spec
b/redhat/self-test/data/centos-df0cc57e057f.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-df0cc57e057f.el7.spec
+++ b/redhat/self-test/data/centos-df0cc57e057f.el7.spec
@@ -1501,7 +1501,7 @@ for opt in %{clang_make_opts}; do
OPTS="$OPTS -m $opt"
done
%endif
-./process_configs.sh $OPTS kernel %{rpmversion}
+RHJOBS=$RPM_BUILD_NCPUS PACKAGE_NAME=kernel ./process_configs.sh $OPTS ${rpmversion}
cp %{SOURCE82} .
RPM_SOURCE_DIR=$RPM_SOURCE_DIR ./update_scripts.sh %{primary_target}
diff --git a/redhat/self-test/data/centos-df0cc57e057f.fc25.spec
b/redhat/self-test/data/centos-df0cc57e057f.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-df0cc57e057f.fc25.spec
+++ b/redhat/self-test/data/centos-df0cc57e057f.fc25.spec
@@ -1501,7 +1501,7 @@ for opt in %{clang_make_opts}; do
OPTS="$OPTS -m $opt"
done
%endif
-./process_configs.sh $OPTS kernel %{rpmversion}
+RHJOBS=$RPM_BUILD_NCPUS PACKAGE_NAME=kernel ./process_configs.sh $OPTS ${rpmversion}
cp %{SOURCE82} .
RPM_SOURCE_DIR=$RPM_SOURCE_DIR ./update_scripts.sh %{primary_target}
diff --git a/redhat/self-test/data/centos-fce15c45d3fb.el7.spec
b/redhat/self-test/data/centos-fce15c45d3fb.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-fce15c45d3fb.el7.spec
+++ b/redhat/self-test/data/centos-fce15c45d3fb.el7.spec
@@ -1501,7 +1501,7 @@ for opt in %{clang_make_opts}; do
OPTS="$OPTS -m $opt"
done
%endif
-./process_configs.sh $OPTS kernel %{rpmversion}
+RHJOBS=$RPM_BUILD_NCPUS PACKAGE_NAME=kernel ./process_configs.sh $OPTS ${rpmversion}
cp %{SOURCE82} .
RPM_SOURCE_DIR=$RPM_SOURCE_DIR ./update_scripts.sh %{primary_target}
diff --git a/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec
b/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec
+++ b/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec
@@ -1501,7 +1501,7 @@ for opt in %{clang_make_opts}; do
OPTS="$OPTS -m $opt"
done
%endif
-./process_configs.sh $OPTS kernel %{rpmversion}
+RHJOBS=$RPM_BUILD_NCPUS PACKAGE_NAME=kernel ./process_configs.sh $OPTS ${rpmversion}
cp %{SOURCE82} .
RPM_SOURCE_DIR=$RPM_SOURCE_DIR ./update_scripts.sh %{primary_target}
diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.el7.spec
b/redhat/self-test/data/fedora-2585cf9dfaad.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-2585cf9dfaad.el7.spec
+++ b/redhat/self-test/data/fedora-2585cf9dfaad.el7.spec
@@ -1501,7 +1501,7 @@ for opt in %{clang_make_opts}; do
OPTS="$OPTS -m $opt"
done
%endif
-./process_configs.sh $OPTS kernel %{rpmversion}
+RHJOBS=$RPM_BUILD_NCPUS PACKAGE_NAME=kernel ./process_configs.sh $OPTS ${rpmversion}
cp %{SOURCE82} .
RPM_SOURCE_DIR=$RPM_SOURCE_DIR ./update_scripts.sh %{primary_target}
diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec
b/redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec
+++ b/redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec
@@ -1501,7 +1501,7 @@ for opt in %{clang_make_opts}; do
OPTS="$OPTS -m $opt"
done
%endif
-./process_configs.sh $OPTS kernel %{rpmversion}
+RHJOBS=$RPM_BUILD_NCPUS PACKAGE_NAME=kernel ./process_configs.sh $OPTS ${rpmversion}
cp %{SOURCE82} .
RPM_SOURCE_DIR=$RPM_SOURCE_DIR ./update_scripts.sh %{primary_target}
diff --git a/redhat/self-test/data/fedora-78e36f3b0dae.el7.spec
b/redhat/self-test/data/fedora-78e36f3b0dae.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-78e36f3b0dae.el7.spec
+++ b/redhat/self-test/data/fedora-78e36f3b0dae.el7.spec
@@ -1501,7 +1501,7 @@ for opt in %{clang_make_opts}; do
OPTS="$OPTS -m $opt"
done
%endif
-./process_configs.sh $OPTS kernel %{rpmversion}
+RHJOBS=$RPM_BUILD_NCPUS PACKAGE_NAME=kernel ./process_configs.sh $OPTS ${rpmversion}
cp %{SOURCE82} .
RPM_SOURCE_DIR=$RPM_SOURCE_DIR ./update_scripts.sh %{primary_target}
diff --git a/redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec
b/redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec
+++ b/redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec
@@ -1501,7 +1501,7 @@ for opt in %{clang_make_opts}; do
OPTS="$OPTS -m $opt"
done
%endif
-./process_configs.sh $OPTS kernel %{rpmversion}
+RHJOBS=$RPM_BUILD_NCPUS PACKAGE_NAME=kernel ./process_configs.sh $OPTS ${rpmversion}
cp %{SOURCE82} .
RPM_SOURCE_DIR=$RPM_SOURCE_DIR ./update_scripts.sh %{primary_target}
diff --git a/redhat/self-test/data/fedora-df0cc57e057f.el7.spec
b/redhat/self-test/data/fedora-df0cc57e057f.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-df0cc57e057f.el7.spec
+++ b/redhat/self-test/data/fedora-df0cc57e057f.el7.spec
@@ -1501,7 +1501,7 @@ for opt in %{clang_make_opts}; do
OPTS="$OPTS -m $opt"
done
%endif
-./process_configs.sh $OPTS kernel %{rpmversion}
+RHJOBS=$RPM_BUILD_NCPUS PACKAGE_NAME=kernel ./process_configs.sh $OPTS ${rpmversion}
cp %{SOURCE82} .
RPM_SOURCE_DIR=$RPM_SOURCE_DIR ./update_scripts.sh %{primary_target}
diff --git a/redhat/self-test/data/fedora-df0cc57e057f.fc25.spec
b/redhat/self-test/data/fedora-df0cc57e057f.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-df0cc57e057f.fc25.spec
+++ b/redhat/self-test/data/fedora-df0cc57e057f.fc25.spec
@@ -1501,7 +1501,7 @@ for opt in %{clang_make_opts}; do
OPTS="$OPTS -m $opt"
done
%endif
-./process_configs.sh $OPTS kernel %{rpmversion}
+RHJOBS=$RPM_BUILD_NCPUS PACKAGE_NAME=kernel ./process_configs.sh $OPTS ${rpmversion}
cp %{SOURCE82} .
RPM_SOURCE_DIR=$RPM_SOURCE_DIR ./update_scripts.sh %{primary_target}
diff --git a/redhat/self-test/data/fedora-fce15c45d3fb.el7.spec
b/redhat/self-test/data/fedora-fce15c45d3fb.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-fce15c45d3fb.el7.spec
+++ b/redhat/self-test/data/fedora-fce15c45d3fb.el7.spec
@@ -1501,7 +1501,7 @@ for opt in %{clang_make_opts}; do
OPTS="$OPTS -m $opt"
done
%endif
-./process_configs.sh $OPTS kernel %{rpmversion}
+RHJOBS=$RPM_BUILD_NCPUS PACKAGE_NAME=kernel ./process_configs.sh $OPTS ${rpmversion}
cp %{SOURCE82} .
RPM_SOURCE_DIR=$RPM_SOURCE_DIR ./update_scripts.sh %{primary_target}
diff --git a/redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec
b/redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec
+++ b/redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec
@@ -1501,7 +1501,7 @@ for opt in %{clang_make_opts}; do
OPTS="$OPTS -m $opt"
done
%endif
-./process_configs.sh $OPTS kernel %{rpmversion}
+RHJOBS=$RPM_BUILD_NCPUS PACKAGE_NAME=kernel ./process_configs.sh $OPTS ${rpmversion}
cp %{SOURCE82} .
RPM_SOURCE_DIR=$RPM_SOURCE_DIR ./update_scripts.sh %{primary_target}
diff --git a/redhat/self-test/data/rhel-2585cf9dfaad.el7.spec
b/redhat/self-test/data/rhel-2585cf9dfaad.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/rhel-2585cf9dfaad.el7.spec
+++ b/redhat/self-test/data/rhel-2585cf9dfaad.el7.spec
@@ -1501,7 +1501,7 @@ for opt in %{clang_make_opts}; do
OPTS="$OPTS -m $opt"
done
%endif
-./process_configs.sh $OPTS kernel %{rpmversion}
+RHJOBS=$RPM_BUILD_NCPUS PACKAGE_NAME=kernel ./process_configs.sh $OPTS ${rpmversion}
cp %{SOURCE82} .
RPM_SOURCE_DIR=$RPM_SOURCE_DIR ./update_scripts.sh %{primary_target}
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1706
4:34 p.m.
New subject: [OS-BUILD PATCHv6 12/16] redhat/configs/build_configs.sh: Use
Makefile
variables
From: Prarit Bhargava <prarit(a)redhat.com>
redhat/configs/build_configs.sh: Use Makefile variables
Use Makefile variables in build_configs.sh.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -363,8 +363,8 @@ dist-configs-check: dist-configs-prep
+cd $(REDHAT)/configs; ./process_configs.sh $(PROCESS_CONFIGS_CHECK_OPTS)
dist-configs-prep: dist-clean-configs dist-buildreq-check
- +cd $(REDHAT)/configs; ./build_configs.sh "partial" "$(ARCH_MACH)"
"snip" "$(RHJOBS)"
- +cd $(REDHAT)/configs; ./build_configs.sh "$(PACKAGE_NAME)"
"$(ARCH_MACH)" "$(FLAVOR)" "$(RHJOBS)"
+ +cd $(REDHAT)/configs; ./build_configs.sh "partial" "snip"
+ +cd $(REDHAT)/configs; ./build_configs.sh "$(PACKAGE_NAME)"
"$(FLAVOR)"
dist-configs-arch: ARCH_MACH = $(MACH)
dist-configs-arch: dist-configs
diff --git a/redhat/configs/build_configs.sh b/redhat/configs/build_configs.sh
index blahblah..blahblah 100755
--- a/redhat/configs/build_configs.sh
+++ b/redhat/configs/build_configs.sh
@@ -5,19 +5,15 @@
# files for building RHEL kernels, based on the contents of a control file
PACKAGE_NAME="${1:-kernel}" # defines the package name used
-SUBARCH="${2:-}" # defines a specific arch
-SCRIPT=$(readlink -f "$0")
-OUTPUT_DIR="$PWD"
-SCRIPT_DIR=$(dirname "$SCRIPT")
-
-if [ -z "$3" ]; then
+if [ -z "$2" ]; then
cat flavors > .flavors
else
- echo "$3" > .flavors
+ echo "$2" > .flavors
fi
-# shellcheck disable=SC2015
-RHJOBS="$(test -n "$4" && echo "$4" || nproc
--all)"
+SCRIPT=$(readlink -f "$0")
+OUTPUT_DIR="$PWD"
+SCRIPT_DIR=$(dirname "$SCRIPT")
LANG=en_US.UTF-8
@@ -148,9 +144,9 @@ function build_flavor()
arch=$(echo "$line" | cut -f1 -d"=")
configs=$(echo "$line" | cut -f2 -d"=")
- if [ -n "$SUBARCH" ]; then
+ if [ -n "$ARCH_MACH" ]; then
case $arch in
- $SUBARCH*)
+ $ARCH_MACH*)
;;
*)
continue
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1706
4:34 p.m.
New subject: [OS-BUILD PATCHv6 13/16] redhat/scripts/rh-dist-git.sh: Use Makefile
variables
From: Prarit Bhargava <prarit(a)redhat.com>
redhat/scripts/rh-dist-git.sh: Use Makefile variables
Use Makefile variables in rh-dist-git.sh.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -637,7 +637,7 @@ endif
exit 1; \
fi; \
fi
- $(REDHAT)/scripts/rh-dist-git.sh "$(RHDISTGIT_BRANCH)"
"$(RHDISTGIT_CACHE)" "$(RHDISTGIT_TMP)" "$(RHDISTGIT)"
"$(TARBALL)" "$(KABI_TARBALL)" "$(KABIDW_TARBALL)"
"$(__ZSTREAM)" "$(PACKAGE_NAME)" "$(RHEL_MAJOR)"
"$(RHPKG_BIN)"
"$(SRPMS)/$(PACKAGE_NAME)-$(KVERSION)-$(PKGRELEASE)$(DIST).src.rpm"
+ $(REDHAT)/scripts/rh-dist-git.sh
dist-rtg: dist-release
@$(MAKE) dist-release-tag
diff --git a/redhat/scripts/rh-dist-git.sh b/redhat/scripts/rh-dist-git.sh
index blahblah..blahblah 100755
--- a/redhat/scripts/rh-dist-git.sh
+++ b/redhat/scripts/rh-dist-git.sh
@@ -1,32 +1,8 @@
#!/bin/bash
# clones and updates a dist-git repo
-# $1: branch to be used
-# $2: local pristine clone of dist-git
-# $3: alternate tmp directory (if you have faster storage)
-# $4: alternate dist-git server
-# $5: kernel source tarball
-# $6: kabi stablelists tarball
-# $7: dwarf-bases kabi tarball
-# $8: zstream build
-# $9: package name
-# shellcheck disable=SC2164
-
-rhdistgit_branch=$1;
-rhdistgit_cache=$2;
-rhdistgit_tmp=$3;
-rhdistgit_server=$4;
-rhdistgit_tarball=$5;
-rhdistgit_kabi_tarball=$6;
-rhdistgit_kabidw_tarball=$7;
-rhdistgit_zstream_flag=$8;
-package_name=$9;
-rhel_major=${10};
-rhpkg_bin=${11};
-srpm_name=${12};
-redhat=$(dirname "$0")/..;
-topdir="$redhat"/..;
+# shellcheck disable=SC2164
function die
{
@@ -37,41 +13,41 @@ function die
function upload()
{
[ -n "$RH_DIST_GIT_TEST" ] && return
- $rhpkg_bin upload "$@" >/dev/null || die "uploading $*";
+ $RHPKG_BIN upload "$@" >/dev/null || die "uploading $*";
}
-if [ -z "$rhdistgit_branch" ]; then
+if [ -z "$RHDISTGIT_BRANCH" ]; then
echo "$0 <branch> [local clone] [alternate tmp] [alternate dist-git
server]" >&2;
exit 1;
fi
echo "Cloning the repository"
# clone the dist-git, considering cache
-tmpdir=$("$redhat"/scripts/clone_tree.sh "$rhdistgit_server"
"$rhdistgit_cache" "$rhdistgit_tmp" "$package_name"
"$rhel_major" "$rhpkg_bin");
+tmpdir=$("$REDHAT"/scripts/clone_tree.sh "$RHDISTGIT"
"$RHDISTGIT_CACHE" "$RHDISTGIT_TMP" "$PACKAGE_NAME"
"$RHEL_MAJOR" "$RHPKG_BIN");
echo "Switching the branch"
# change in the correct branch
-cd "$tmpdir/$package_name";
-$rhpkg_bin switch-branch "$rhdistgit_branch" || die "switching to branch
$rhdistgit_branch";
+cd "$tmpdir/$PACKAGE_NAME";
+$RHPKG_BIN switch-branch "$RHDISTGIT_BRANCH" || die "switching to branch
$RHDISTGIT_BRANCH";
echo "Copying updated files"
# copy the required files (redhat/git/files)
-"$redhat"/scripts/expand_srpm.sh "$topdir" "$tmpdir"
"$package_name" "$srpm_name";
+"$REDHAT"/scripts/expand_srpm.sh "$TOPDIR" "$tmpdir"
"$PACKAGE_NAME" "$SRPM";
echo "Uploading new tarballs"
# upload tarballs
-sed -i "/linux-.*.tar.xz/d"
"$tmpdir/$package_name"/{sources,.gitignore};
-upload_list="$rhdistgit_tarball"
+sed -i "/linux-.*.tar.xz/d"
"$tmpdir/$PACKAGE_NAME"/{sources,.gitignore};
+upload_list="$TARBALL"
# Only upload kernel-abi-stablelists tarball if its release counter changed.
-if [ "$rhdistgit_zstream_flag" == "no" ]; then
- if ! grep -q "$rhdistgit_kabi_tarball"
"$tmpdir/$package_name"/sources; then
- sed -i "/kernel-abi-stablelists.*.tar.bz2/d"
"$tmpdir/$package_name"/{sources,.gitignore};
- upload_list="$upload_list $rhdistgit_kabi_tarball"
+if [ "$__ZSTREAM" == "no" ]; then
+ if ! grep -q "$KABI_TARBALL" "$tmpdir/$PACKAGE_NAME"/sources; then
+ sed -i "/kernel-abi-stablelists.*.tar.bz2/d"
"$tmpdir/$PACKAGE_NAME"/{sources,.gitignore};
+ upload_list="$upload_list $KABI_TARBALL"
fi
- if ! grep -q "$rhdistgit_kabidw_tarball"
"$tmpdir/$package_name"/sources; then
- sed -i "/kernel-kabi-dw-.*.tar.bz2/d"
"$tmpdir/$package_name"/{sources,.gitignore};
- upload_list="$upload_list $rhdistgit_kabidw_tarball"
+ if ! grep -q "$KABIDW_TARBALL" "$tmpdir/$PACKAGE_NAME"/sources;
then
+ sed -i "/kernel-kabi-dw-.*.tar.bz2/d"
"$tmpdir/$PACKAGE_NAME"/{sources,.gitignore};
+ upload_list="$upload_list $KABIDW_TARBALL"
fi
fi
@@ -82,10 +58,10 @@ upload $upload_list
echo "Creating diff for review ($tmpdir/diff) and changelog"
# diff the result (redhat/cvs/dontdiff). note: diff reuturns 1 if
# differences were found
-diff -X "$redhat"/git/dontdiff -upr "$tmpdir/$package_name"
"$redhat"/rpm/SOURCES/ > "$tmpdir"/diff;
+diff -X "$REDHAT"/git/dontdiff -upr "$tmpdir/$PACKAGE_NAME"
"$REDHAT"/rpm/SOURCES/ > "$tmpdir"/diff;
# creating the changelog file
-"$redhat"/scripts/create_distgit_changelog.sh
"$redhat/rpm/SOURCES/$package_name".spec \
- "$rhdistgit_zstream_flag" "$package_name"
>"$tmpdir"/changelog
+"$REDHAT"/scripts/create_distgit_changelog.sh
"$REDHAT/rpm/SOURCES/$PACKAGE_NAME".spec \
+ "$__ZSTREAM" "$PACKAGE_NAME" >"$tmpdir"/changelog
# all done
echo "$tmpdir"
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1706
4:34 p.m.
New subject: [OS-BUILD PATCHv6 14/16] redhat/Makefile: Use RPMVERSION
From: Prarit Bhargava <prarit(a)redhat.com>
redhat/Makefile: Use RPMVERSION
Use RPMVERSION where appropriate in the Makefile.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -199,7 +199,7 @@
KABIDW_TARBALL:=$(SOURCES)/kernel-kabi-dw-$(KVERSION)-$(DISTRO_BUILD).tar.bz2
PKGRELEASE:=$(PREBUILD)$(BUILD)$(BUILDID)
RPMVERSION:=$(RPMKVERSION).$(RPMKPATCHLEVEL).$(RPMKSUBLEVEL)-$(PKGRELEASE)
SPECRELEASE:=$(PREBUILD)$(BUILD)%{?buildid}%{?dist}
-SRPM:=$(SRPMS)/$(PACKAGE_NAME)-$(KVERSION)-$(PKGRELEASE)$(DIST).src.rpm
+SRPM:=$(SRPMS)/$(PACKAGE_NAME)-$(RPMVERSION)$(DIST).src.rpm
#
# This conditional statement is where fedora, centos, and other (aka RHEL)
@@ -225,7 +225,7 @@ else ifeq ("$(DISTRO)", "centos")
ifndef BUILD_SCRATCH_TARGET
BUILD_SCRATCH_TARGET:=c$(RHEL_MAJOR)s-candidate
endif
- TARFILE_RELEASE:=$(KVERSION)-$(PKGRELEASE)
+ TARFILE_RELEASE:=$(RPMVERSION)
else
# A unified tarball means that the tarball in the srpm contains both the
# upstream sources and RHEL specific patches.
@@ -234,7 +234,7 @@ else
ifndef BUILD_SCRATCH_TARGET
BUILD_SCRATCH_TARGET:=rhel-$(RHEL_MAJOR).$(RHEL_MINOR).0-test-pesign
endif
- TARFILE_RELEASE:=$(KVERSION)-$(PKGRELEASE)
+ TARFILE_RELEASE:=$(RPMVERSION)
endif
ifndef BUILD_TARGET
@@ -397,7 +397,7 @@ dist-stub-key:
.PHONY: $(TARBALL)
$(TARBALL):
@if [ $(SINGLE_TARBALL) -eq 1 ]; then \
- scripts/create-tarball.sh $(GITID) linux-$(KVERSION)-$(PKGRELEASE); \
+ scripts/create-tarball.sh $(GITID) linux-$(RPMVERSION); \
else \
scripts/create-tarball.sh $(MARKER) linux-$(TARFILE_RELEASE); \
fi
@@ -556,7 +556,7 @@ dist-release-finish: setup-source
@cp $(SOURCES)/$(CHANGELOG) $(REDHAT)/$(CHANGELOG)
@$(GIT) add $(REDHAT)/$(CHANGELOG)
@$(GIT) add $(REDHAT)/marker
- @$(GIT) commit -s ../Makefile.rhelver $(REDHAT)/marker $(REDHAT)/$(CHANGELOG)
$(PACKAGE_NAME).spec.template -m "[redhat]
$(PACKAGE_NAME)-$(KVERSION)-$(PKGRELEASE)"
+ @$(GIT) commit -s ../Makefile.rhelver $(REDHAT)/marker $(REDHAT)/$(CHANGELOG)
$(PACKAGE_NAME).spec.template -m "[redhat] $(PACKAGE_NAME)-$(RPMVERSION)"
dist-release-changed: setup-source
@cp $(SOURCES)/$(CHANGELOG) $(REDHAT)/$(CHANGELOG)
@echo $(MARKER) > $(REDHAT)/marker
@@ -572,7 +572,7 @@ dist-release-changed: setup-source
dist-release: dist-clean-sources
@$(MAKE) dist-release-changed
dist-release-tag:
- @$(GIT) tag -a -m "$(PACKAGE_NAME)-$(RPMVERSION)"
$(PACKAGE_NAME)-$(KVERSION)-$(PKGRELEASE)
+ @$(GIT) tag -a -m "$(PACKAGE_NAME)-$(RPMVERSION)"
$(PACKAGE_NAME)-$(RPMVERSION)
git-tree-check:
@if test -n "$(DIST_PUSH)" && test -z "$(shell $(GIT) remote
get-url gitlab 2>/dev/null)"; then \
@@ -614,7 +614,7 @@ dist-vr-check:
fi
dist-brew dist-koji: dist-%: dist-vr-check dist-srpm
- $* $(BUILD_PROFILE) build $(BUILD_FLAGS) $(BUILD_TARGET)
$(SRPMS)/$(PACKAGE_NAME)-$(KVERSION)-$(PKGRELEASE)$(DIST).src.rpm $(OUTPUT_FILE)
+ $* $(BUILD_PROFILE) build $(BUILD_FLAGS) $(BUILD_TARGET)
$(SRPMS)/$(PACKAGE_NAME)-$(RPMVERSION)$(DIST).src.rpm $(OUTPUT_FILE)
distg-brew distg-koji: distg-%: dist-vr-check
$* $(BUILD_PROFILE) build $(BUILD_FLAGS) $(BUILD_TARGET)
"$(RHGITURL)?redhat/koji#$(RHGITCOMMIT)"
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1706
4:34 p.m.
New subject: [OS-BUILD PATCHv6 15/16] redhat/Makefile: Cleanup TARBALL target
From: Prarit Bhargava <prarit(a)redhat.com>
redhat/Makefile: Cleanup TARBALL target
The TARBALL target can be cleaned up by using GITID everywhere. This
results in no changes, so the SINGLE_TARBALL variable can be dropped.
Additional fix: Use GITID directly in create-tarball.sh. GITID is already
GITID_NORMALIZE so it is safe to replace.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -206,18 +206,12 @@ SRPM:=$(SRPMS)/$(PACKAGE_NAME)-$(RPMVERSION)$(DIST).src.rpm
# specific values should be set.
#
ifeq ("$(DISTRO)", "fedora")
- # A non-unified tarball means that the tarball is only upstream sources
- # and the patches get applied as a diff in the spec file
- SINGLE_TARBALL:=0
TARFILE_RELEASE:=$(UPSTREAM_TARBALL_NAME)
RHDISTGIT_BRANCH:=rawhide
ifndef BUILD_SCRATCH_TARGET
BUILD_SCRATCH_TARGET:=temp-ark-rhel-8-test
endif
else ifeq ("$(DISTRO)", "centos")
- # A unified tarball means that the tarball in the srpm contains both the
- # upstream sources and RHEL specific patches.
- SINGLE_TARBALL:=1
RHDISTGIT_BRANCH:=c$(RHEL_MAJOR)s
ifndef BUILD_PROFILE
BUILD_PROFILE:= -p stream
@@ -227,9 +221,6 @@ else ifeq ("$(DISTRO)", "centos")
endif
TARFILE_RELEASE:=$(RPMVERSION)
else
- # A unified tarball means that the tarball in the srpm contains both the
- # upstream sources and RHEL specific patches.
- SINGLE_TARBALL:=1
RHDISTGIT_BRANCH:=rhel-$(RHEL_MAJOR).$(RHEL_MINOR).0
ifndef BUILD_SCRATCH_TARGET
BUILD_SCRATCH_TARGET:=rhel-$(RHEL_MAJOR).$(RHEL_MINOR).0-test-pesign
@@ -396,11 +387,7 @@ dist-stub-key:
# force tarball to be regenerated if HEAD changes
.PHONY: $(TARBALL)
$(TARBALL):
- @if [ $(SINGLE_TARBALL) -eq 1 ]; then \
- scripts/create-tarball.sh $(GITID) linux-$(RPMVERSION); \
- else \
- scripts/create-tarball.sh $(MARKER) linux-$(TARFILE_RELEASE); \
- fi
+ scripts/create-tarball.sh $(GITID) linux-$(TARFILE_RELEASE)
.PHONY: $(KABI_TARBALL)
$(KABI_TARBALL):
diff --git a/redhat/genspec.sh b/redhat/genspec.sh
index blahblah..blahblah 100755
--- a/redhat/genspec.sh
+++ b/redhat/genspec.sh
@@ -162,13 +162,17 @@ mv -f "$clogf.full" "$SOURCES/$CHANGELOG"
echo "MARKER is $MARKER"
-if [ "$SINGLE_TARBALL" = 0 ]; then
+if [ "$DISTRO" == "fedora" ]; then
+ # The tarball in the SRPM contains only the upstream sources.
+
# May need to preserve word splitting in EXCLUDE_FILES
# shellcheck disable=SC2086
git diff -p --no-renames --stat "$MARKER".. $EXCLUDE_FILES \
${SOURCES}/patch-${RPMKVERSION}.${RPMKPATCHLEVEL}-redhat.patch
else
- # Need an empty file for dist-git compatibility
+ # The tarball in the SRPM contains both upstream sources and OS-specifc
+ # commits. Even though this is the case, an empty file for dist-git
+ # compatibility is necessary.
touch "${SOURCES}/patch-${RPMKVERSION}.${RPMKPATCHLEVEL}"-redhat.patch
fi
diff --git a/redhat/scripts/create-tarball.sh b/redhat/scripts/create-tarball.sh
index blahblah..blahblah 100755
--- a/redhat/scripts/create-tarball.sh
+++ b/redhat/scripts/create-tarball.sh
@@ -16,8 +16,7 @@ fi
if [ -f "$TARBALL" ]; then
TARID=$(xzcat -qq "$TARBALL" | git get-tar-commit-id 2>/dev/null)
- GITID_NORMALIZE=$(git log --max-count=1 --pretty=format:%H "$GITID")
- if [ "${GITID_NORMALIZE}" = "${TARID}" ]; then
+ if [ "${GITID}" = "${TARID}" ]; then
echo "$(basename "$TARBALL") unchanged..."
exit 0
fi
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
@@ -57,7 +57,6 @@ RPMKSUBLEVEL=0
RPMKVERSION=5
RPMVERSION=5.16.0-0.rc5.6.test
SHELL=/bin/sh
-SINGLE_TARBALL=1
SNAPSHOT=0
SOURCES=../redhat/rpm/SOURCES
SPECFILE=kernel.spec
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
@@ -57,7 +57,6 @@ RPMKSUBLEVEL=0
RPMKVERSION=5
RPMVERSION=5.16.0-0.rc5.6.test
SHELL=/bin/sh
-SINGLE_TARBALL=1
SNAPSHOT=0
SOURCES=../redhat/rpm/SOURCES
SPECFILE=kernel.spec
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
@@ -57,7 +57,6 @@ RPMKSUBLEVEL=0
RPMKVERSION=5
RPMVERSION=5.17.0-0.rc0.78e36f3b0dae586.6.test
SHELL=/bin/sh
-SINGLE_TARBALL=1
SNAPSHOT=1
SOURCES=../redhat/rpm/SOURCES
SPECFILE=kernel.spec
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
@@ -57,7 +57,6 @@ RPMKSUBLEVEL=0
RPMKVERSION=5
RPMVERSION=5.17.0-0.rc0.78e36f3b0dae586.6.test
SHELL=/bin/sh
-SINGLE_TARBALL=1
SNAPSHOT=1
SOURCES=../redhat/rpm/SOURCES
SPECFILE=kernel.spec
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
@@ -57,7 +57,6 @@ RPMKSUBLEVEL=0
RPMKVERSION=5
RPMVERSION=5.16.0-6.test
SHELL=/bin/sh
-SINGLE_TARBALL=1
SNAPSHOT=0
SOURCES=../redhat/rpm/SOURCES
SPECFILE=kernel.spec
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
@@ -57,7 +57,6 @@ RPMKSUBLEVEL=0
RPMKVERSION=5
RPMVERSION=5.16.0-6.test
SHELL=/bin/sh
-SINGLE_TARBALL=1
SNAPSHOT=0
SOURCES=../redhat/rpm/SOURCES
SPECFILE=kernel.spec
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
@@ -57,7 +57,6 @@ RPMKSUBLEVEL=0
RPMKVERSION=5
RPMVERSION=5.16.0-0.rc5.fce15c45d3fbd9f.6.test
SHELL=/bin/sh
-SINGLE_TARBALL=1
SNAPSHOT=1
SOURCES=../redhat/rpm/SOURCES
SPECFILE=kernel.spec
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
@@ -57,7 +57,6 @@ RPMKSUBLEVEL=0
RPMKVERSION=5
RPMVERSION=5.16.0-0.rc5.fce15c45d3fbd9f.6.test
SHELL=/bin/sh
-SINGLE_TARBALL=1
SNAPSHOT=1
SOURCES=../redhat/rpm/SOURCES
SPECFILE=kernel.spec
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
@@ -55,7 +55,6 @@ RPMKSUBLEVEL=0
RPMKVERSION=5
RPMVERSION=5.16.0-0.rc5.6.test
SHELL=/bin/sh
-SINGLE_TARBALL=0
SNAPSHOT=0
SOURCES=../redhat/rpm/SOURCES
SPECFILE=kernel.spec
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
@@ -55,7 +55,6 @@ RPMKSUBLEVEL=0
RPMKVERSION=5
RPMVERSION=5.16.0-0.rc5.6.test
SHELL=/bin/sh
-SINGLE_TARBALL=0
SNAPSHOT=0
SOURCES=../redhat/rpm/SOURCES
SPECFILE=kernel.spec
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
@@ -55,7 +55,6 @@ RPMKSUBLEVEL=0
RPMKVERSION=5
RPMVERSION=5.17.0-0.rc0.78e36f3b0dae586.6.test
SHELL=/bin/sh
-SINGLE_TARBALL=0
SNAPSHOT=1
SOURCES=../redhat/rpm/SOURCES
SPECFILE=kernel.spec
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
@@ -55,7 +55,6 @@ RPMKSUBLEVEL=0
RPMKVERSION=5
RPMVERSION=5.17.0-0.rc0.78e36f3b0dae586.6.test
SHELL=/bin/sh
-SINGLE_TARBALL=0
SNAPSHOT=1
SOURCES=../redhat/rpm/SOURCES
SPECFILE=kernel.spec
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
@@ -55,7 +55,6 @@ RPMKSUBLEVEL=0
RPMKVERSION=5
RPMVERSION=5.16.0-6.test
SHELL=/bin/sh
-SINGLE_TARBALL=0
SNAPSHOT=0
SOURCES=../redhat/rpm/SOURCES
SPECFILE=kernel.spec
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
@@ -55,7 +55,6 @@ RPMKSUBLEVEL=0
RPMKVERSION=5
RPMVERSION=5.16.0-6.test
SHELL=/bin/sh
-SINGLE_TARBALL=0
SNAPSHOT=0
SOURCES=../redhat/rpm/SOURCES
SPECFILE=kernel.spec
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
@@ -55,7 +55,6 @@ RPMKSUBLEVEL=0
RPMKVERSION=5
RPMVERSION=5.16.0-0.rc5.fce15c45d3fbd9f.6.test
SHELL=/bin/sh
-SINGLE_TARBALL=0
SNAPSHOT=1
SOURCES=../redhat/rpm/SOURCES
SPECFILE=kernel.spec
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
@@ -55,7 +55,6 @@ RPMKSUBLEVEL=0
RPMKVERSION=5
RPMVERSION=5.16.0-0.rc5.fce15c45d3fbd9f.6.test
SHELL=/bin/sh
-SINGLE_TARBALL=0
SNAPSHOT=1
SOURCES=../redhat/rpm/SOURCES
SPECFILE=kernel.spec
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
@@ -55,7 +55,6 @@ RPMKSUBLEVEL=0
RPMKVERSION=5
RPMVERSION=5.16.0-0.rc5.6.test
SHELL=/bin/sh
-SINGLE_TARBALL=1
SNAPSHOT=0
SOURCES=../redhat/rpm/SOURCES
SPECFILE=kernel.spec
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1706
4:34 p.m.
New subject: [OS-BUILD PATCHv6 16/16] redhat/scripts/create-tarball.sh: Use
Makefile
variables
From: Prarit Bhargava <prarit(a)redhat.com>
redhat/scripts/create-tarball.sh: Use Makefile variables
Use Makefile variables is redhat/scripts/create-tarball.sh.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -387,7 +387,7 @@ dist-stub-key:
# force tarball to be regenerated if HEAD changes
.PHONY: $(TARBALL)
$(TARBALL):
- scripts/create-tarball.sh $(GITID) linux-$(TARFILE_RELEASE)
+ scripts/create-tarball.sh
.PHONY: $(KABI_TARBALL)
$(KABI_TARBALL):
diff --git a/redhat/scripts/create-tarball.sh b/redhat/scripts/create-tarball.sh
index blahblah..blahblah 100755
--- a/redhat/scripts/create-tarball.sh
+++ b/redhat/scripts/create-tarball.sh
@@ -1,7 +1,6 @@
#!/bin/sh
-GITID=$1
-DIR=$2
+DIR=linux-$TARFILE_RELEASE
# shellcheck disable=SC1083
XZ_THREADS=$(rpm --eval %{_smp_mflags} | sed -e 's!^-j!--threads !')
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1706
757
days inactive
757
days old
kernel@lists.fedoraproject.org
16 comments
1 participants
participants (1)
-
Prarit Bhargava (via Email Bridge)