From: Prarit Bhargava <prarit(a)redhat.com>
redhat/self-test: Update data
Update data due to recent changes in the redhat/Makefile, kernel specfile,
and redhat/self-test/data/create-data.sh.
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
@@ -79,20 +79,20 @@ 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
+VERSION_ON_UPSTREAM=
+RELEASED_KERNEL=
+BUMP_RELEASE=
+INCLUDE_FEDORA_FILES=
+INCLUDE_RHEL_FILES=
PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"
PACKAGE_NAME=kernel
-GIT=git -c "core.abbrev=15"
+GIT=git
HEAD=HEAD
BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
BUILD_TARGET=--scratch temp-ark-rhel-8-test
BUILD_PROFILE=
BUILD_FLAGS=
-UPSTREAMBUILD_GIT_ONLY=
+UPSTREAMBUILD_GIT_ONLY=1
RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
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
@@ -653,6 +653,10 @@ BuildRequires: kabi-dw
%if %{signkernel}%{signmodules}
BuildRequires: openssl
%if %{signkernel}
+# ELN uses Fedora signing process, so exclude
+%if 0%{?rhel}%{?centos} && !0%{?eln}
+BuildRequires: system-sb-certs
+%endif
%ifarch x86_64 aarch64
BuildRequires: nss-tools
BuildRequires: pesign >= 0.10-4
@@ -2292,7 +2296,7 @@ export BPFTOOL=$(pwd)/tools/bpf/bpftool/bpftool
pushd tools/testing/selftests
# We need to install here because we need to call make with ARCH set which
# doesn't seem possible to do in the install section.
-%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf livepatch net net/forwarding
net/mptcp netfilter tc-testing" SKIP_TARGETS=""
INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}"
install
+%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf vm livepatch net net/forwarding
net/mptcp netfilter tc-testing" SKIP_TARGETS=""
INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}"
install
# 'make install' for bpf is broken and upstream refuses to fix it.
# Install the needed files manually.
@@ -2347,7 +2351,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${RPM_BUILD_NCPUS} xz; \
+ find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs
-P${RPM_BUILD_NCPUS} -r xz; \
fi \
%{nil}
@@ -2572,6 +2576,12 @@ find . -type f -executable -exec install -m755 {}
%{buildroot}%{_libexecdir}/ksa
find . -type f ! -executable -exec install -m644 {}
%{buildroot}%{_libexecdir}/ksamples/pktgen/{} \;
popd
popd
+# install vm selftests
+pushd tools/testing/selftests/vm
+find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/vm/{} \;
+find -type f -executable -exec install -D -m755 {}
%{buildroot}%{_libexecdir}/kselftests/vm/{} \;
+find -type f ! -executable -exec install -D -m644 {}
%{buildroot}%{_libexecdir}/kselftests/vm/{} \;
+popd
# install drivers/net/mlxsw selftests
pushd tools/testing/selftests/drivers/net/mlxsw
find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/drivers/net/mlxsw/{}
\;
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
@@ -79,20 +79,20 @@ 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
+VERSION_ON_UPSTREAM=
+RELEASED_KERNEL=
+BUMP_RELEASE=
+INCLUDE_FEDORA_FILES=
+INCLUDE_RHEL_FILES=
PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"
PACKAGE_NAME=kernel
-GIT=git -c "core.abbrev=15"
+GIT=git
HEAD=HEAD
BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
BUILD_TARGET=--scratch temp-ark-rhel-8-test
BUILD_PROFILE=
BUILD_FLAGS=
-UPSTREAMBUILD_GIT_ONLY=
+UPSTREAMBUILD_GIT_ONLY=1
RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
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
@@ -653,6 +653,10 @@ BuildRequires: kabi-dw
%if %{signkernel}%{signmodules}
BuildRequires: openssl
%if %{signkernel}
+# ELN uses Fedora signing process, so exclude
+%if 0%{?rhel}%{?centos} && !0%{?eln}
+BuildRequires: system-sb-certs
+%endif
%ifarch x86_64 aarch64
BuildRequires: nss-tools
BuildRequires: pesign >= 0.10-4
@@ -2292,7 +2296,7 @@ export BPFTOOL=$(pwd)/tools/bpf/bpftool/bpftool
pushd tools/testing/selftests
# We need to install here because we need to call make with ARCH set which
# doesn't seem possible to do in the install section.
-%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf livepatch net net/forwarding
net/mptcp netfilter tc-testing" SKIP_TARGETS=""
INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}"
install
+%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf vm livepatch net net/forwarding
net/mptcp netfilter tc-testing" SKIP_TARGETS=""
INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}"
install
# 'make install' for bpf is broken and upstream refuses to fix it.
# Install the needed files manually.
@@ -2347,7 +2351,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${RPM_BUILD_NCPUS} xz; \
+ find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs
-P${RPM_BUILD_NCPUS} -r xz; \
fi \
%{nil}
@@ -2572,6 +2576,12 @@ find . -type f -executable -exec install -m755 {}
%{buildroot}%{_libexecdir}/ksa
find . -type f ! -executable -exec install -m644 {}
%{buildroot}%{_libexecdir}/ksamples/pktgen/{} \;
popd
popd
+# install vm selftests
+pushd tools/testing/selftests/vm
+find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/vm/{} \;
+find -type f -executable -exec install -D -m755 {}
%{buildroot}%{_libexecdir}/kselftests/vm/{} \;
+find -type f ! -executable -exec install -D -m644 {}
%{buildroot}%{_libexecdir}/kselftests/vm/{} \;
+popd
# install drivers/net/mlxsw selftests
pushd tools/testing/selftests/drivers/net/mlxsw
find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/drivers/net/mlxsw/{}
\;
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
@@ -2,7 +2,7 @@
.SHELLSTATUS=0
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
-BASEVERSION=5.17.0-0.rc0.78e36f3b0dae586.6.test
+BASEVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test
BUILD=6
BUILD_FLAGS=
BUILD_PROFILE=-p stream
@@ -23,20 +23,20 @@ HEAD=78e36f3b0dae
INCLUDE_FEDORA_FILES=1
INCLUDE_RHEL_FILES=1
KABIDW=../redhat/kabi-dwarf
-KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.bz2
-KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.bz2
+KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae.6.test.tar.bz2
+KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.test.tar.bz2
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=78e36f3b0dae586
+MARKER=78e36f3b0dae
MERGE_BASE=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1
PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
RELEASED_KERNEL=0
-RELEASETAG=kernel-5.17.0-0.rc0.78e36f3b0dae586.6.test
+RELEASETAG=kernel-5.17.0-0.rc0.78e36f3b0dae.6.test
RHDISTGIT=git@gitlab.com:/kernel.git
RHDISTGIT_BRANCH=c9s
RHDISTGIT_TMP=/tmp
@@ -50,7 +50,7 @@ RPMBUILD=rpmbuild
SINGLE_TARBALL=1
SNAPSHOT=1
SOURCES=../redhat/rpm/SOURCES
-SPECBUILD=0.rc0.78e36f3b0dae586.6.test
+SPECBUILD=0.rc0.78e36f3b0dae.6.test
SPECCHANGELOG=kernel.changelog-9.99
SPECFILE=kernel.spec
SPECINCLUDE_FEDORA_FILES=1
@@ -60,40 +60,39 @@ SPECKPATCHLEVEL=17
SPECKSUBLEVEL=0
SPECKVERSION=5
SPECRELEASED_KERNEL=0
-SPECTARFILE_RELEASE=5.17.0-0.rc0.78e36f3b0dae586.6.test
+SPECTARFILE_RELEASE=5.17.0-0.rc0.78e36f3b0dae.6.test
SPECVERSION=5.17.0
-SRPM=../redhat/rpm/SRPMS/kernel-5.17.0-0.rc0.78e36f3b0dae586.6.test.el7.src.rpm
+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.78e36f3b0dae586.6.test.tar.xz
-TARFILE=linux-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.xz
+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
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
-UPSTREAMBUILD=0.rc0.78e36f3b0dae586.
-UPSTREAMBUILD_GIT_ONLY=1
-UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae586
+UPSTREAMBUILD=0.rc0.78e36f3b0dae.
+UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae
VERSION_ON_UPSTREAM=1
YSTREAM_FLAG=yes
ZSTREAM_FLAG=no
_OUTPUT=..
-_TAG=v5.16-11523-g78e36f3b0dae586
+_TAG=v5.16-11523-g78e36f3b0dae
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
+VERSION_ON_UPSTREAM=
+RELEASED_KERNEL=
+BUMP_RELEASE=
+INCLUDE_FEDORA_FILES=
+INCLUDE_RHEL_FILES=
PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"
PACKAGE_NAME=kernel
-GIT=git -c "core.abbrev=15"
+GIT=git
HEAD=HEAD
BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
BUILD_TARGET=--scratch temp-ark-rhel-8-test
BUILD_PROFILE=
BUILD_FLAGS=
-UPSTREAMBUILD_GIT_ONLY=
+UPSTREAMBUILD_GIT_ONLY=1
RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
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
@@ -124,13 +124,13 @@ Summary: The Linux kernel
%define buildid .test
%define specversion 5.17.0
%define patchversion 5.17
-%define pkgrelease 0.rc0.78e36f3b0dae586.6.test
+%define pkgrelease 0.rc0.78e36f3b0dae.6.test
%define kversion 5
-%define tarfile_release 5.17.0-0.rc0.78e36f3b0dae586.6.test
+%define tarfile_release 5.17.0-0.rc0.78e36f3b0dae.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.78e36f3b0dae586.6%{?buildid}%{?dist}
+%define specrelease 0.rc0.78e36f3b0dae.6%{?buildid}%{?dist}
#
# End of genspec.sh variables
@@ -653,6 +653,10 @@ BuildRequires: kabi-dw
%if %{signkernel}%{signmodules}
BuildRequires: openssl
%if %{signkernel}
+# ELN uses Fedora signing process, so exclude
+%if 0%{?rhel}%{?centos} && !0%{?eln}
+BuildRequires: system-sb-certs
+%endif
%ifarch x86_64 aarch64
BuildRequires: nss-tools
BuildRequires: pesign >= 0.10-4
@@ -2292,7 +2296,7 @@ export BPFTOOL=$(pwd)/tools/bpf/bpftool/bpftool
pushd tools/testing/selftests
# We need to install here because we need to call make with ARCH set which
# doesn't seem possible to do in the install section.
-%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf livepatch net net/forwarding
net/mptcp netfilter tc-testing" SKIP_TARGETS=""
INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}"
install
+%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf vm livepatch net net/forwarding
net/mptcp netfilter tc-testing" SKIP_TARGETS=""
INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}"
install
# 'make install' for bpf is broken and upstream refuses to fix it.
# Install the needed files manually.
@@ -2347,7 +2351,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${RPM_BUILD_NCPUS} xz; \
+ find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs
-P${RPM_BUILD_NCPUS} -r xz; \
fi \
%{nil}
@@ -2572,6 +2576,12 @@ find . -type f -executable -exec install -m755 {}
%{buildroot}%{_libexecdir}/ksa
find . -type f ! -executable -exec install -m644 {}
%{buildroot}%{_libexecdir}/ksamples/pktgen/{} \;
popd
popd
+# install vm selftests
+pushd tools/testing/selftests/vm
+find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/vm/{} \;
+find -type f -executable -exec install -D -m755 {}
%{buildroot}%{_libexecdir}/kselftests/vm/{} \;
+find -type f ! -executable -exec install -D -m644 {}
%{buildroot}%{_libexecdir}/kselftests/vm/{} \;
+popd
# install drivers/net/mlxsw selftests
pushd tools/testing/selftests/drivers/net/mlxsw
find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/drivers/net/mlxsw/{}
\;
@@ -3024,7 +3034,7 @@ fi
#
#
%changelog
-Mon Mar 28 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org>
[5.17.0-0.rc0.78e36f3b0dae586.6.test]
+Mon Mar 28 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org>
[5.17.0-0.rc0.78e36f3b0dae.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
@@ -2,7 +2,7 @@
.SHELLSTATUS=0
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
-BASEVERSION=5.17.0-0.rc0.78e36f3b0dae586.6.test
+BASEVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test
BUILD=6
BUILD_FLAGS=
BUILD_PROFILE=-p stream
@@ -23,20 +23,20 @@ HEAD=78e36f3b0dae
INCLUDE_FEDORA_FILES=1
INCLUDE_RHEL_FILES=1
KABIDW=../redhat/kabi-dwarf
-KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.bz2
-KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.bz2
+KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae.6.test.tar.bz2
+KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.test.tar.bz2
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=78e36f3b0dae586
+MARKER=78e36f3b0dae
MERGE_BASE=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1
PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
RELEASED_KERNEL=0
-RELEASETAG=kernel-5.17.0-0.rc0.78e36f3b0dae586.6.test
+RELEASETAG=kernel-5.17.0-0.rc0.78e36f3b0dae.6.test
RHDISTGIT=git@gitlab.com:/kernel.git
RHDISTGIT_BRANCH=c9s
RHDISTGIT_TMP=/tmp
@@ -50,7 +50,7 @@ RPMBUILD=rpmbuild
SINGLE_TARBALL=1
SNAPSHOT=1
SOURCES=../redhat/rpm/SOURCES
-SPECBUILD=0.rc0.78e36f3b0dae586.6.test
+SPECBUILD=0.rc0.78e36f3b0dae.6.test
SPECCHANGELOG=kernel.changelog-9.99
SPECFILE=kernel.spec
SPECINCLUDE_FEDORA_FILES=1
@@ -60,40 +60,39 @@ SPECKPATCHLEVEL=17
SPECKSUBLEVEL=0
SPECKVERSION=5
SPECRELEASED_KERNEL=0
-SPECTARFILE_RELEASE=5.17.0-0.rc0.78e36f3b0dae586.6.test
+SPECTARFILE_RELEASE=5.17.0-0.rc0.78e36f3b0dae.6.test
SPECVERSION=5.17.0
-SRPM=../redhat/rpm/SRPMS/kernel-5.17.0-0.rc0.78e36f3b0dae586.6.test.fc25.src.rpm
+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.78e36f3b0dae586.6.test.tar.xz
-TARFILE=linux-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.xz
+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
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
-UPSTREAMBUILD=0.rc0.78e36f3b0dae586.
-UPSTREAMBUILD_GIT_ONLY=1
-UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae586
+UPSTREAMBUILD=0.rc0.78e36f3b0dae.
+UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae
VERSION_ON_UPSTREAM=1
YSTREAM_FLAG=yes
ZSTREAM_FLAG=no
_OUTPUT=..
-_TAG=v5.16-11523-g78e36f3b0dae586
+_TAG=v5.16-11523-g78e36f3b0dae
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
+VERSION_ON_UPSTREAM=
+RELEASED_KERNEL=
+BUMP_RELEASE=
+INCLUDE_FEDORA_FILES=
+INCLUDE_RHEL_FILES=
PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"
PACKAGE_NAME=kernel
-GIT=git -c "core.abbrev=15"
+GIT=git
HEAD=HEAD
BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
BUILD_TARGET=--scratch temp-ark-rhel-8-test
BUILD_PROFILE=
BUILD_FLAGS=
-UPSTREAMBUILD_GIT_ONLY=
+UPSTREAMBUILD_GIT_ONLY=1
RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
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
@@ -124,13 +124,13 @@ Summary: The Linux kernel
%define buildid .test
%define specversion 5.17.0
%define patchversion 5.17
-%define pkgrelease 0.rc0.78e36f3b0dae586.6.test
+%define pkgrelease 0.rc0.78e36f3b0dae.6.test
%define kversion 5
-%define tarfile_release 5.17.0-0.rc0.78e36f3b0dae586.6.test
+%define tarfile_release 5.17.0-0.rc0.78e36f3b0dae.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.78e36f3b0dae586.6%{?buildid}%{?dist}
+%define specrelease 0.rc0.78e36f3b0dae.6%{?buildid}%{?dist}
#
# End of genspec.sh variables
@@ -653,6 +653,10 @@ BuildRequires: kabi-dw
%if %{signkernel}%{signmodules}
BuildRequires: openssl
%if %{signkernel}
+# ELN uses Fedora signing process, so exclude
+%if 0%{?rhel}%{?centos} && !0%{?eln}
+BuildRequires: system-sb-certs
+%endif
%ifarch x86_64 aarch64
BuildRequires: nss-tools
BuildRequires: pesign >= 0.10-4
@@ -2292,7 +2296,7 @@ export BPFTOOL=$(pwd)/tools/bpf/bpftool/bpftool
pushd tools/testing/selftests
# We need to install here because we need to call make with ARCH set which
# doesn't seem possible to do in the install section.
-%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf livepatch net net/forwarding
net/mptcp netfilter tc-testing" SKIP_TARGETS=""
INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}"
install
+%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf vm livepatch net net/forwarding
net/mptcp netfilter tc-testing" SKIP_TARGETS=""
INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}"
install
# 'make install' for bpf is broken and upstream refuses to fix it.
# Install the needed files manually.
@@ -2347,7 +2351,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${RPM_BUILD_NCPUS} xz; \
+ find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs
-P${RPM_BUILD_NCPUS} -r xz; \
fi \
%{nil}
@@ -2572,6 +2576,12 @@ find . -type f -executable -exec install -m755 {}
%{buildroot}%{_libexecdir}/ksa
find . -type f ! -executable -exec install -m644 {}
%{buildroot}%{_libexecdir}/ksamples/pktgen/{} \;
popd
popd
+# install vm selftests
+pushd tools/testing/selftests/vm
+find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/vm/{} \;
+find -type f -executable -exec install -D -m755 {}
%{buildroot}%{_libexecdir}/kselftests/vm/{} \;
+find -type f ! -executable -exec install -D -m644 {}
%{buildroot}%{_libexecdir}/kselftests/vm/{} \;
+popd
# install drivers/net/mlxsw selftests
pushd tools/testing/selftests/drivers/net/mlxsw
find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/drivers/net/mlxsw/{}
\;
@@ -3024,7 +3034,7 @@ fi
#
#
%changelog
-Mon Mar 28 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org>
[5.17.0-0.rc0.78e36f3b0dae586.6.test]
+Mon Mar 28 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org>
[5.17.0-0.rc0.78e36f3b0dae.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
@@ -79,20 +79,20 @@ 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
+VERSION_ON_UPSTREAM=
+RELEASED_KERNEL=
+BUMP_RELEASE=
+INCLUDE_FEDORA_FILES=
+INCLUDE_RHEL_FILES=
PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"
PACKAGE_NAME=kernel
-GIT=git -c "core.abbrev=15"
+GIT=git
HEAD=HEAD
BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
BUILD_TARGET=--scratch temp-ark-rhel-8-test
BUILD_PROFILE=
BUILD_FLAGS=
-UPSTREAMBUILD_GIT_ONLY=
+UPSTREAMBUILD_GIT_ONLY=1
RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
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
@@ -653,6 +653,10 @@ BuildRequires: kabi-dw
%if %{signkernel}%{signmodules}
BuildRequires: openssl
%if %{signkernel}
+# ELN uses Fedora signing process, so exclude
+%if 0%{?rhel}%{?centos} && !0%{?eln}
+BuildRequires: system-sb-certs
+%endif
%ifarch x86_64 aarch64
BuildRequires: nss-tools
BuildRequires: pesign >= 0.10-4
@@ -2292,7 +2296,7 @@ export BPFTOOL=$(pwd)/tools/bpf/bpftool/bpftool
pushd tools/testing/selftests
# We need to install here because we need to call make with ARCH set which
# doesn't seem possible to do in the install section.
-%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf livepatch net net/forwarding
net/mptcp netfilter tc-testing" SKIP_TARGETS=""
INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}"
install
+%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf vm livepatch net net/forwarding
net/mptcp netfilter tc-testing" SKIP_TARGETS=""
INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}"
install
# 'make install' for bpf is broken and upstream refuses to fix it.
# Install the needed files manually.
@@ -2347,7 +2351,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${RPM_BUILD_NCPUS} xz; \
+ find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs
-P${RPM_BUILD_NCPUS} -r xz; \
fi \
%{nil}
@@ -2572,6 +2576,12 @@ find . -type f -executable -exec install -m755 {}
%{buildroot}%{_libexecdir}/ksa
find . -type f ! -executable -exec install -m644 {}
%{buildroot}%{_libexecdir}/ksamples/pktgen/{} \;
popd
popd
+# install vm selftests
+pushd tools/testing/selftests/vm
+find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/vm/{} \;
+find -type f -executable -exec install -D -m755 {}
%{buildroot}%{_libexecdir}/kselftests/vm/{} \;
+find -type f ! -executable -exec install -D -m644 {}
%{buildroot}%{_libexecdir}/kselftests/vm/{} \;
+popd
# install drivers/net/mlxsw selftests
pushd tools/testing/selftests/drivers/net/mlxsw
find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/drivers/net/mlxsw/{}
\;
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
@@ -79,20 +79,20 @@ 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
+VERSION_ON_UPSTREAM=
+RELEASED_KERNEL=
+BUMP_RELEASE=
+INCLUDE_FEDORA_FILES=
+INCLUDE_RHEL_FILES=
PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"
PACKAGE_NAME=kernel
-GIT=git -c "core.abbrev=15"
+GIT=git
HEAD=HEAD
BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
BUILD_TARGET=--scratch temp-ark-rhel-8-test
BUILD_PROFILE=
BUILD_FLAGS=
-UPSTREAMBUILD_GIT_ONLY=
+UPSTREAMBUILD_GIT_ONLY=1
RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
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
@@ -653,6 +653,10 @@ BuildRequires: kabi-dw
%if %{signkernel}%{signmodules}
BuildRequires: openssl
%if %{signkernel}
+# ELN uses Fedora signing process, so exclude
+%if 0%{?rhel}%{?centos} && !0%{?eln}
+BuildRequires: system-sb-certs
+%endif
%ifarch x86_64 aarch64
BuildRequires: nss-tools
BuildRequires: pesign >= 0.10-4
@@ -2292,7 +2296,7 @@ export BPFTOOL=$(pwd)/tools/bpf/bpftool/bpftool
pushd tools/testing/selftests
# We need to install here because we need to call make with ARCH set which
# doesn't seem possible to do in the install section.
-%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf livepatch net net/forwarding
net/mptcp netfilter tc-testing" SKIP_TARGETS=""
INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}"
install
+%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf vm livepatch net net/forwarding
net/mptcp netfilter tc-testing" SKIP_TARGETS=""
INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}"
install
# 'make install' for bpf is broken and upstream refuses to fix it.
# Install the needed files manually.
@@ -2347,7 +2351,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${RPM_BUILD_NCPUS} xz; \
+ find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs
-P${RPM_BUILD_NCPUS} -r xz; \
fi \
%{nil}
@@ -2572,6 +2576,12 @@ find . -type f -executable -exec install -m755 {}
%{buildroot}%{_libexecdir}/ksa
find . -type f ! -executable -exec install -m644 {}
%{buildroot}%{_libexecdir}/ksamples/pktgen/{} \;
popd
popd
+# install vm selftests
+pushd tools/testing/selftests/vm
+find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/vm/{} \;
+find -type f -executable -exec install -D -m755 {}
%{buildroot}%{_libexecdir}/kselftests/vm/{} \;
+find -type f ! -executable -exec install -D -m644 {}
%{buildroot}%{_libexecdir}/kselftests/vm/{} \;
+popd
# install drivers/net/mlxsw selftests
pushd tools/testing/selftests/drivers/net/mlxsw
find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/drivers/net/mlxsw/{}
\;
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
@@ -2,7 +2,7 @@
.SHELLSTATUS=0
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
-BASEVERSION=5.16.0-0.rc5.fce15c45d3fbd9f.6.test
+BASEVERSION=5.16.0-0.rc5.fce15c45d3fb.6.test
BUILD=6
BUILD_FLAGS=
BUILD_PROFILE=-p stream
@@ -23,20 +23,20 @@ HEAD=fce15c45d3fb
INCLUDE_FEDORA_FILES=1
INCLUDE_RHEL_FILES=1
KABIDW=../redhat/kabi-dwarf
-KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.tar.bz2
-KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.tar.bz2
+KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.fce15c45d3fb.6.test.tar.bz2
+KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.fce15c45d3fb.6.test.tar.bz2
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=fce15c45d3fbd9f
+MARKER=fce15c45d3fb
MERGE_BASE=fce15c45d3fbd9fc1feaaf3210d8e3f8b33dfd3a
PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
RELEASED_KERNEL=0
-RELEASETAG=kernel-5.16.0-0.rc5.fce15c45d3fbd9f.6.test
+RELEASETAG=kernel-5.16.0-0.rc5.fce15c45d3fb.6.test
RHDISTGIT=git@gitlab.com:/kernel.git
RHDISTGIT_BRANCH=c9s
RHDISTGIT_TMP=/tmp
@@ -50,7 +50,7 @@ RPMBUILD=rpmbuild
SINGLE_TARBALL=1
SNAPSHOT=1
SOURCES=../redhat/rpm/SOURCES
-SPECBUILD=0.rc5.fce15c45d3fbd9f.6.test
+SPECBUILD=0.rc5.fce15c45d3fb.6.test
SPECCHANGELOG=kernel.changelog-9.99
SPECFILE=kernel.spec
SPECINCLUDE_FEDORA_FILES=1
@@ -60,40 +60,39 @@ SPECKPATCHLEVEL=16
SPECKSUBLEVEL=0
SPECKVERSION=5
SPECRELEASED_KERNEL=0
-SPECTARFILE_RELEASE=5.16.0-0.rc5.fce15c45d3fbd9f.6.test
+SPECTARFILE_RELEASE=5.16.0-0.rc5.fce15c45d3fb.6.test
SPECVERSION=5.16.0
-SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.el7.src.rpm
+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.fce15c45d3fbd9f.6.test.tar.xz
-TARFILE=linux-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.tar.xz
+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
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
-UPSTREAMBUILD=0.rc5.fce15c45d3fbd9f.
-UPSTREAMBUILD_GIT_ONLY=1
-UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fbd9f
+UPSTREAMBUILD=0.rc5.fce15c45d3fb.
+UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fb
VERSION_ON_UPSTREAM=1
YSTREAM_FLAG=yes
ZSTREAM_FLAG=no
_OUTPUT=..
-_TAG=v5.16-rc5-1-gfce15c45d3fbd9f
+_TAG=v5.16-rc5-1-gfce15c45d3fb
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
+VERSION_ON_UPSTREAM=
+RELEASED_KERNEL=
+BUMP_RELEASE=
+INCLUDE_FEDORA_FILES=
+INCLUDE_RHEL_FILES=
PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"
PACKAGE_NAME=kernel
-GIT=git -c "core.abbrev=15"
+GIT=git
HEAD=HEAD
BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
BUILD_TARGET=--scratch temp-ark-rhel-8-test
BUILD_PROFILE=
BUILD_FLAGS=
-UPSTREAMBUILD_GIT_ONLY=
+UPSTREAMBUILD_GIT_ONLY=1
RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
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
@@ -124,13 +124,13 @@ Summary: The Linux kernel
%define buildid .test
%define specversion 5.16.0
%define patchversion 5.16
-%define pkgrelease 0.rc5.fce15c45d3fbd9f.6.test
+%define pkgrelease 0.rc5.fce15c45d3fb.6.test
%define kversion 5
-%define tarfile_release 5.16.0-0.rc5.fce15c45d3fbd9f.6.test
+%define tarfile_release 5.16.0-0.rc5.fce15c45d3fb.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.fce15c45d3fbd9f.6%{?buildid}%{?dist}
+%define specrelease 0.rc5.fce15c45d3fb.6%{?buildid}%{?dist}
#
# End of genspec.sh variables
@@ -653,6 +653,10 @@ BuildRequires: kabi-dw
%if %{signkernel}%{signmodules}
BuildRequires: openssl
%if %{signkernel}
+# ELN uses Fedora signing process, so exclude
+%if 0%{?rhel}%{?centos} && !0%{?eln}
+BuildRequires: system-sb-certs
+%endif
%ifarch x86_64 aarch64
BuildRequires: nss-tools
BuildRequires: pesign >= 0.10-4
@@ -2292,7 +2296,7 @@ export BPFTOOL=$(pwd)/tools/bpf/bpftool/bpftool
pushd tools/testing/selftests
# We need to install here because we need to call make with ARCH set which
# doesn't seem possible to do in the install section.
-%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf livepatch net net/forwarding
net/mptcp netfilter tc-testing" SKIP_TARGETS=""
INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}"
install
+%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf vm livepatch net net/forwarding
net/mptcp netfilter tc-testing" SKIP_TARGETS=""
INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}"
install
# 'make install' for bpf is broken and upstream refuses to fix it.
# Install the needed files manually.
@@ -2347,7 +2351,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${RPM_BUILD_NCPUS} xz; \
+ find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs
-P${RPM_BUILD_NCPUS} -r xz; \
fi \
%{nil}
@@ -2572,6 +2576,12 @@ find . -type f -executable -exec install -m755 {}
%{buildroot}%{_libexecdir}/ksa
find . -type f ! -executable -exec install -m644 {}
%{buildroot}%{_libexecdir}/ksamples/pktgen/{} \;
popd
popd
+# install vm selftests
+pushd tools/testing/selftests/vm
+find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/vm/{} \;
+find -type f -executable -exec install -D -m755 {}
%{buildroot}%{_libexecdir}/kselftests/vm/{} \;
+find -type f ! -executable -exec install -D -m644 {}
%{buildroot}%{_libexecdir}/kselftests/vm/{} \;
+popd
# install drivers/net/mlxsw selftests
pushd tools/testing/selftests/drivers/net/mlxsw
find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/drivers/net/mlxsw/{}
\;
@@ -3024,7 +3034,7 @@ fi
#
#
%changelog
-Mon Mar 28 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org>
[5.16.0-0.rc5.fce15c45d3fbd9f.6.test]
+Mon Mar 28 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org>
[5.16.0-0.rc5.fce15c45d3fb.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
@@ -2,7 +2,7 @@
.SHELLSTATUS=0
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
-BASEVERSION=5.16.0-0.rc5.fce15c45d3fbd9f.6.test
+BASEVERSION=5.16.0-0.rc5.fce15c45d3fb.6.test
BUILD=6
BUILD_FLAGS=
BUILD_PROFILE=-p stream
@@ -23,20 +23,20 @@ HEAD=fce15c45d3fb
INCLUDE_FEDORA_FILES=1
INCLUDE_RHEL_FILES=1
KABIDW=../redhat/kabi-dwarf
-KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.tar.bz2
-KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.tar.bz2
+KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.fce15c45d3fb.6.test.tar.bz2
+KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.fce15c45d3fb.6.test.tar.bz2
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=fce15c45d3fbd9f
+MARKER=fce15c45d3fb
MERGE_BASE=fce15c45d3fbd9fc1feaaf3210d8e3f8b33dfd3a
PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
RELEASED_KERNEL=0
-RELEASETAG=kernel-5.16.0-0.rc5.fce15c45d3fbd9f.6.test
+RELEASETAG=kernel-5.16.0-0.rc5.fce15c45d3fb.6.test
RHDISTGIT=git@gitlab.com:/kernel.git
RHDISTGIT_BRANCH=c9s
RHDISTGIT_TMP=/tmp
@@ -50,7 +50,7 @@ RPMBUILD=rpmbuild
SINGLE_TARBALL=1
SNAPSHOT=1
SOURCES=../redhat/rpm/SOURCES
-SPECBUILD=0.rc5.fce15c45d3fbd9f.6.test
+SPECBUILD=0.rc5.fce15c45d3fb.6.test
SPECCHANGELOG=kernel.changelog-9.99
SPECFILE=kernel.spec
SPECINCLUDE_FEDORA_FILES=1
@@ -60,40 +60,39 @@ SPECKPATCHLEVEL=16
SPECKSUBLEVEL=0
SPECKVERSION=5
SPECRELEASED_KERNEL=0
-SPECTARFILE_RELEASE=5.16.0-0.rc5.fce15c45d3fbd9f.6.test
+SPECTARFILE_RELEASE=5.16.0-0.rc5.fce15c45d3fb.6.test
SPECVERSION=5.16.0
-SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.fc25.src.rpm
+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.fce15c45d3fbd9f.6.test.tar.xz
-TARFILE=linux-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.tar.xz
+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
TESTPATCH=../redhat/linux-kernel-test.patch
TOPDIR=..
-UPSTREAMBUILD=0.rc5.fce15c45d3fbd9f.
-UPSTREAMBUILD_GIT_ONLY=1
-UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fbd9f
+UPSTREAMBUILD=0.rc5.fce15c45d3fb.
+UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fb
VERSION_ON_UPSTREAM=1
YSTREAM_FLAG=yes
ZSTREAM_FLAG=no
_OUTPUT=..
-_TAG=v5.16-rc5-1-gfce15c45d3fbd9f
+_TAG=v5.16-rc5-1-gfce15c45d3fb
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
+VERSION_ON_UPSTREAM=
+RELEASED_KERNEL=
+BUMP_RELEASE=
+INCLUDE_FEDORA_FILES=
+INCLUDE_RHEL_FILES=
PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"
PACKAGE_NAME=kernel
-GIT=git -c "core.abbrev=15"
+GIT=git
HEAD=HEAD
BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
BUILD_TARGET=--scratch temp-ark-rhel-8-test
BUILD_PROFILE=
BUILD_FLAGS=
-UPSTREAMBUILD_GIT_ONLY=
+UPSTREAMBUILD_GIT_ONLY=1
RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
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
@@ -124,13 +124,13 @@ Summary: The Linux kernel
%define buildid .test
%define specversion 5.16.0
%define patchversion 5.16
-%define pkgrelease 0.rc5.fce15c45d3fbd9f.6.test
+%define pkgrelease 0.rc5.fce15c45d3fb.6.test
%define kversion 5
-%define tarfile_release 5.16.0-0.rc5.fce15c45d3fbd9f.6.test
+%define tarfile_release 5.16.0-0.rc5.fce15c45d3fb.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.fce15c45d3fbd9f.6%{?buildid}%{?dist}
+%define specrelease 0.rc5.fce15c45d3fb.6%{?buildid}%{?dist}
#
# End of genspec.sh variables
@@ -653,6 +653,10 @@ BuildRequires: kabi-dw
%if %{signkernel}%{signmodules}
BuildRequires: openssl
%if %{signkernel}
+# ELN uses Fedora signing process, so exclude
+%if 0%{?rhel}%{?centos} && !0%{?eln}
+BuildRequires: system-sb-certs
+%endif
%ifarch x86_64 aarch64
BuildRequires: nss-tools
BuildRequires: pesign >= 0.10-4
@@ -2292,7 +2296,7 @@ export BPFTOOL=$(pwd)/tools/bpf/bpftool/bpftool
pushd tools/testing/selftests
# We need to install here because we need to call make with ARCH set which
# doesn't seem possible to do in the install section.
-%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf livepatch net net/forwarding
net/mptcp netfilter tc-testing" SKIP_TARGETS=""
INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}"
install
+%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf vm livepatch net net/forwarding
net/mptcp netfilter tc-testing" SKIP_TARGETS=""
INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}"
install
# 'make install' for bpf is broken and upstream refuses to fix it.
# Install the needed files manually.
@@ -2347,7 +2351,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${RPM_BUILD_NCPUS} xz; \
+ find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs
-P${RPM_BUILD_NCPUS} -r xz; \
fi \
%{nil}
@@ -2572,6 +2576,12 @@ find . -type f -executable -exec install -m755 {}
%{buildroot}%{_libexecdir}/ksa
find . -type f ! -executable -exec install -m644 {}
%{buildroot}%{_libexecdir}/ksamples/pktgen/{} \;
popd
popd
+# install vm selftests
+pushd tools/testing/selftests/vm
+find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/vm/{} \;
+find -type f -executable -exec install -D -m755 {}
%{buildroot}%{_libexecdir}/kselftests/vm/{} \;
+find -type f ! -executable -exec install -D -m644 {}
%{buildroot}%{_libexecdir}/kselftests/vm/{} \;
+popd
# install drivers/net/mlxsw selftests
pushd tools/testing/selftests/drivers/net/mlxsw
find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/drivers/net/mlxsw/{}
\;
@@ -3024,7 +3034,7 @@ fi
#
#
%changelog
-Mon Mar 28 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org>
[5.16.0-0.rc5.fce15c45d3fbd9f.6.test]
+Mon Mar 28 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org>
[5.16.0-0.rc5.fce15c45d3fb.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
@@ -77,20 +77,20 @@ 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
+VERSION_ON_UPSTREAM=
+RELEASED_KERNEL=
+BUMP_RELEASE=
+INCLUDE_FEDORA_FILES=
+INCLUDE_RHEL_FILES=
PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"
PACKAGE_NAME=kernel
-GIT=git -c "core.abbrev=15"
+GIT=git
HEAD=HEAD
BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
BUILD_TARGET=--scratch temp-ark-rhel-8-test
BUILD_PROFILE=
BUILD_FLAGS=
-UPSTREAMBUILD_GIT_ONLY=
+UPSTREAMBUILD_GIT_ONLY=1
RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
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
@@ -653,6 +653,10 @@ BuildRequires: kabi-dw
%if %{signkernel}%{signmodules}
BuildRequires: openssl
%if %{signkernel}
+# ELN uses Fedora signing process, so exclude
+%if 0%{?rhel}%{?centos} && !0%{?eln}
+BuildRequires: system-sb-certs
+%endif
%ifarch x86_64 aarch64
BuildRequires: nss-tools
BuildRequires: pesign >= 0.10-4
@@ -2292,7 +2296,7 @@ export BPFTOOL=$(pwd)/tools/bpf/bpftool/bpftool
pushd tools/testing/selftests
# We need to install here because we need to call make with ARCH set which
# doesn't seem possible to do in the install section.
-%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf livepatch net net/forwarding
net/mptcp netfilter tc-testing" SKIP_TARGETS=""
INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}"
install
+%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf vm livepatch net net/forwarding
net/mptcp netfilter tc-testing" SKIP_TARGETS=""
INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}"
install
# 'make install' for bpf is broken and upstream refuses to fix it.
# Install the needed files manually.
@@ -2347,7 +2351,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${RPM_BUILD_NCPUS} xz; \
+ find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs
-P${RPM_BUILD_NCPUS} -r xz; \
fi \
%{nil}
@@ -2572,6 +2576,12 @@ find . -type f -executable -exec install -m755 {}
%{buildroot}%{_libexecdir}/ksa
find . -type f ! -executable -exec install -m644 {}
%{buildroot}%{_libexecdir}/ksamples/pktgen/{} \;
popd
popd
+# install vm selftests
+pushd tools/testing/selftests/vm
+find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/vm/{} \;
+find -type f -executable -exec install -D -m755 {}
%{buildroot}%{_libexecdir}/kselftests/vm/{} \;
+find -type f ! -executable -exec install -D -m644 {}
%{buildroot}%{_libexecdir}/kselftests/vm/{} \;
+popd
# install drivers/net/mlxsw selftests
pushd tools/testing/selftests/drivers/net/mlxsw
find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/drivers/net/mlxsw/{}
\;
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
@@ -77,20 +77,20 @@ 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
+VERSION_ON_UPSTREAM=
+RELEASED_KERNEL=
+BUMP_RELEASE=
+INCLUDE_FEDORA_FILES=
+INCLUDE_RHEL_FILES=
PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"
PACKAGE_NAME=kernel
-GIT=git -c "core.abbrev=15"
+GIT=git
HEAD=HEAD
BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
BUILD_TARGET=--scratch temp-ark-rhel-8-test
BUILD_PROFILE=
BUILD_FLAGS=
-UPSTREAMBUILD_GIT_ONLY=
+UPSTREAMBUILD_GIT_ONLY=1
RHGITCOMMIT=HEAD
RHJOBS=1
NO_CONFIGCHECKS=
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
@@ -653,6 +653,10 @@ BuildRequires: kabi-dw
%if %{signkernel}%{signmodules}
BuildRequires: openssl
%if %{signkernel}
+# ELN uses Fedora signing process, so exclude
+%if 0%{?rhel}%{?centos} && !0%{?eln}
+BuildRequires: system-sb-certs
+%endif
%ifarch x86_64 aarch64
BuildRequires: nss-tools
BuildRequires: pesign >= 0.10-4
@@ -2292,7 +2296,7 @@ export BPFTOOL=$(pwd)/tools/bpf/bpftool/bpftool
pushd tools/testing/selftests
# We need to install here because we need to call make with ARCH set which
# doesn't seem possible to do in the install section.
-%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf livepatch net net/forwarding
net/mptcp netfilter tc-testing" SKIP_TARGETS=""
INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}"
install
+%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf vm livepatch net net/forwarding
net/mptcp netfilter tc-testing" SKIP_TARGETS=""
INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}"
install
# 'make install' for bpf is broken and upstream refuses to fix it.
# Install the needed files manually.
@@ -2347,7 +2351,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${RPM_BUILD_NCPUS} xz; \
+ find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs
-P${RPM_BUILD_NCPUS} -r xz; \
fi \
%{nil}
@@ -2572,6 +2576,12 @@ find . -type f -executable -exec install -m755 {}
%{buildroot}%{_libexecdir}/ksa
find . -type f ! -executable -exec install -m644 {}
%{buildroot}%{_libexecdir}/ksamples/pktgen/{} \;
popd
popd
+# install vm selftests
+pushd tools/testing/selftests/vm
+find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/vm/{} \;
+find -type f -executable -exec install -D -m755 {}
%{buildroot}%{_libexecdir}/kselftests/vm/{} \;
+find -type f ! -executable -exec install -D -m644 {}
%{buildroot}%{_libexecdir}/kselftests/vm/{} \;
+popd
# install drivers/net/mlxsw selftests
pushd tools/testing/selftests/drivers/net/mlxsw
find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/drivers/net/mlxsw/{}
\;
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1741