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=aa5b537b0ecc16992577b013f11112d54c7ce869
+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=aa5b537b0ecc16992577b013f11112d54c7ce869
+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=aa5b537b0ecc16992577b013f11112d54c7ce869
-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=aa5b537b0ecc16992577b013f11112d54c7ce869
-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=aa5b537b0ecc16992577b013f11112d54c7ce869
+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=aa5b537b0ecc16992577b013f11112d54c7ce869
+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=aa5b537b0ecc16992577b013f11112d54c7ce869
-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=aa5b537b0ecc16992577b013f11112d54c7ce869
-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=aa5b537b0ecc16992577b013f11112d54c7ce869
+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=aa5b537b0ecc16992577b013f11112d54c7ce869
+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=aa5b537b0ecc16992577b013f11112d54c7ce869
-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=aa5b537b0ecc16992577b013f11112d54c7ce869
-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=aa5b537b0ecc16992577b013f11112d54c7ce869
+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