12:26 p.m.
From: Prarit Bhargava on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2021
centos-stream-9 !1308 [1] updates the redhat/ directory in centos-stream-9
to match that of ARK. After that update there are about 40 changes that
are not applied to ARK but have been applied to "downstream"
centos-stream-9. Some of these changes are centos-stream-9/RHEL9 specific
changes that should not be applied to ARK, and this MR applies the
remaining set to ARK.
Update with RHEL-only changes.
[1] https://gitlab.com/redhat/centos-stream/src/kernel/centos-
stream-9/-/merge_requests/1308
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
---
redhat/kabi/check-kabi | 39 +-
redhat/kabi/diff-kabi | 42 +
redhat/kabi/show-kabi | 31 +-
redhat/kabi/symtype-generate | 678 ++++++++++++++++++++
redhat/kabi/symtypes | 238 +++++++
redhat/kabi/update-kabi | 125 +++
redhat/rhel_files/filter-i686.sh.rhel | 0
redhat/scripts/clone_tree.sh | 32 -
redhat/scripts/merge-subtrees.sh | 2 +-
redhat/scripts/rh-dist-git.sh | 10 +-
redhat/self-test/data/centos-2585cf9dfaad.el7 | 9 +-
redhat/self-test/data/centos-2585cf9dfaad.el7.spec | 2 +-
redhat/self-test/data/centos-2585cf9dfaad.fc25 | 9 +-
redhat/self-test/data/centos-2585cf9dfaad.fc25.spec | 2 +-
redhat/self-test/data/centos-78e36f3b0dae.el7 | 9 +-
redhat/self-test/data/centos-78e36f3b0dae.el7.spec | 2 +-
redhat/self-test/data/centos-78e36f3b0dae.fc25 | 9 +-
redhat/self-test/data/centos-78e36f3b0dae.fc25.spec | 2 +-
redhat/self-test/data/centos-df0cc57e057f.el7 | 9 +-
redhat/self-test/data/centos-df0cc57e057f.el7.spec | 2 +-
redhat/self-test/data/centos-df0cc57e057f.fc25 | 9 +-
redhat/self-test/data/centos-df0cc57e057f.fc25.spec | 2 +-
redhat/self-test/data/centos-fce15c45d3fb.el7 | 9 +-
redhat/self-test/data/centos-fce15c45d3fb.el7.spec | 2 +-
redhat/self-test/data/centos-fce15c45d3fb.fc25 | 9 +-
redhat/self-test/data/centos-fce15c45d3fb.fc25.spec | 2 +-
redhat/self-test/data/create-data.sh | 3 +-
redhat/self-test/data/fedora-2585cf9dfaad.el7 | 6 +-
redhat/self-test/data/fedora-2585cf9dfaad.fc25 | 6 +-
redhat/self-test/data/fedora-78e36f3b0dae.el7 | 6 +-
redhat/self-test/data/fedora-78e36f3b0dae.fc25 | 6 +-
redhat/self-test/data/fedora-df0cc57e057f.el7 | 6 +-
redhat/self-test/data/fedora-df0cc57e057f.fc25 | 6 +-
redhat/self-test/data/fedora-fce15c45d3fb.el7 | 6 +-
redhat/self-test/data/fedora-fce15c45d3fb.fc25 | 6 +-
redhat/self-test/data/rhel-2585cf9dfaad.el7 | 8 +-
redhat/self-test/data/rhel-2585cf9dfaad.el7.spec | 2 +-
redhat/self-test/data/rhel-2585cf9dfaad.fc25 | 8 +-
redhat/self-test/data/rhel-2585cf9dfaad.fc25.spec | 2 +-
redhat/self-test/data/rhel-78e36f3b0dae.el7 | 8 +-
redhat/self-test/data/rhel-78e36f3b0dae.el7.spec | 2 +-
redhat/self-test/data/rhel-78e36f3b0dae.fc25 | 8 +-
redhat/self-test/data/rhel-78e36f3b0dae.fc25.spec | 2 +-
redhat/self-test/data/rhel-df0cc57e057f.el7 | 8 +-
redhat/self-test/data/rhel-df0cc57e057f.el7.spec | 2 +-
redhat/self-test/data/rhel-df0cc57e057f.fc25 | 8 +-
redhat/self-test/data/rhel-df0cc57e057f.fc25.spec | 2 +-
redhat/self-test/data/rhel-fce15c45d3fb.el7 | 8 +-
redhat/self-test/data/rhel-fce15c45d3fb.el7.spec | 2 +-
redhat/self-test/data/rhel-fce15c45d3fb.fc25 | 8 +-
redhat/self-test/data/rhel-fce15c45d3fb.fc25.spec | 2 +-
redhat/Makefile | 107 ++-
redhat/Makefile.rhpkg | 13 -
redhat/Makefile.variables | 17 +
redhat/genspec.sh | 3 +-
redhat/kernel.spec.template | 38 +-
56 files changed, 1447 insertions(+), 147 deletions(-)
12:26 p.m.
New subject: [OS-BUILD PATCHv4 1/19] redhat/self-test: Ignore .rhpkg.mk files
From: Prarit Bhargava <prarit(a)redhat.com>
redhat/self-test: Ignore .rhpkg.mk files
If a user specifies, for example, a ~/.rhpkg.mk file, the file will be
included in the MAKEFILE_LIST variable. This breaks the
dist-dump-variables test, so these files should be excluded.
Ignore user specified .rhpkg.mk files.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
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
@@ -61,7 +61,8 @@ do
grep -v -w RHGITURL |\
grep -v -w RHDISTDATADIR |\
grep -v -w VARS |\
- sort -u >& "${destdir}/${varfilename}" &
+ sort -u >& "${destdir}/${varfilename}" && \
+ sed -i 's/ \S*\(rhpkg.mk\)\S*//g' "${destdir}/${varfilename}"
&
waitpids[${count}]=$!
((count++))
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2021
12:26 p.m.
New subject: [OS-BUILD PATCHv4 2/19] redhat: kernel.spec: selftests: abort on
build failure
From: Prarit Bhargava <prarit(a)redhat.com>
redhat: kernel.spec: selftests: abort on build failure
When a selftest does not compile, abort the whole build. We want to know
that we broke selftests by a backport.
This commit is forward ported from RHEL 8. It could not have been forward
ported to ARK: with rebases to the upstream the bpf selftests break all the
time. Now it's the first opportunity when we can take it.
Signed-off-by: Jiri Benc <jbenc(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
@@ -124,3 +124,7 @@ 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 ?=
+
+# If set to 1, this variable will cause the kernel package build to fail if
+# the selftests fail to build.
+SPECSELFTESTS_MUST_BUILD ?= 0
diff --git a/redhat/genspec.sh b/redhat/genspec.sh
index blahblah..blahblah 100755
--- a/redhat/genspec.sh
+++ b/redhat/genspec.sh
@@ -65,7 +65,8 @@ test -f "$SOURCES/$SPECFILE" &&
s/%%SPECPATCHLIST_CHANGELOG%%/$SPECPATCHLIST_CHANGELOG/
s/%%SPECVERSION%%/$SPECVERSION/
s/%%SPECKABIVERSION%%/$SPECKABIVERSION/
- s/%%SPECTARFILE_RELEASE%%/$SPECTARFILE_RELEASE/" "$SOURCES/$SPECFILE"
+ s/%%SPECTARFILE_RELEASE%%/$SPECTARFILE_RELEASE/
+ s/%%SPECSELFTESTS_MUST_BUILD%%/$SPECSELFTESTS_MUST_BUILD/"
"$SOURCES/$SPECFILE"
test -n "$RHSELFTESTDATA" && test -f "$SOURCES/$SPECFILE"
&& sed -i -e "
/%%SPECCHANGELOG%%/r $SOURCES/$SPECCHANGELOG
/%%SPECCHANGELOG%%/d" "$SOURCES/$SPECFILE"
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
@@ -134,6 +134,10 @@ Summary: The Linux kernel
# This defines the kabi tarball version
%define kabiversion %%SPECKABIVERSION%%
+# If this variable is set to 1, a bpf selftests build failure will cause a
+# fatal kernel package build error
+%define selftests_must_build %%SPECSELFTESTS_MUST_BUILD%%
+
#
# End of genspec.sh variables
#
@@ -2351,7 +2355,8 @@ 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 vm 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=""
FORCE_TARGETS=%{selftests_must_build} 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.
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2021
12:27 p.m.
New subject: [OS-BUILD PATCHv4 3/19] redhat/kernel.spec.template: Link perf with
--export-dynamic
From: Prarit Bhargava <prarit(a)redhat.com>
redhat/kernel.spec.template: Link perf with --export-dynamic
Bugzilla: INTERNAL
commit 00702a636e319b2c3fe913f3b8a8cff51cf96ff6
Author: Michael Petlan <mpetlan(a)redhat.com>
Date: Tue Nov 23 11:52:24 2021 +0100
redhat/kernel.spec.template: Link perf with --export-dynamic
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2006775
Upstream Status: RHEL only
As said in comment #6 of the BZ [1], all distribution applications
should contain minidebuginfo.
[1] https://bugzilla.redhat.com/show_bug.cgi?id=2006775#c6
Signed-off-by: Michael Petlan <mpetlan(a)redhat.com>
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
@@ -2275,7 +2275,7 @@ InitBuildVars
%global perf_build_extra_opts CORESIGHT=1
%endif
%global perf_make \
- %{__make} %{?make_opts} EXTRA_CFLAGS="${RPM_OPT_FLAGS}"
LDFLAGS="%{__global_ldflags}" %{?cross_opts} -C tools/perf V=1
NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1
NO_GTK2=1 NO_STRLCPY=1 NO_BIONIC=1 LIBBPF_DYNAMIC=1 LIBTRACEEVENT_DYNAMIC=1
%{?perf_build_extra_opts} prefix=%{_prefix} PYTHON=%{__python3}
+ %{__make} %{?make_opts} EXTRA_CFLAGS="${RPM_OPT_FLAGS}"
LDFLAGS="%{__global_ldflags} -Wl,-E" %{?cross_opts} -C tools/perf V=1
NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1
NO_GTK2=1 NO_STRLCPY=1 NO_BIONIC=1 LIBBPF_DYNAMIC=1 LIBTRACEEVENT_DYNAMIC=1
%{?perf_build_extra_opts} prefix=%{_prefix} PYTHON=%{__python3}
%if %{with_perf}
# perf
# make sure check-headers.sh is executable
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2021
12:27 p.m.
New subject: [OS-BUILD PATCHv4 4/19] redhat: build and include memfd to
kernel-selftests-internal
From: Prarit Bhargava <prarit(a)redhat.com>
redhat: build and include memfd to kernel-selftests-internal
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2027506
Upstream Status: RHEL9 only
Tested: by reporter
This patch adds memfd to the list of selftests built and packaged in
kernel-selftests-internal.
Signed-off-by: Aristeu Rozanski <arozansk(a)redhat.com>
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
@@ -630,7 +630,7 @@ BuildRequires: python3-docutils
BuildRequires: zlib-devel binutils-devel
%endif
%if %{with_selftests}
-BuildRequires: clang llvm
+BuildRequires: clang llvm fuse-devel
%ifnarch %{arm}
BuildRequires: numactl-devel
%endif
@@ -1077,7 +1077,7 @@ This package provides debug information for the bpftool package.
%package selftests-internal
Summary: Kernel samples and selftests
License: GPLv2
-Requires: binutils, bpftool, iproute-tc, nmap-ncat, python3
+Requires: binutils, bpftool, iproute-tc, nmap-ncat, python3, fuse-libs
%description selftests-internal
Kernel sample programs and selftests.
@@ -2356,7 +2356,7 @@ 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 vm livepatch net net/forwarding
net/mptcp netfilter tc-testing" SKIP_TARGETS=""
FORCE_TARGETS=%{selftests_must_build} 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 memfd" SKIP_TARGETS=""
FORCE_TARGETS=%{selftests_must_build} 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.
@@ -2694,6 +2694,13 @@ find -type d -exec install -d
%{buildroot}%{_libexecdir}/kselftests/netfilter/{}
find -type f -executable -exec install -D -m755 {}
%{buildroot}%{_libexecdir}/kselftests/netfilter/{} \;
find -type f ! -executable -exec install -D -m644 {}
%{buildroot}%{_libexecdir}/kselftests/netfilter/{} \;
popd
+
+# install memfd selftests
+pushd tools/testing/selftests/memfd
+find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/memfd/{} \;
+find -type f -executable -exec install -D -m755 {}
%{buildroot}%{_libexecdir}/kselftests/memfd/{} \;
+find -type f ! -executable -exec install -D -m644 {}
%{buildroot}%{_libexecdir}/kselftests/memfd/{} \;
+popd
%endif
###
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2021
12:27 p.m.
New subject: [OS-BUILD PATCHv4 5/19] redhat/kernel.spec.template: enable
dependencies
generation
From: Prarit Bhargava <prarit(a)redhat.com>
redhat/kernel.spec.template: enable dependencies generation
Updated kernel-rpm-macros-185-9 package brings various generators
for Provides tags that usually present in RHEL kernel packages,
including kernel(), which OOT kmod packages rely on.
prarit: After discussion with jforbes, it was found that kernel-rpm-macros
has a different version number in Fedora vs RHEL. Additionally,
kernel-rpm-macros is brought in through some other build dependency in
ARK/Fedora so the requirement here may be superfluous. As a result, I am
only mentioning the build requirement of the package in this commit and
not the version.
Signed-off-by: Eugene Syromiatnikov <esyr(a)redhat.com>
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
@@ -582,6 +582,7 @@ BuildRequires: net-tools, hostname, bc, elfutils-devel
BuildRequires: dwarves
BuildRequires: python3-devel
BuildRequires: gcc-plugin-devel
+BuildRequires: kernel-rpm-macros
# glibc-static is required for a consistent build environment (specifically
# CONFIG_CC_CAN_LINK_STATIC=y).
BuildRequires: glibc-static
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2021
12:27 p.m.
New subject: [OS-BUILD PATCHv4 6/19] redhat/scripts: Update merge-subtrees.sh with
new
subtree location
From: Prarit Bhargava <prarit(a)redhat.com>
redhat/scripts: Update merge-subtrees.sh with new subtree location
Update the maintainer's merge-subtrees.sh script with the location
of the new redhat/rhdocs subtree.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
diff --git a/redhat/scripts/merge-subtrees.sh b/redhat/scripts/merge-subtrees.sh
index blahblah..blahblah 100755
--- a/redhat/scripts/merge-subtrees.sh
+++ b/redhat/scripts/merge-subtrees.sh
@@ -3,7 +3,7 @@
# however, given the wide variance of git versions we need to include it.
entries="
- redhat/rhdocs git://git.host.prod.eng.bos.redhat.com/rhkernel-docs
+ redhat/rhdocs git@gitlab.com:redhat/centos-stream/src/kernel/documentation.git
"
echo "$entries" | while read -r name url; do
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2021
12:27 p.m.
New subject: [OS-BUILD PATCHv4 7/19] spec: Fix separate tools build
From: Prarit Bhargava <prarit(a)redhat.com>
spec: Fix separate tools build
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2054579
Upstream Status: RHEL only
If we re building only tools without kernel, we need to generate config
headers and prepare tree for modules building. The modules_prepare target
will cover both.
Signed-off-by: Jiri Olsa <jolsa(a)redhat.com>
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
@@ -2348,6 +2348,14 @@ popd
# in the source tree. We installed them previously to $RPM_BUILD_ROOT/usr
# but there's no way to tell the Makefile to take them from there.
%{make} %{?_smp_mflags} headers_install
+
+# If we re building only tools without kernel, we need to generate config
+# headers and prepare tree for modules building. The modules_prepare target
+# will cover both.
+if [ ! -f include/generated/autoconf.h ]; then
+ %{make} %{?_smp_mflags} modules_prepare
+fi
+
%{make} %{?_smp_mflags} ARCH=$Arch V=1 M=samples/bpf/ || true
# Prevent bpf selftests to build bpftool repeatedly:
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2021
12:27 p.m.
New subject: [OS-BUILD PATCHv4 8/19] redhat/kernel.spec.template: Specify
vmlinux.h path
when building samples/bpf
From: Prarit Bhargava <prarit(a)redhat.com>
redhat/kernel.spec.template: Specify vmlinux.h path when building samples/bpf
Bugzilla: https://bugzilla.redhat.com/2041365
Upstream status: RHEL only.
Since the backport of commit 384b6b3bbf0d ("samples: bpf: Add
vmlinux.h generation support"), building samples/bpf start generating
vmlinux.h from vmlinux for use by patches. It provides a option to
provides vmlinux path through VMLINUX_BTF variable or vmlinux.h
directly through VMLINUX_H.
For selfests only build (e.g. rpmbuild --rebuild --without up
--without debug --without zfcpdump), we need to provide at least one
of those variables. So provide VMLINUX_H since that the one we already
use for selftests.
Signed-off-by: Jerome Marchand <jmarchan(a)redhat.com>
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
@@ -2356,7 +2356,7 @@ if [ ! -f include/generated/autoconf.h ]; then
%{make} %{?_smp_mflags} modules_prepare
fi
-%{make} %{?_smp_mflags} ARCH=$Arch V=1 M=samples/bpf/ || true
+%{make} %{?_smp_mflags} ARCH=$Arch V=1 M=samples/bpf/
VMLINUX_H="${RPM_VMLINUX_H}" || true
# Prevent bpf selftests to build bpftool repeatedly:
export BPFTOOL=$(pwd)/tools/bpf/bpftool/bpftool
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2021
12:27 p.m.
New subject: [OS-BUILD PATCHv4 9/19] redhat/Makefile: add dist-assert-tree-clean
target
From: Prarit Bhargava <prarit(a)redhat.com>
redhat/Makefile: add dist-assert-tree-clean target
Add dist-assert-tree-clean target that fails whenever staged/unstaged
changes or untracked files are present in the git tree.
Manual invocation of this target is not expected, thus left out of
dist-help. It's intended to act as a guard against any temporary changes
prior to running tooling that could change or revert them.
No checks are performed whenever $FORCE is non-empty.
Signed-off-by: ÄŒestmÃr Kalina <ckalina(a)redhat.com>
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
@@ -331,6 +331,25 @@ dist-kabi-dup: dist-python-check
fi \
done;
+dist-assert-tree-clean:
+ifeq ($(FORCE),)
+ @if ! git diff-index --quiet --cached HEAD -- &> /dev/null; then \
+ echo "ERROR: staged changes found. Please clean the git tree."; >&2 \
+ git status; \
+ exit 1; \
+ fi
+ @if ! git diff-files --quiet &> /dev/null; then \
+ echo "ERROR: unstaged changes found. Please clean the git tree." >&2;
\
+ git status; \
+ exit 1; \
+ fi
+ @if [ $$(git ls-files --exclude-standard --others | wc -l) -gt 0 ]; then \
+ echo "ERROR: untracked files found. Please clean the git tree." >&2;
\
+ git status; \
+ exit 1; \
+ fi
+endif
+
dist-check-kabi: dist-kabi
@if [ ! -e $(_OUTPUT)/Module.symvers ]; then \
echo "ERROR: You must compile the kernel and modules first";\
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2021
12:27 p.m.
New subject: [OS-BUILD PATCHv4 10/19] kabi: ignore new stablelist metadata in
show-kabi
From: Prarit Bhargava <prarit(a)redhat.com>
kabi: ignore new stablelist metadata in show-kabi
Stablelist symbol definition shall be extended to include extra metadata,
such as a reference symtypes file, path to a file exporting given symbol,
and version history.
Reference and path information is not required by show-kabi and ignored.
Only the current version is processed by show-kabi.
Signed-off-by: ÄŒestmÃr Kalina <ckalina(a)redhat.com>
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
diff --git a/redhat/kabi/show-kabi b/redhat/kabi/show-kabi
index blahblah..blahblah 100755
--- a/redhat/kabi/show-kabi
+++ b/redhat/kabi/show-kabi
@@ -23,7 +23,7 @@ __license__ = "GPL"
import getopt
import os
import sys
-
+import re
def load_kabi(dirname, kabi, order, arch):
"""Load a reference stablelist content."""
@@ -46,15 +46,30 @@ def load_kabi(dirname, kabi, order, arch):
for arch in archlist:
for symbol in os.listdir(dirname + "/kabi_" + arch):
- if symbol.startswith('.'):
- # skip hidden files
+ if '.' in symbol:
+ # skip files
continue
kabi_file = open(dirname + "/kabi_" + arch + "/" +
symbol, "r")
line = []
- # store version metadata
- line.append(kabi_file.readline())
- # store content ( no empty line is bad state )
- line.append(kabi_file.readline().rstrip('\n'))
+ offset = 0
+ lines = 0
+ for l in kabi_file:
+ l = l.rstrip('\n')
+ m = re.match(r"^#([^0-9]+):(.*)", l)
+ if m:
+ # store index metadata
+ if m.group(1) == "I":
+ offset = int(m.group(2))
+ # skip any other metadata
+ continue
+ if l.startswith("#"):
+ # store version metadata
+ line.append(l)
+ continue
+ if lines == offset:
+ line.append(l)
+ break
+ lines += 1
kabi[arch][symbol] = line
order[arch].append(symbol)
kabi_file.close()
@@ -94,7 +109,7 @@ def show_kabi(kabi, order, release, fmt, show_head):
if kabi[current_arch][sym][0][0] != "#":
print("Invalid metadata format:
{}".format(kabi[current_arch][sym][0]))
sys.exit(1)
- minor_range = kabi[current_arch][sym][0][1:-1].split("-", 2)
+ minor_range = kabi[current_arch][sym][0][1:].split("-", 2)
minor_range[0] = int(minor_range[0])
if minor_range[1] == "":
minor_range[1] = sys.maxsize
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2021
12:27 p.m.
New subject: [OS-BUILD PATCHv4 11/19] kabi: add support for symbol namespaces into
check-kabi
From: Prarit Bhargava <prarit(a)redhat.com>
kabi: add support for symbol namespaces into check-kabi
Symbol namespaces are emitted to Module.symvers as well as any
Module.kabi files that check-kabi consumes. Correctly parse
symbol namespaces, if present.
Warn on symbol namespace changes, as they constitute an ABI
breakage.
Signed-off-by: ÄŒestmÃr Kalina <ckalina(a)redhat.com>
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
diff --git a/redhat/kabi/check-kabi b/redhat/kabi/check-kabi
index blahblah..blahblah 100755
--- a/redhat/kabi/check-kabi
+++ b/redhat/kabi/check-kabi
@@ -41,7 +41,8 @@ def load_symvers(symvers, filename):
break
if in_line == "\n":
continue
- checksum, symbol, directory, type = in_line.split()
+ checksum, symbol, directory, type, *ns = in_line.split()
+ ns = ns[0] if ns else None
symvers[symbol] = in_line[0:-1]
@@ -57,7 +58,8 @@ def load_kabi(kabi, filename):
break
if in_line == "\n":
continue
- checksum, symbol, directory, type = in_line.split()
+ checksum, symbol, directory, type, *ns = in_line.split()
+ ns = ns[0] if ns else None
kabi[symbol] = in_line[0:-1]
@@ -69,11 +71,14 @@ def check_kabi(symvers, kabi):
warn = 0
changed_symbols = []
moved_symbols = []
+ ns_symbols = []
for symbol in kabi:
- abi_hash, abi_sym, abi_dir, abi_type = kabi[symbol].split()
+ abi_hash, abi_sym, abi_dir, abi_type, *abi_ns = kabi[symbol].split()
+ abi_ns = abi_ns[0] if abi_ns else None
if symbol in symvers:
- sym_hash, sym_sym, sym_dir, sym_type = symvers[symbol].split()
+ sym_hash, sym_sym, sym_dir, sym_type, *sym_ns = symvers[symbol].split()
+ sym_ns = sym_ns[0] if sym_ns else None
if abi_hash != sym_hash:
fail = 1
changed_symbols.append(symbol)
@@ -81,6 +86,10 @@ def check_kabi(symvers, kabi):
if abi_dir != sym_dir:
warn = 1
moved_symbols.append(symbol)
+
+ if abi_ns != sym_ns:
+ warn = 1
+ ns_symbols.append(symbol)
else:
fail = 1
changed_symbols.append(symbol)
@@ -96,13 +105,21 @@ def check_kabi(symvers, kabi):
if warn:
print("*** WARNING - ABI SYMBOLS MOVED ***")
- print("")
- print("The following symbols moved (typically caused by moving a symbol from
being")
- print("provided by the kernel vmlinux out to a loadable module):")
- print("")
- for symbol in moved_symbols:
- print(symbol)
- print("")
+ if moved_symbols:
+ print("")
+ print("The following symbols moved (typically caused by moving a symbol
from being")
+ print("provided by the kernel vmlinux out to a loadable module):")
+ print("")
+ for symbol in moved_symbols:
+ print(symbol)
+ print("")
+ if ns_symbols:
+ print("")
+ print("The following symbols changed symbol namespaces:")
+ print("")
+ for symbol in ns_symbols:
+ print(symbol)
+ print("")
"""Halt the build, if we got errors and/or warnings. In either case,
double-checkig is required to avoid introducing / concealing
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2021
12:27 p.m.
New subject: [OS-BUILD PATCHv4 12/19] Makefile: add kabi targets
From: Prarit Bhargava <prarit(a)redhat.com>
Makefile: add kabi targets
Add make wrappers on redhat/kabi/{diff,update}-kabi and
redhat/kabi/symtypes:
- dist-kabi-update updates the stablelist checksums
- dist-symtype-diff diffs the current state against a reference
stored in the stablelist
- dist-kabi-image-NODE and dist-kabi-preimage-NODE dump the
image or preimage for a symtypes node (where NODE is either
an exported symbol, or a node representing a type, e.g.,
s#kobject).
A helper target called dist-assert-cross-tools is added to ensure
that cross compilation toolchain is available prior to execution
to ensure correct results.
Signed-off-by: ÄŒestmÃr Kalina <ckalina(a)redhat.com>
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
@@ -350,6 +350,82 @@ ifeq ($(FORCE),)
fi
endif
+ifndef KABI_SUPPORTED_ARCHS
+ KABI_SUPPORTED_ARCHS := $(patsubst kabi_%,%,$(notdir $(wildcard
$(REDHAT)/kabi/kabi-module/*)))
+endif
+KABI_CROSS_COMPILE = $(patsubst
%,$(KABI_CROSS_COMPILE_PREFIX)%$(KABI_CROSS_COMPILE_SUFFIX),$(filter-out
$(CURARCH),$(KABI_SUPPORTED_ARCHS)))
+
+ifeq ($(ARCH),$(CURARCH))
+dist-assert-cross-tools: # no dependencies when we're building for native arch
+else
+dist-assert-cross-tools: $(patsubst %,%gcc,$(KABI_CROSS_COMPILE))
+endif
+
+$(KABI_CROSS_COMPILE_PREFIX)%$(KABI_CROSS_COMPILE_SUFFIX)gcc:
+ @echo "ERROR: couldn't find cross compilation toolchain (looking for: $@)"
>&2
+ @echo " override KABI_CROSS_COMPILE_PREFIX to set path (currently
$(KABI_CROSS_COMPILE_PREFIX))" >&2
+ @echo " override KABI_CROSS_COMPILE_SUFFIX to set suffix (currently
$(KABI_CROSS_COMPILE_SUFFIX))" >&2
+ @exit 1
+
+
+ifeq ($(ARCH),)
+dist-kabi-index: ARCH=$(CURARCH)
+endif
+dist-kabi-index:
+ : > $(REDHAT)/kabi/kabi-module/kabi_$(ARCH)/.index.json
+ for sym in $$(find $(REDHAT)/kabi/kabi-module/kabi_$(ARCH)/ -type f -not -name
"*.*" \
+ -exec basename {} \;); do \
+ $(REDHAT)/kabi/symtypes index \
+ $(REDHAT)/kabi/kabi-module/kabi_$(ARCH)/.$$(basename $$sym) \
+ -o $(REDHAT)/kabi/kabi-module/kabi_$(ARCH)/.index.json || : ; \
+ done
+
+ifeq ($(ARCH),)
+dist-kabi-image-%: ARCH=$(CURARCH)
+endif
+dist-kabi-image-%: NODE = $(patsubst dist-kabi-image-%,%,$@)
+dist-kabi-image-%: dist-kabi-index
+ $(REDHAT)/kabi/symtypes image -s $(NODE) -t
$(REDHAT)/kabi/kabi-module/kabi_$(ARCH)/.index.json
+
+ifeq ($(ARCH),)
+dist-kabi-preimage-%: ARCH=$(CURARCH)
+endif
+dist-kabi-preimage-%: NODE = $(patsubst dist-kabi-preimage-%,%,$@)
+dist-kabi-preimage-%: dist-kabi-index
+ @node="$(NODE)"; \
+ if [ "${node:1:1}" = "#" ]; then \
+ $(REDHAT)/kabi/symtypes preimage -s '$(NODE)' -t
$(REDHAT)/kabi/kabi-module/kabi_$(ARCH)/.index.json; \
+ else \
+ for prefix in {E,e,s,t,u}; do \
+ $(REDHAT)/kabi/symtypes preimage -S -s "$$prefix#$(NODE)" -t
$(REDHAT)/kabi/kabi-module/kabi_$(ARCH)/.index.json || :; \
+ done; \
+ fi
+
+dist-symtype-diff: KABI_TOOL = $(REDHAT)/kabi/diff-kabi
+dist-symtype-diff: dist-assert-cross-tools dist-assert-tree-clean dist-configs
dist-symtype-shared
+
+dist-kabi-update: KABI_TOOL = $(REDHAT)/kabi/update-kabi
+dist-kabi-update: dist-assert-cross-tools dist-assert-tree-clean dist-configs
dist-symtype-shared
+
+dist-symtype-shared:
+ @declare -a _ARGS; \
+ declare -a _ARCHS; \
+ for symbol in $${SYMBOL:-}; do \
+ _ARGS=("$${_ARGS[@]}" -s "$$symbol"); \
+ done; \
+ if [ -n "$${SRC:-}" ]; then \
+ _ARGS=("$${_ARGS[@]}" $$SRC); \
+ fi; \
+ if [ -n "$${ARCH:-}" ]; then \
+ $(KABI_TOOL) -a $(ARCH) $${_ARGS[@]}; \
+ else \
+ cnt=1; \
+ for arch in $(KABI_SUPPORTED_ARCHS); do \
+ $(KABI_TOOL) -a $$arch $${_ARGS[@]} || : ; \
+ let cnt++; \
+ done; \
+ fi
+
dist-check-kabi: dist-kabi
@if [ ! -e $(_OUTPUT)/Module.symvers ]; then \
echo "ERROR: You must compile the kernel and modules first";\
@@ -814,6 +890,8 @@ dist-full-help:
@echo ' dist-kabi-dw-base - Generate the base dataset for kABI DWARF-based
check.'
@echo ' dist-kabi-dw-check - Run DWARF-based kABI comparison of current
binaries'
@echo ' with the base dataset.'
+ @echo ' dist-kabi-update - Update kabi stablelist checksums.'
+ @echo ' dist-symtype-diff - Diff kabi stablelist and current kernel.'
@echo ''
@echo 'Configuration targets:'
diff --git a/redhat/Makefile.variables b/redhat/Makefile.variables
index blahblah..blahblah 100644
--- a/redhat/Makefile.variables
+++ b/redhat/Makefile.variables
@@ -128,3 +128,12 @@ RHDISTDATADIR ?=
# If set to 1, this variable will cause the kernel package build to fail if
# the selftests fail to build.
SPECSELFTESTS_MUST_BUILD ?= 0
+
+# This variable is a list of the arches that are protected under RHEL's KABI policy
+KABI_SUPPORTED_ARCHS ?=
+
+# This variable is the location of the KABI cross compilers
+KABI_CROSS_COMPILE_PREFIX ?= /usr/bin/
+
+# This variable is the suffix of the KABI cross compilers
+KABI_CROSS_COMPILE_SUFFIX ?= -linux-gnu-
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
@@ -27,6 +27,10 @@ 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.test.tar.bz2
+KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu-
/usr/bin/s390x-linux-gnu-
+KABI_CROSS_COMPILE_PREFIX=/usr/bin/
+KABI_CROSS_COMPILE_SUFFIX=-linux-gnu-
+KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64
KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.test.tar.bz2
LANG=C
LOCVERFILE=../localversion
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
@@ -27,6 +27,10 @@ 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.test.tar.bz2
+KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu-
/usr/bin/s390x-linux-gnu-
+KABI_CROSS_COMPILE_PREFIX=/usr/bin/
+KABI_CROSS_COMPILE_SUFFIX=-linux-gnu-
+KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64
KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.test.tar.bz2
LANG=C
LOCVERFILE=../localversion
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
@@ -27,6 +27,10 @@ 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.test.tar.bz2
+KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu-
/usr/bin/s390x-linux-gnu-
+KABI_CROSS_COMPILE_PREFIX=/usr/bin/
+KABI_CROSS_COMPILE_SUFFIX=-linux-gnu-
+KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64
KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.test.tar.bz2
LANG=C
LOCVERFILE=../localversion
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
@@ -27,6 +27,10 @@ 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.test.tar.bz2
+KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu-
/usr/bin/s390x-linux-gnu-
+KABI_CROSS_COMPILE_PREFIX=/usr/bin/
+KABI_CROSS_COMPILE_SUFFIX=-linux-gnu-
+KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64
KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.test.tar.bz2
LANG=C
LOCVERFILE=../localversion
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
@@ -27,6 +27,10 @@ INCLUDE_FEDORA_FILES=1
INCLUDE_RHEL_FILES=1
KABIDW=../redhat/kabi-dwarf
KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-6.test.tar.bz2
+KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu-
/usr/bin/s390x-linux-gnu-
+KABI_CROSS_COMPILE_PREFIX=/usr/bin/
+KABI_CROSS_COMPILE_SUFFIX=-linux-gnu-
+KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64
KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-6.test.tar.bz2
LANG=C
LOCVERFILE=../localversion
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
@@ -27,6 +27,10 @@ INCLUDE_FEDORA_FILES=1
INCLUDE_RHEL_FILES=1
KABIDW=../redhat/kabi-dwarf
KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-6.test.tar.bz2
+KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu-
/usr/bin/s390x-linux-gnu-
+KABI_CROSS_COMPILE_PREFIX=/usr/bin/
+KABI_CROSS_COMPILE_SUFFIX=-linux-gnu-
+KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64
KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-6.test.tar.bz2
LANG=C
LOCVERFILE=../localversion
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
@@ -27,6 +27,10 @@ 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.test.tar.bz2
+KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu-
/usr/bin/s390x-linux-gnu-
+KABI_CROSS_COMPILE_PREFIX=/usr/bin/
+KABI_CROSS_COMPILE_SUFFIX=-linux-gnu-
+KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64
KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.fce15c45d3fb.6.test.tar.bz2
LANG=C
LOCVERFILE=../localversion
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
@@ -27,6 +27,10 @@ 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.test.tar.bz2
+KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu-
/usr/bin/s390x-linux-gnu-
+KABI_CROSS_COMPILE_PREFIX=/usr/bin/
+KABI_CROSS_COMPILE_SUFFIX=-linux-gnu-
+KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64
KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.fce15c45d3fb.6.test.tar.bz2
LANG=C
LOCVERFILE=../localversion
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
@@ -26,6 +26,10 @@ INCLUDE_FEDORA_FILES=1
INCLUDE_RHEL_FILES=1
KABIDW=../redhat/kabi-dwarf
KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0.tar.bz2
+KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu-
/usr/bin/s390x-linux-gnu-
+KABI_CROSS_COMPILE_PREFIX=/usr/bin/
+KABI_CROSS_COMPILE_SUFFIX=-linux-gnu-
+KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64
KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0.tar.bz2
LANG=C
LOCVERFILE=../localversion
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
@@ -26,6 +26,10 @@ INCLUDE_FEDORA_FILES=1
INCLUDE_RHEL_FILES=1
KABIDW=../redhat/kabi-dwarf
KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0.tar.bz2
+KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu-
/usr/bin/s390x-linux-gnu-
+KABI_CROSS_COMPILE_PREFIX=/usr/bin/
+KABI_CROSS_COMPILE_SUFFIX=-linux-gnu-
+KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64
KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0.tar.bz2
LANG=C
LOCVERFILE=../localversion
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
@@ -26,6 +26,10 @@ INCLUDE_FEDORA_FILES=1
INCLUDE_RHEL_FILES=1
KABIDW=../redhat/kabi-dwarf
KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0.tar.bz2
+KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu-
/usr/bin/s390x-linux-gnu-
+KABI_CROSS_COMPILE_PREFIX=/usr/bin/
+KABI_CROSS_COMPILE_SUFFIX=-linux-gnu-
+KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64
KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0.tar.bz2
LANG=C
LOCVERFILE=../localversion
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
@@ -26,6 +26,10 @@ INCLUDE_FEDORA_FILES=1
INCLUDE_RHEL_FILES=1
KABIDW=../redhat/kabi-dwarf
KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0.tar.bz2
+KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu-
/usr/bin/s390x-linux-gnu-
+KABI_CROSS_COMPILE_PREFIX=/usr/bin/
+KABI_CROSS_COMPILE_SUFFIX=-linux-gnu-
+KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64
KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0.tar.bz2
LANG=C
LOCVERFILE=../localversion
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
@@ -26,6 +26,10 @@ INCLUDE_FEDORA_FILES=1
INCLUDE_RHEL_FILES=1
KABIDW=../redhat/kabi-dwarf
KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0.tar.bz2
+KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu-
/usr/bin/s390x-linux-gnu-
+KABI_CROSS_COMPILE_PREFIX=/usr/bin/
+KABI_CROSS_COMPILE_SUFFIX=-linux-gnu-
+KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64
KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0.tar.bz2
LANG=C
LOCVERFILE=../localversion
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
@@ -26,6 +26,10 @@ INCLUDE_FEDORA_FILES=1
INCLUDE_RHEL_FILES=1
KABIDW=../redhat/kabi-dwarf
KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0.tar.bz2
+KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu-
/usr/bin/s390x-linux-gnu-
+KABI_CROSS_COMPILE_PREFIX=/usr/bin/
+KABI_CROSS_COMPILE_SUFFIX=-linux-gnu-
+KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64
KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0.tar.bz2
LANG=C
LOCVERFILE=../localversion
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
@@ -26,6 +26,10 @@ INCLUDE_FEDORA_FILES=1
INCLUDE_RHEL_FILES=1
KABIDW=../redhat/kabi-dwarf
KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0.tar.bz2
+KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu-
/usr/bin/s390x-linux-gnu-
+KABI_CROSS_COMPILE_PREFIX=/usr/bin/
+KABI_CROSS_COMPILE_SUFFIX=-linux-gnu-
+KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64
KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0.tar.bz2
LANG=C
LOCVERFILE=../localversion
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
@@ -26,6 +26,10 @@ INCLUDE_FEDORA_FILES=1
INCLUDE_RHEL_FILES=1
KABIDW=../redhat/kabi-dwarf
KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0.tar.bz2
+KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu-
/usr/bin/s390x-linux-gnu-
+KABI_CROSS_COMPILE_PREFIX=/usr/bin/
+KABI_CROSS_COMPILE_SUFFIX=-linux-gnu-
+KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64
KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0.tar.bz2
LANG=C
LOCVERFILE=../localversion
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
@@ -26,6 +26,10 @@ 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.test.tar.bz2
+KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu-
/usr/bin/s390x-linux-gnu-
+KABI_CROSS_COMPILE_PREFIX=/usr/bin/
+KABI_CROSS_COMPILE_SUFFIX=-linux-gnu-
+KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64
KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.test.tar.bz2
LANG=C
LOCVERFILE=../localversion
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
@@ -26,6 +26,10 @@ 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.test.tar.bz2
+KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu-
/usr/bin/s390x-linux-gnu-
+KABI_CROSS_COMPILE_PREFIX=/usr/bin/
+KABI_CROSS_COMPILE_SUFFIX=-linux-gnu-
+KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64
KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.test.tar.bz2
LANG=C
LOCVERFILE=../localversion
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2021
12:27 p.m.
New subject: [OS-BUILD PATCHv4 13/19] kabi: add stablelist helpers
From: Prarit Bhargava <prarit(a)redhat.com>
kabi: add stablelist helpers
Add helper scripts to update the kabi stablelist checksums and to diff
symtypes output.
redhat/kabi/diff-kabi computes the current symtypes files and compares
it to the reference symtypes stored in the stablelist.
redhat/kabi/update-kabi computes the current checksums and reference
symtypes files and updates the stablelist contents. It does not stage
any changes.
redhat/kabi/symtypes computes symtypes image, preimage or a diff for
a symtypes node.
Signed-off-by: ÄŒestmÃr Kalina <ckalina(a)redhat.com>
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
diff --git a/redhat/kabi/diff-kabi b/redhat/kabi/diff-kabi
new file mode 100755
index blahblah..blahblah 100755
--- /dev/null
+++ b/redhat/kabi/diff-kabi
@@ -0,0 +1,42 @@
+#!/usr/bin/env bash
+
+usage_desc() {
+ sed 's/^\t//' <<EOF
+ Diffs the kernel ABI stablelist symtypes information and current symtypes
+ for architecture ARCH.
+EOF
+}
+
+# Called whenever a new symbol checksum is obtained
+# cb_checksum ARCH SYMBOL CHECKSUM FILE SYMVERSIONS_FILE SYMTYPES_FILE
+cb_checksum() {
+ local arch="$1"
+ local symbol="$2"
+ local file="$4"
+ local symtypes="$6"
+
+ if [ ! -e $REDHAT/kabi/kabi-module/kabi_$arch/.$symbol ]; then
+ echo "Reference file for $symbol on $arch not found."
+ return
+ fi
+
+ $REDHAT/kabi/symtypes diff -s $symbol \
+ $REDHAT/kabi/kabi-module/kabi_$arch/.$symbol $symtypes
+
+ symref=${file:0:-1}symref
+ rm -f $symref || :
+ ln -s $(realpath $REDHAT/kabi/kabi-module/kabi_$arch/.$symbol) $symref
+ make -s ${MAKE_ARGS[@]} $symtypes 2>&1 | grep "warning: $symbol:" || :
+ rm -f $symref || :
+}
+
+# Called whenever the generate command finished successfully
+cb_ready() {
+ :
+}
+
+cd "$(git rev-parse --show-toplevel)"
+REDHAT=${REDHAT:-$(pwd)/redhat/}
+
+# Generate new symbol checksums and symvers files
+. $REDHAT/kabi/symtype-generate
diff --git a/redhat/kabi/symtype-generate b/redhat/kabi/symtype-generate
new file mode 100755
index blahblah..blahblah 100755
--- /dev/null
+++ b/redhat/kabi/symtype-generate
@@ -0,0 +1,678 @@
+#!/usr/bin/env bash
+
+unset MAKEFLAGS
+unset CPP
+unset ARCH
+unset SYMBOL
+
+set -euo pipefail
+
+usage() {
+ sed 's/^\t//' <<EOF
+ Usage: $0 [-h] [-v] [-1] [-2] [-3] [-4] [-5] -a ARCH [-s SYMBOL]... [FILE]...
+EOF
+
+ echo
+ [ "$(type -t usage_desc || :)" == "function" ] &&
usage_desc
+ echo
+
+ sed 's/^\t//' <<EOF
+ -a ARCH Supported architectures:
+ x86_64, s390x, aarch64, ppc64le
+
+ -s SYMBOL [-s SYMBOL ...] Symbol entry to update.
+ Updates the whole stablelist if omitted.
+
+ -h Prints this message.
+
+ -v Verbose output.
+
+ == DESCRIPTION
+
+ To calculate current symbol data, the file exporting the symbol on a given
+ arch must first be located. The following methods are attempted in order:
+
+ 1. user-supplied FILEs, if given, (disable using -1)
+ 2. stablelist-supplied FILEs, (disable using -2)
+ 3. cscope, if available, (disable using -3)
+ 4. naive regular expression search for exporting macro (disable
+ using -4),
+ 5. compute all symvers and symtypes files (disable using -5)
+ 6. compute all symvers and symtypes files following a local kernel
+ build (disable using -6).
+
+ If a method is successful in updating all of the required symbols,
+ the script early terminates. Methods are sorted by their time complexity
+ as well as generality.
+
+ If you're using the tool directly, please make sure to commit/stash your
+ changes.
+
+ You must also make sure that you have cross compilation toolchain
+ installed when computing non-native checksums. The tool uses
+ CROSS_COMPILE=/usr/bin/ARCH-linux-gnu-, override
+ KABI_CROSS_COMPILE_PREFIX=/usr/bin/
+ KABI_CROSS_COMPILE_SUFFIX=-linux-gnu-
+ as needed.
+
+ == NOTES
+
+ Method 3 can only find symbols exported using one of the following
+ macros:
+
+ ACPI_EXPORT_SYMBOL
+ ACPI_EXPORT_SYMBOL_INIT
+ EXPORT_DATA_SYMBOL
+ EXPORT_DATA_SYMBOL_GPL
+ EXPORT_INDIRECT_CALLABLE
+ EXPORT_PER_CPU_SYMBOL
+ EXPORT_PER_CPU_SYMBOL_GPL
+ EXPORT_STATIC_CALL
+ EXPORT_STATIC_CALL_GPL
+ EXPORT_STATIC_CALL_TRAMP
+ EXPORT_STATIC_CALL_TRAMP_GPL
+ EXPORT_SYMBOL
+ EXPORT_SYMBOL_FOR_TESTS_ONLY
+ EXPORT_SYMBOL_GPL
+ EXPORT_SYMBOL_NS
+ EXPORT_SYMBOL_NS_GPL
+ EXPORT_TRACEPOINT_SYMBOL
+ EXPORT_TRACEPOINT_SYMBOL_GPL
+
+ and the symbol name must not be constructed using preprocessor
+ concatenation.
+EOF
+ exit
+}
+
+# --- decls
+
+# list of temporary files created during execution
+declare -ag TEMP_FILES
+
+# list of makefile targets to invoke
+declare -ag TARGETS
+
+# list of source files to process
+declare -ag SOURCES
+
+# list of symbols to try and generate symbol versions/symtypes for
+declare -ag SYMBOL
+
+# list of symbols that couldn't have been resolved using previous method
+declare -ag SYMFAIL
+
+# current arch
+declare -g CARCH
+
+# dict[arch]=ARCH variable for kernel makefile
+declare -Ag CC_ARCH
+
+# dict[symbol]=checksum
+# dict[symbol]=file_exporting_symbol
+declare -Ag SYMCRC
+declare -Ag SYMFILE
+declare -Ag SYMFILE_T
+declare -Ag SYMFILE_V
+
+# kernel makefile cc var
+declare -g CROSS_COMPILE
+
+# compiler
+declare -g CPP
+
+# verbose level
+declare -g V
+
+# --- default assignments
+
+V=${V:-0}
+CPP=gcc
+KABI_CROSS_COMPILE_PREFIX="${KABI_CROSS_COMPILE_PREFIX:-/usr/bin/}"
+KABI_CROSS_COMPILE_SUFFIX="${KABI_CROSS_COMPILE_SUFFIX:--linux-gnu-}"
+USE_ENTIRE_STABLELIST=1
+MAKE_ARGS=(-k -i -j$(nproc))
+CC_ARCH[s390x]="s390"
+CC_ARCH[x86_64]="x86"
+CC_ARCH[ppc64le]="powerpc"
+CC_ARCH[aarch64]="arm64"
+
+# --- helper fns
+
+echo0() { echo " :: $*"; }
+echo1() { echo " $*"; }
+echo2() { echo " - $*"; }
+echo3() { echo " $*"; }
+err() { echo -e "ERROR:" "$@" >&2; }
+warn() { echo -e "WARNING:" "$@" >&2; }
+
+cleanup() {
+ [ -z "${TEMP_FILES[@]:-}" ] && return
+ echo0 "Cleaning up temporary files ..."
+ rm -f "${TEMP_FILES[@]}"
+}
+
+# find files containing symbol export statements of the form MACRO(NAME),
+# where symbol name NAME is the entire symbol name and MACRO is one of:
+# ACPI_EXPORT_SYMBOL
+# ACPI_EXPORT_SYMBOL_INIT
+# EXPORT_DATA_SYMBOL
+# EXPORT_DATA_SYMBOL_GPL
+# EXPORT_INDIRECT_CALLABLE
+# EXPORT_PER_CPU_SYMBOL
+# EXPORT_PER_CPU_SYMBOL_GPL
+# EXPORT_STATIC_CALL
+# EXPORT_STATIC_CALL_GPL
+# EXPORT_STATIC_CALL_TRAMP
+# EXPORT_STATIC_CALL_TRAMP_GPL
+# EXPORT_SYMBOL
+# EXPORT_SYMBOL_FOR_TESTS_ONLY
+# EXPORT_SYMBOL_GPL
+# EXPORT_SYMBOL_NS
+# EXPORT_SYMBOL_NS_GPL
+# EXPORT_TRACEPOINT_SYMBOL
+# EXPORT_TRACEPOINT_SYMBOL_GPL
+# export_try_find SYMBOL|REGEX
+export_tryfind() {
+ grep -Prol --exclude-dir=redhat
"^(ACPI_)?EXPORT_(DATA_|INDIRECT_CALLABLE|STATIC_CALL|TRACEPOINT_)?(PER_CPU_)?(SYMBOL|_TRAMP)?(_NS)?(_GPL|_INIT)?\($1(,[^)]*)?\);"
|| :
+}
+
+symbol_tryfind_symversions() {
+ # __crc_SYMBOL = CHECKSUM
+ # SECTIONS { .rodata : ALIGN(4) { __crc_SYMBOL = .; LONG(CHECKSUM); } }
+ grep -R --include="*.symversions" --exclude-dir=redhat -H -Po \
+ "^__crc_\K$1 = .*(?=;)" | tr -d ' ' && return || :
+ grep -R --include "*.symversions" --exclude-dir=redhat -H -Po \
+ "__crc_\K$1[ =].*0x[[:xdigit:]]+" \
+ | sed -e 's/ = .*\(0x[[:xdigit:]]\+\).*/=\1/'
+
+}
+
+# batch call to export_tryfind, limited to 10 symbols at the time to make sure
+# argv doesn't overflow
+# export_tryfind SYMBOL...
+batch() {
+ local fn=$1
+ shift 1
+ local o=1
+ local d=10
+ while [ $o -le $# ]; do
+ [ $o -gt $# ] && d=$((o-$#))
+ # pass an array of symbols S1...Sn as a regex (S1|...|Sn)
+ $fn $(
+ echo ${@:$o:$d} \
+ | sed -e 's/ /|/g' -e 's/^/(/' -e 's/$/)/'
+ )
+ o=$((o+d))
+ done | sort | uniq
+}
+
+src_to_symversions() {
+ sed 's/\.[cS]$/.symversions/'
+}
+
+src_to_symtypes() {
+ sed 's/\.[cS]$/.symtypes/'
+}
+
+dump_failed_symbols() {
+ echo1 "Couldn't find the following symbols using this method:" >&3
+ for sym in ${SYMFAIL[@]}; do
+ echo2 $sym >&3
+ done
+}
+
+prepare_stage() {
+ # SYMBOL lists symbols to be searched
+ # SYMFAIL lists symbols that failed in the previous run
+ SYMBOL=(${SYMFAIL[@]})
+ SYMFAIL=()
+ TARGETS=()
+ FILE=()
+}
+
+process_Module_symvers() {
+ [ ! -e Module.symvers ] && return 1
+
+ # read checksums into SYMCRC
+ local IFS=$'\n'
+ for sym in $(comm -12 <(cut -f2 Module.symvers | sort) \
+ <(echo ${SYMBOL[@]} | tr ' ' '\n' | sort)); do
+ symcrc=$(grep -Po "^0x[[:xdigit:]]+(?=\t$sym\t)" Module.symvers)
+ file=$(grep -El -m 1 -r --include="*.symtypes" \
+ --exclude-dir=redhat "^[a-zA-Z#]{,2}$sym " | head -n1)
+ [ -z "$file" ] && continue
+ SYMCRC[$sym]=$symcrc
+ SYMFILE_T[$sym]=$file
+ SYMFILE_V[$sym]=Module.symvers
+ [ -e "${file/.symtypes/.c}" ] &&
file="${file/.symtypes/.c}"
+ [ -e "${file/.symtypes/.S}" ] &&
file="${file/.symtypes/.S}"
+ SYMFILE[$sym]=$file
+ echo3 "Found $sym in $file (crc: $symcrc)," \
+ "V: ${SYMFILE_V[$sym]}," \
+ "T: ${SYMFILE_T[$sym]}," \
+ "F: ${SYMFILE[$sym]}." >&3
+ done
+
+ return 0
+}
+
+process_symversions() {
+ # read checksums into SYMCRC and update stablelist, output format:
+ # filename.symversions:__crc_symbolname = 0x0000..
+ for match in $(batch symbol_tryfind_symversions "$@"); do
+ file=${match%:*}
+ symcrc=${match#*:}
+ sym=${symcrc%%=*}
+ SYMCRC[$sym]=${symcrc##*=}
+ SYMFILE_V[$sym]=$file
+ SYMFILE_T[$sym]=${file/.symversions/.symtypes}
+ [ -e ${file/.symversions/.c} ] && file=${file/.symversions/.c}
+ [ -e ${file/.symversions/.S} ] && file=${file/.symversions/.S}
+ SYMFILE[$sym]=$file
+ echo3 "Found $sym in $file (crc: $symcrc)," \
+ "V: ${SYMFILE_V[$sym]}," \
+ "T: ${SYMFILE_T[$sym]}," \
+ "F: ${SYMFILE[$sym]}." >&3
+ done
+}
+
+# generate MAKE_TARGET...
+generate() {
+ if [ $# -eq 0 ]; then
+ echo "No targets given to generate."
+ SYMFAIL=(${SYMBOL[@]})
+ return 1
+ fi
+
+ echo1 "Building symtype and symversion files ..."
+ for file in $@; do
+ echo2 "$file" >&3
+ done
+
+ # batch build at most 100 targets (symvers, symtypes files)
+ while [ $# -gt 0 ]; do
+ if [ $# -gt 100 ]; then
+ make ${MAKE_ARGS[@]} ${@:1:100} >&3 2>&3 || :
+ shift 100
+ else
+ make ${MAKE_ARGS[@]} ${@:1:$#} >&3 2>&3 || :
+ shift $#
+ fi
+ done
+
+ if ! process_Module_symvers; then
+ process_symversions "${SYMBOL[@]}"
+ fi
+
+ echo1 "Looking for eligible symbol checksum updates ..." >&3
+ for sym in ${SYMBOL[@]}; do
+ if [ -z "${SYMCRC[$sym]:-}" ]; then
+ echo3 "Couldn't find crc for $sym" >&3
+ [[ ! " ${SYMFAIL[*]} " =~ " $sym " ]] && SYMFAIL+=($sym)
+ continue
+ fi
+ if [ ! -e "${SYMFILE[$sym]:-}" ]; then
+ echo3 "Couldn't find source file for $sym" >&3
+ continue
+ fi
+ if [ ! -e "${SYMFILE_V[$sym]:-}" ]; then
+ echo3 "Couldn't find version file for $sym" >&3
+ continue
+ fi
+ if [ ! -e "${SYMFILE_T[$sym]:-}" ]; then
+ echo3 "Couldn't find symtypes file for $sym" >&3
+ continue
+ fi
+ cb_checksum $CARCH $sym ${SYMCRC[$sym]:-} ${SYMFILE[$sym]} \
+ ${SYMFILE_V[$sym]} ${SYMFILE_T[$sym]}
+ done
+
+ if [ -z "${SYMFAIL:-}" ]; then
+ cb_ready
+ return 0
+ fi
+
+ return 1
+}
+
+# process argv
+
+OPTIND=1
+
+while getopts "TC12345hva:f:s:" opt; do
+ case "$opt" in
+ T)
+ CONFIG_NO_TEST=y
+ ;;
+ C)
+ CONFIG_NO_CLEAN=y
+ ;;
+ 1)
+ CONFIG_NO_METH1=y
+ ;;
+ 2)
+ CONFIG_NO_METH2=y
+ ;;
+ 3)
+ CONFIG_NO_METH3=y
+ ;;
+ 4)
+ CONFIG_NO_METH4=y
+ ;;
+ 5)
+ CONFIG_NO_METH5=y
+ ;;
+ 6)
+ CONFIG_NO_METH6=y
+ ;;
+ h)
+ usage
+ ;;
+ v)
+ V=1
+ ;;
+ s)
+ USE_ENTIRE_STABLELIST=0
+ [ -z "${CARCH:-}" ] && usage
+ if [ "$OPTARG" = "-" ]; then
+ SYMBOL+=($(cat))
+ continue
+ fi
+ SYMBOL+=($OPTARG)
+ ;;
+ a)
+ CARCH=$OPTARG
+ ;;
+ esac
+done
+shift $((OPTIND-1))
+
+CARCH=${CARCH:-$(uname -m)}
+SOURCES=("${@:-}")
+
+if [ "$CARCH" = "$(uname -m)" ]; then
+ if ! command -v "$CPP" &> /dev/null; then
+ echo "ERROR: native gcc not found."
+ exit 1
+ fi
+else
+ if [ -z "${CROSS_COMPILE:-}" ]; then
+ CROSS_COMPILE="${KABI_CROSS_COMPILE_PREFIX}"
+ CROSS_COMPILE+="$CARCH"
+ CROSS_COMPILE+="${KABI_CROSS_COMPILE_SUFFIX}"
+ fi
+
+ if ! [ -e "$CROSS_COMPILE$CPP" ]; then
+ echo "ERROR: $arch $CPP not found ($CROSS_COMPILE$CPP)"
+ exit 1
+ fi
+
+ MAKE_ARGS+=(ARCH=${CC_ARCH[$CARCH]} CROSS_COMPILE=$CROSS_COMPILE)
+fi
+
+# Set up is_verbose fd
+if [ ${V:-0} -gt 0 ]; then
+ exec 3>&1
+ export PS4='$LINENO: '
+ set -x
+else
+ exec 3> /dev/null
+fi
+
+export BASH_XTRACEFD="3"
+
+if [ -z "$CARCH" ]; then
+ err "No architecture specified."
+ usage
+fi
+
+if [ ! -d "$REDHAT/kabi/kabi-module/kabi_$CARCH" ]; then
+ err "Architecture $CARCH not supported."
+ exit 1
+fi
+
+trap cleanup EXIT
+
+# --- prep
+
+cd "$(git rev-parse --show-toplevel)"
+
+REDHAT=${REDHAT:-$(pwd)/redhat/}
+
+if [ $USE_ENTIRE_STABLELIST -eq 1 ]; then
+ SYMBOL=($(find $REDHAT/kabi/kabi-module/kabi_$CARCH -type f \
+ -not -name ".*" -exec basename {} \; | sort | uniq))
+ if [ -z "${SYMBOL[*]}" ]; then
+ err "No symbols found on stablelist. Nothing to do."
+ exit
+ fi
+elif [ -z "${SYMBOL[*]}" ]; then
+ err "No symbols given. Nothing to do."
+ exit
+fi
+
+echo0 "The following symbol entries will be updated:"
+
+for symbol in ${SYMBOL[@]}; do
+ if find $REDHAT/kabi/kabi-module/${CARCH/#/kabi_} -name $symbol \
+ -exec false {} + &> /dev/null; then
+ echo1 "$symbol (not found on ${CARCH} stablelist)"
+ else
+ echo1 "$symbol"
+ fi
+done
+
+if [ -z "${CONFIG_NO_CLEAN+x}" ]; then
+ make -j$(nproc) V=$V mrproper >&3 2>&3
+fi
+
+if [ ! -e $REDHAT/configs/kernel*$CARCH.config ]; then
+ echo0 "Generating config files ..."
+ make dist-configs V=$V >&3
+fi
+
+cp $REDHAT/configs/kernel*$(uname -m).config .config
+
+echo0 "Building scripts (genksyms) ..."
+
+make -j$(nproc) V=$V scripts >&3 2>&3 # -> genksyms, requires native cc
+
+cp $REDHAT/configs/kernel*$CARCH.config .config
+
+if [ -z "${CONFIG_NO_TEST+x}" ]; then
+ TEST_FILE=$({ grep -rl EXPORT_SYMBOL net/core net/ . || : ; } | head -n1)
+ TEST_SYMVERSIONS="$(printf "$TEST_FILE" | src_to_symversions)"
+ TEST_SYMTYPES="$(printf "$TEST_FILE" | src_to_symtypes)"
+ echo1 "Checking that genksyms works as expected on a test file" \
+ "$TEST_FILE, expecting $TEST_SYMVERSIONS, $TEST_SYMTYPES ..."
>&3
+ make V=$V ${MAKE_ARGS[@]} $TEST_SYMVERSIONS $TEST_SYMTYPES >&3 2>&3
+ if [ ! -e $TEST_SYMVERSIONS -o ! -e $TEST_SYMTYPES ]; then
+ warn "An attempt to test genksyms failed. Please re-run with" \
+ "-v and inspect the output and git diff to make sure" \
+ "that the script works correctly."
+ fi
+fi
+
+# ---
+
+queue_target() {
+ for f in "$@"; do
+ symv=($(printf "$f" | src_to_symversions))
+ symt=($(printf "$f" | src_to_symtypes))
+
+ # ensure it's not queued already
+ if [[ ! " ${FILE[*]} " =~ " $symv " ]]; then
+ FILE+=($symv)
+ echo1 "$f: queued targets: $symv" >&3
+ fi
+
+ if [[ ! " ${FILE[*]} " =~ " $symt " ]]; then
+ FILE+=($symt)
+ echo1 "$f: queued targets: $symt" >&3
+ fi
+ done
+}
+
+targets_from_srclist() {
+ for src in "${@:-}"; do
+ if ! [ -e "$src" ]; then
+ err "File \`$src' not found!"
+ exit 1
+ fi
+ queue_target "$src"
+ done
+}
+
+targets_from_symlist() {
+ for sym in ${@:-}; do
+ if ! [ -e $REDHAT/kabi/kabi-module/kabi_$CARCH/$sym ]; then
+ echo1 "$sym not found in $CARCH stablelist, skipping" \
+ "(missing: $REDHAT/kabi/kabi-module/kabi_$CARCH/$sym)" >&3
+ [[ ! " ${SYMFAIL[*]} " =~ " $sym " ]] && SYMFAIL+=($sym)
+ continue
+ fi
+ src="$(grep -Po '^#P:\K.*' $REDHAT/kabi/kabi-module/kabi_$CARCH/$sym ||
:)"
+ if [ -z "$src" ]; then
+ echo1 "$sym does not reference source file, skipping" \
+ "(missing: $REDHAT/kabi/kabi-module/kabi_$CARCH/$sym)" >&3
+ [[ ! " ${SYMFAIL[*]} " =~ " $sym " ]] && SYMFAIL+=($sym)
+ continue
+ fi
+ if ! [ -e "$src" ]; then
+ echo1 "$sym: source $src got moved or removed, skipping" >&3
+ [[ ! " ${SYMFAIL[*]} " =~ " $sym " ]] && SYMFAIL+=($sym)
+ continue
+ fi
+ queue_target "$src"
+ done
+}
+
+targets_cscope() {
+ command -v cscope >&3 || return
+ for sym in "${@:-}"; do
+ queue_target $(cscope -k -d -L1$sym | cut -f1 -d' ' || :)
+ done
+}
+
+targets_from_symlist_any() {
+ for sym in ${@:-}; do
+ fil=($(find $REDHAT/kabi/kabi-module/ -type f -name "$sym"))
+ if [ ${#fil[@]} -eq 0 ]; then
+ echo1 "$sym not found in any stablelist, skipping" \
+ "(missing: $REDHAT/kabi/kabi-module/*/$sym)" >&3
+ [[ ! " ${SYMFAIL[*]} " =~ " $sym " ]] && SYMFAIL+=($sym)
+ continue
+ fi
+ for f in ${fil[@]}; do
+ queue_target $(grep -Po '^#P:\K.*' $f | sort | uniq || :)
+ done
+ done
+}
+
+targets_naive() {
+ # symbol got moved, naive greedy search for export statement
+ # can produce any non-negative number of results:
+ # #res > 1 : arch-specific code may yield multiple files in arch,
+ # leaving it to kbuild to fail instead of trying to
+ # mask them
+ # #res = 1 : ok, provided this is not a false positive (we can
+ # tell that when we generate checksums)
+ # #res = 0 : this may occur when the export symbol call/symbol
+ # name is composed using preprocessor concatenation;
+ # in this case we are forced to generate all checksums
+ for src in $(batch export_tryfind "$@"); do
+ queue_target "$src"
+ done
+}
+
+targets_dry_run() {
+ queue_target $({ make ${MAKE_ARGS[@]} --dry-run 2>&3 || : ; } \
+ | grep -E '(gcc|as)' \
+ | grep -Po " \K[a-zA-Z0-9][^ ,.]*[^/ ,.]\.[cS]" \
+ | sort \
+ | uniq \
+ | sed 's/^\(.*\)\.[cS]$/\1.symtypes\n\1.symversions/g')
+}
+
+targets_compile() {
+ declare -A wrappers
+ local template=$(mktemp -t -u "kabi-wrapper-XXXXXXXXX")
+ local list=$(mktemp -u "kabi-list-XXXXXXXXX")
+ TEMP_FILES=("${TEMP_FILES[@]}" "$list")
+ for wrapper in $(grep -Po '= \$\(CROSS_COMPILE\)\K.*' Makefile); do
+ wrappers[$wrapper]=$template-$wrapper
+ TEMP_FILES=("${TEMP_FILES[@]}" "${wrappers[$wrapper]}")
+ bin=${CROSS_COMPILE:-}$wrapper list=$list envsubst '$bin $list' \
+ > "${wrappers[$wrapper]}" <<-'EOF'
+ #!/usr/bin/env bash
+ echo "$*" | grep -Po " \K[a-zA-Z0-9_/-]+\.[cS]" | tr ' '
'\n' >> $list
+ $bin "$@"
+ EOF
+ chmod +x "${wrappers[$wrapper]}"
+ done
+ make ${MAKE_ARGS[@]} CROSS_COMPILE="$template-" >&3 2>&3 || :
+ # no need to build symvers, using Module.symvers instead
+ queue_target $(cat $list | src_to_symtypes | sort | uniq)
+}
+
+SYMFAIL=(${SYMBOL[@]})
+
+if [ -z "${CONFIG_NO_METH1+x}" -a $# -gt 0 ]; then
+ prepare_stage
+ echo0 "Updating stablelist using user-supplied files ..."
+ targets_from_srclist "${SOURCES[@]}"
+ generate "${FILE[@]}" && exit 0 || :
+ dump_failed_symbols
+fi
+
+if [ -z "${CONFIG_NO_METH2+x}" ]; then
+ prepare_stage
+ echo0 "Updating stablelist using stablelist-provided files (arch specific)
..."
+ targets_from_symlist "${SYMBOL[@]}"
+ generate "${FILE[@]}" && exit 0 || :
+ dump_failed_symbols
+
+ prepare_stage
+ echo0 "Updating stablelist using stablelist-provided files (any archs) ..."
+ targets_from_symlist_any "${SYMBOL[@]}"
+ generate "${FILE[@]}" && exit 0 || :
+ dump_failed_symbols
+fi
+
+if [ -z "${CONFIG_NO_METH3+x}" ]; then
+ prepare_stage
+ echo0 "Updating stablelist using cscope-provided files ..."
+ targets_cscope "${SYMBOL[@]}"
+ generate "${FILE[@]}" && exit 0 || :
+ dump_failed_symbols
+fi
+
+if [ -z "${CONFIG_NO_METH4+x}" ]; then
+ prepare_stage
+ echo0 "Updating stablelist using naive method ..."
+ targets_naive "${SYMBOL[@]}"
+ generate "${FILE[@]}" && exit 0 || :
+ dump_failed_symbols
+fi
+
+if [ -z "${CONFIG_NO_METH5+x}" ]; then
+ prepare_stage
+ echo0 "Updating stablelist greedy method (this might take some time) ..."
+ targets_dry_run
+ generate "${FILE[@]}" && exit 0 || :
+ dump_failed_symbols
+fi
+
+if [ -z "${CONFIG_NO_METH6+x}" ]; then
+ prepare_stage
+ echo0 "Updating stablelist by compiling the kernel (this might take some time)
..."
+ targets_compile
+ generate "${FILE[@]}" && exit 0
+fi
+
+err "could not update all of the symbol checksums required:"
+for sym in ${SYMFAIL[@]}; do
+ printf "\t%s\n" "$sym"
+done
+exit 1
diff --git a/redhat/kabi/symtypes b/redhat/kabi/symtypes
new file mode 100755
index blahblah..blahblah 100755
--- /dev/null
+++ b/redhat/kabi/symtypes
@@ -0,0 +1,238 @@
+#!/usr/bin/env python3
+
+import os, sys, argparse, re, difflib, json
+
+def jsonKeys2int(x):
+ try:
+ if isinstance(x, dict):
+ return {int(k):v for k,v in x.items()}
+ return x
+ except ValueError:
+ return x
+
+def symtypes_parse(path, data = None):
+ if not data:
+ data = {
+ 'children': { 0 : []},
+ 'parents': { 0 : []},
+ 'strtab': ["(root)"],
+ 'index' : {},
+ 'file' : { }
+ }
+
+ bpath = os.path.basename(path)
+ data["file"] = {}
+ data["file"][bpath] = { 0 : "" }
+
+ with open(path, 'r') as fp_ref:
+ for line in fp_ref.readlines():
+ lsplit = line.split(' ')
+ root = lsplit.pop(0)
+ children = list(filter(lambda x: len(x) > 2 and (x[1] == '#' or x
== "UNKNOWN"), lsplit))
+ if root in data["index"]:
+ idx = data["index"][root]
+ if idx in data["children"] and
len(data["children"][idx]) > 0:
+ continue
+ index = data_add(data, root, 0, bpath, line)
+ for child in children:
+ child_index = data_add(data, child, index, "", "")
+ return data
+
+def data_add(data, ident, parent, bpath, line):
+ index = data['strtab'].index(ident) if ident in data['strtab'] else
-1
+ if index == -1:
+ index = len(data['strtab'])
+ data['strtab'].append(ident)
+ data['index'][ident] = index
+ data['children'][parent].append(index)
+ if index not in data['children']:
+ data['children'][index] = []
+ if index in data['parents']:
+ if parent not in data['parents'][index]:
+ data['parents'][index].append(parent)
+ else:
+ data['parents'][index] = [parent]
+ if bpath and line:
+ data['file'][bpath][index] = line
+ return index
+
+#def symtypes_dfs(data_a, source, sink, trace, inverse = False):
+# print(' > '.join(list(map(lambda i: data_a['strtab'][i], path +
[e]))))
+def symtypes_dfs(data, start, inverse=False, full=False):
+ start_i = data["index"][start]
+ stack = [(start_i,[start_i])]
+ visited = set()
+ paths = []
+ while stack:
+ (node, path) = stack.pop()
+ if full and node in path[:-1]:
+ continue
+ if not full:
+ if node in visited:
+ continue
+ visited.add(node)
+ paths.append(path)
+ if not inverse:
+ for child in reversed(data["children"][node]):
+ stack.append((child, path + [child]))
+ else:
+ for child in reversed(data["parents"][node]):
+ if child == 0:
+ continue
+ stack.append((child, path + [child]))
+
+ return visited, paths
+
+def st_open(path):
+ if not path:
+ raise ValueError("Blank blank.")
+ if not os.path.exists(path):
+ raise OSError(f"Path {path} does not exist.")
+ with open(path, "r") as f:
+ try:
+ return json.load(f, object_hook=jsonKeys2int)
+ except ValueError:
+ pass
+ return symtypes_parse(path)
+
+def st_write(path, data):
+ with open(path, "w+") as f:
+ if "file" in data:
+ del data["file"]
+ json.dump(data, f)
+
+def index(symtype, output):
+ data = st_open(symtype)
+ if output:
+ st_write(output, data)
+ return data
+
+def st_print(node):
+ if node[1] != '#':
+ return node
+ if node[0] == 's':
+ return "struct " + node[2:]
+ if node[0] == 't':
+ return "typedef " + node[2:]
+ if node[0] == 'E':
+ return "enum const " + node[2:]
+ if node[0] == 'e':
+ return "enum " + node[2:]
+ if node[0] == 'u':
+ return "union " + node[2:]
+ return node
+
+def im(file, dump_list, dump_path, dump_tree, start, inverse, silent):
+ data = index(file, None)
+
+ if start not in data["index"]:
+ if not silent:
+ print(f"Node {start} not found in file {file}. Exitting.")
+ sys.exit(1)
+
+ nodes, paths = symtypes_dfs(data, start, inverse)
+
+ if dump_list:
+ for node in map(lambda i: data['strtab'][i], nodes):
+ print(f"{st_print(node)} (symtype node: {node})")
+
+ if not dump_path and not dump_tree:
+ return
+
+ for path in paths:
+ if dump_tree:
+ print((len(path)-1)*" " + " - " +
f"{st_print(data['strtab'][path[-1]])} (symtype node:
{data['strtab'][path[-1]]})");
+ continue
+ if dump_path:
+ print(list(map(lambda i: data["strtab"][i], path)))
+
+def diff(ref, new, start):
+ data_ref = index(ref, None)
+ data_new = index(new, None)
+
+ nodes_ref, _ = symtypes_dfs(data_ref, start)
+ nodes_new, _ = symtypes_dfs(data_new, start)
+
+ nodes_ref_lbl = set(map(lambda i: data_ref['strtab'][i], nodes_ref))
+ nodes_new_lbl = set(map(lambda i: data_new['strtab'][i], nodes_new))
+ nodes_all = nodes_ref_lbl | nodes_new_lbl
+ nodes_13 = nodes_all - nodes_ref_lbl
+ nodes_23 = nodes_all - nodes_new_lbl
+
+ if nodes_23:
+ print("The following nodes were encountered only in reference
symtypes:")
+ print("\t" + "\n\t".join(nodes_23))
+
+ if nodes_13:
+ print("The following nodes were encountered only in new symtypes:")
+ print("\t" + "\n\t".join(nodes_13))
+
+ bpath_a = os.path.basename(ref)
+ bpath_b = os.path.basename(new)
+ for node in nodes_all - (nodes_13 | nodes_23):
+ idx_a = data_ref['index'][node]
+ idx_b = data_new['index'][node]
+ r = set(map(lambda i: data_ref['strtab'][i],
data_ref['children'][idx_a]))
+ n = set(map(lambda i: data_new['strtab'][i],
data_new['children'][idx_b]))
+
+ if r == n:
+ continue
+
+ i = ["\t"+data_ref['file'][bpath_a][idx_a]], \
+ ["\t"+data_new['file'][bpath_b][idx_b]]
+
+ if i[0] != i[1]:
+ print(f"Possible breakage detected for {st_print(node)} (symtype node:
{node}) ...")
+ if len(n) == 1 and "UNKNOWN" in n:
+ print("\treplaced by UNKNOWN. Please inspect changes to #include
directives")
+ if len(r) == 1 and "UNKNOWN" in r:
+ print("\tUNKNOWN got replaced. Please inspect changes to #include
directives")
+ diff = difflib.ndiff(i[0], i[1])
+ print(''.join(diff), end="")
+
+
+if __name__ == "__main__":
+ parser = argparse.ArgumentParser()
+
+ subparsers = parser.add_subparsers(help='Modes of operation.',
+ dest="mode")
+ parser_index = subparsers.add_parser('index',
+ help='Calculate symtypes index.')
+ parser_image = subparsers.add_parser('image',
+ help='Show type/symbol dependencies.')
+ parser_preimage = subparsers.add_parser('preimage',
+ help='Show type/symbol preimage.')
+ parser_df = subparsers.add_parser('diff',
+ help='Calculate simple symtype diff.')
+
+ parser_index.add_argument('-o', '--output', type=str, required=True,
+ help='Output index file.')
+ parser_index.add_argument('symtype', type=str)
+
+ for p in [ parser_image, parser_preimage ]:
+ p.add_argument('-i', '--index', action='store_true',
+ help="Input is an index file.")
+ p.add_argument('-S', '--silent', action='store_true')
+ p.add_argument('-l', '--ls', action='store_true',
+ help="List dependent nodes.")
+ p.add_argument('-p', '--path', action='store_true',
+ help="List paths to dependent nodes.")
+ p.add_argument('-t', '--tree', action='store_true',
+ help="Dump tree.")
+ p.add_argument('-s', '--start', type=str, nargs='?',
+ help="Start symtype entry/entries.")
+ p.add_argument('symtype', type=str)
+
+ parser_df.add_argument('reference', type=str)
+ parser_df.add_argument('new', type=str)
+ parser_df.add_argument('-s', '--start', type=str, nargs='?',
+ help="Start symtype entry/entries.")
+
+ args = parser.parse_args()
+
+ if args.mode == "index":
+ index(args.symtype, args.output)
+ elif args.mode == "image" or args.mode == "preimage":
+ im(args.symtype, args.ls, args.path, args.tree, args.start, args.mode ==
"preimage", args.silent)
+ elif args.mode == "diff":
+ diff(args.reference, args.new, args.start)
diff --git a/redhat/kabi/update-kabi b/redhat/kabi/update-kabi
new file mode 100755
index blahblah..blahblah 100755
--- /dev/null
+++ b/redhat/kabi/update-kabi
@@ -0,0 +1,125 @@
+#!/usr/bin/env bash
+
+usage_desc() {
+ sed 's/^\t//' <<EOF
+ Updates the kernel ABI stablelist checksum information and symtypes
+ for architecture ARCH.
+
+ The file updates stablelist definition in \$REDHAT/kabi/*. It does not
+ stage the newly updated stablelist.
+EOF
+}
+
+emit_line_from_Module_symvers() {
+ [ ! -e Module.symvers ] && return 1
+ grep -P "\t$2\t" Module.symvers
+}
+
+emit_line() {
+ local checksum="$1"
+ local symbol="$2"
+ local obj="${3:-unknown}"
+ local macro="${4:-UNKNOWN_MACRO}"
+ local namespace="${5:-}"
+
+ if [ -z "${namespace:-}" ]; then
+ printf "%s\t%s\t%s\t%s\n" $checksum $symbol $obj $macro
+ return
+ fi
+
+ printf "%s\t%s\t%s\t%s\t%s\n" $checksum $symbol $obj $macro $namespace
+}
+
+cb_checksum_new() {
+ local arch="$1"
+ local symbol="$2"
+ local checksum="$3"
+ local file="$4"
+ local symversions="$5"
+ local symtypes="$6"
+ local stable_entry=$REDHAT/kabi/kabi-module/kabi_$arch/$symbol
+ local prev_csum="NULL"
+
+ {
+ printf "#0-\n"
+ printf "#I:0\n"
+ printf "#P:$file\n"
+ if ! emit_line_from_Module_symvers $arch $symbol; then
+ [ ${TEST:-0} -eq 0 ] && return 1
+ emit_line $checksum $symbol null null
+ fi
+ } > $stable_entry
+
+ echo2 "Added symbol \`$sym' for architecture \`$arch' ($checksum)."
+ emit_line_from_Module_symvers $arch $symbol || :
+}
+
+cb_checksum_update() {
+ local arch="$1"
+ local symbol="$2"
+ local checksum="$3"
+ local file="$4"
+ local symversions="$5"
+ local symtypes="$6"
+
+ local prev_index="$7"
+ local prev_csum="$8"
+ #prev_symbol $9 unused
+ local prev_obj="${10}"
+ local prev_macro="${11}"
+ local prev_ns="${12:-}"
+
+ local stable_entry=$REDHAT/kabi/kabi-module/kabi_$arch/$symbol
+ local index=$(grep -v '^#' $stable_entry | wc -l)
+
+ if [ "$prev_csum" = "$checksum" ]; then
+ echo2 "Symbol checksum of \`$sym' for architecture \`$arch'
unchanged."
+ return
+ fi
+
+ sed -i -e "s#\#P:.*#\#P:$file#" -e "s/#I:[0-9]\+/#I:$index/" \
+ $stable_entry
+ if ! emit_line_from_Module_symvers $arch $symbol; then
+ emit_line $checksum $symbol $prev_obj $prev_macro $prev_ns
+ fi >> $stable_entry
+
+ echo2 "Updated symbol \`$sym' for architecture \`$arch'" \
+ "($prev_csum -> $checksum)."
+}
+
+# Called whenever a new symbol checksum is obtained
+# cb_checksum ARCH SYMBOL CHECKSUM FILE SYMVERSIONS_FILE SYMTYPES_FILE
+cb_checksum() {
+ local arch="$1"
+ local symbol="$2"
+ local checksum="$3"
+ local symversions="$5"
+ local symtypes="$6"
+ local stable_entry=$REDHAT/kabi/kabi-module/kabi_$arch/$symbol
+
+ cp $symtypes $REDHAT/kabi/kabi-module/kabi_$arch/.$symbol
+
+ if [ -e $stable_entry ]; then
+ prev_index=$(grep -Po "^#I:\K[0-9]+" $stable_entry)
+ cb_checksum_update "$@" $prev_index $(
+ IFS=' ' grep -v "^#" $stable_entry \
+ | head -n$((${prev_index}+1)) \
+ | tail -n1
+ )
+ return
+ fi
+
+ cb_checksum_new "$@"
+}
+
+# Called whenever the generate command finished successfully
+cb_ready() {
+ # no more symbols, nothing to do
+ :
+}
+
+cd "$(git rev-parse --show-toplevel)"
+REDHAT=${REDHAT:-$(pwd)/redhat/}
+
+# Generate new symbol checksums and symvers files
+. $REDHAT/kabi/symtype-generate
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2021
12:27 p.m.
New subject: [OS-BUILD PATCHv4 14/19] perf: Require libbpf 0.6.0 or newer
From: Prarit Bhargava <prarit(a)redhat.com>
perf: Require libbpf 0.6.0 or newer
With libbpf 0.5 or older, feature-detection mechanism in tools/build
silently fails for some functions (namely bpf_object__next_map() and
bpf_object__next_program()), so fallbacks are used and that leads to
endless loop.
Make the problem visible during build by requiring libbpf new enough.
Signed-off-by: Michael Petlan <mpetlan(a)redhat.com>
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
@@ -602,7 +602,7 @@ BuildRequires: sparse
BuildRequires: zlib-devel binutils-devel newt-devel perl(ExtUtils::Embed) bison flex
xz-devel
BuildRequires: audit-libs-devel python3-setuptools
BuildRequires: java-devel
-BuildRequires: libbpf-devel
+BuildRequires: libbpf-devel >= 0.6.0-1
BuildRequires: libbabeltrace-devel
BuildRequires: libtraceevent-devel
%ifnarch %{arm} s390x
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2021
12:27 p.m.
New subject: [OS-BUILD PATCHv4 15/19] kernel.spec: disable vmlinux.h generation
for s390
zfcpdump config
From: Prarit Bhargava <prarit(a)redhat.com>
kernel.spec: disable vmlinux.h generation for s390 zfcpdump config
With the linux upstream commit d9847eb8be3d ("bpf: Make
CONFIG_DEBUG_INFO_BTF depend upon CONFIG_BPF_SYSCALL") zfcpdump does not
have btf anymore (it does not enable CONFIG_BPF_SYSCALL), so the
generation fails.
Signed-off-by: Yauheni Kaliuta <ykaliuta(a)redhat.com>
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
@@ -2196,7 +2196,10 @@ BuildKernel() {
%ifnarch armv7hl
# Generate vmlinux.h and put it to kernel-devel path
- bpftool btf dump file vmlinux format c > $RPM_BUILD_ROOT/$DevelDir/vmlinux.h
+ # zfcpdump build does not have btf anymore
+ if [ "$Variant" != "zfcpdump" ]; then
+ bpftool btf dump file vmlinux format c > $RPM_BUILD_ROOT/$DevelDir/vmlinux.h
+ fi
%endif
# prune junk from kernel-devel
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2021
12:27 p.m.
New subject: [OS-BUILD PATCHv4 16/19] redhat/Makefile.variables: Add
ADD_COMMITID_TO_VERSION
From: Prarit Bhargava <prarit(a)redhat.com>
redhat/Makefile.variables: Add ADD_COMMITID_TO_VERSION
As noted in ARK commit 40aae9752b8b ("Fix versioning on stable Fedora"),
adding the commit ID to all versions must be optional. Currently, the
centos-stream-9 repository does not have this feature and adding it would
cause a significant behavioral change in the dist-*-rpm and other targets.
Add ADD_COMMITID_TO_VERSION which makes adding the commit ID to the
version field optional.
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
@@ -197,7 +197,7 @@ ifeq ($(VERSION_ON_UPSTREAM),1)
endif
else
SNAPSHOT:=0
- ifneq ("$(DISTRO)", "fedora")
+ ifneq ($(ADD_COMMITID_TO_VERSION),)
_EXACT_TAG:=$(shell $(GIT) describe --exact-match 2>/dev/null)
ifeq ($(_EXACT_TAG),)
_TAG:=$(shell $(GIT) describe 2>/dev/null)
diff --git a/redhat/Makefile.variables b/redhat/Makefile.variables
index blahblah..blahblah 100644
--- a/redhat/Makefile.variables
+++ b/redhat/Makefile.variables
@@ -137,3 +137,7 @@ KABI_CROSS_COMPILE_PREFIX ?= /usr/bin/
# This variable is the suffix of the KABI cross compilers
KABI_CROSS_COMPILE_SUFFIX ?= -linux-gnu-
+
+# This appends 5 characters of the top-of-tree commit ID to the BUILD variable,
+# which is then reflected in the package NVR.
+ADD_COMMITID_TO_VERSION ?=
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.el7
b/redhat/self-test/data/centos-2585cf9dfaad.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-2585cf9dfaad.el7
+++ b/redhat/self-test/data/centos-2585cf9dfaad.el7
@@ -1,5 +1,6 @@
.DEFAULT_GOAL=dist-cross-download
.SHELLSTATUS=0
+ADD_COMMITID_TO_VERSION=
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
BASEVERSION=5.16.0-0.rc5.6.test
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.fc25
b/redhat/self-test/data/centos-2585cf9dfaad.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-2585cf9dfaad.fc25
+++ b/redhat/self-test/data/centos-2585cf9dfaad.fc25
@@ -1,5 +1,6 @@
.DEFAULT_GOAL=dist-cross-download
.SHELLSTATUS=0
+ADD_COMMITID_TO_VERSION=
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
BASEVERSION=5.16.0-0.rc5.6.test
diff --git a/redhat/self-test/data/centos-78e36f3b0dae.el7
b/redhat/self-test/data/centos-78e36f3b0dae.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-78e36f3b0dae.el7
+++ b/redhat/self-test/data/centos-78e36f3b0dae.el7
@@ -1,5 +1,6 @@
.DEFAULT_GOAL=dist-cross-download
.SHELLSTATUS=0
+ADD_COMMITID_TO_VERSION=
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
BASEVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test
diff --git a/redhat/self-test/data/centos-78e36f3b0dae.fc25
b/redhat/self-test/data/centos-78e36f3b0dae.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-78e36f3b0dae.fc25
+++ b/redhat/self-test/data/centos-78e36f3b0dae.fc25
@@ -1,5 +1,6 @@
.DEFAULT_GOAL=dist-cross-download
.SHELLSTATUS=0
+ADD_COMMITID_TO_VERSION=
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
BASEVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test
diff --git a/redhat/self-test/data/centos-df0cc57e057f.el7
b/redhat/self-test/data/centos-df0cc57e057f.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-df0cc57e057f.el7
+++ b/redhat/self-test/data/centos-df0cc57e057f.el7
@@ -1,5 +1,6 @@
.DEFAULT_GOAL=dist-cross-download
.SHELLSTATUS=0
+ADD_COMMITID_TO_VERSION=
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
BASEVERSION=5.16.0-6.test
diff --git a/redhat/self-test/data/centos-df0cc57e057f.fc25
b/redhat/self-test/data/centos-df0cc57e057f.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-df0cc57e057f.fc25
+++ b/redhat/self-test/data/centos-df0cc57e057f.fc25
@@ -1,5 +1,6 @@
.DEFAULT_GOAL=dist-cross-download
.SHELLSTATUS=0
+ADD_COMMITID_TO_VERSION=
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
BASEVERSION=5.16.0-6.test
diff --git a/redhat/self-test/data/centos-fce15c45d3fb.el7
b/redhat/self-test/data/centos-fce15c45d3fb.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-fce15c45d3fb.el7
+++ b/redhat/self-test/data/centos-fce15c45d3fb.el7
@@ -1,5 +1,6 @@
.DEFAULT_GOAL=dist-cross-download
.SHELLSTATUS=0
+ADD_COMMITID_TO_VERSION=
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
BASEVERSION=5.16.0-0.rc5.fce15c45d3fb.6.test
diff --git a/redhat/self-test/data/centos-fce15c45d3fb.fc25
b/redhat/self-test/data/centos-fce15c45d3fb.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-fce15c45d3fb.fc25
+++ b/redhat/self-test/data/centos-fce15c45d3fb.fc25
@@ -1,5 +1,6 @@
.DEFAULT_GOAL=dist-cross-download
.SHELLSTATUS=0
+ADD_COMMITID_TO_VERSION=
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
BASEVERSION=5.16.0-0.rc5.fce15c45d3fb.6.test
diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.el7
b/redhat/self-test/data/fedora-2585cf9dfaad.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/fedora-2585cf9dfaad.el7
+++ b/redhat/self-test/data/fedora-2585cf9dfaad.el7
@@ -1,5 +1,6 @@
.DEFAULT_GOAL=dist-cross-download
.SHELLSTATUS=0
+ADD_COMMITID_TO_VERSION=
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
BASEVERSION=5.16.0-0.rc5.6.test
diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.fc25
b/redhat/self-test/data/fedora-2585cf9dfaad.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/fedora-2585cf9dfaad.fc25
+++ b/redhat/self-test/data/fedora-2585cf9dfaad.fc25
@@ -1,5 +1,6 @@
.DEFAULT_GOAL=dist-cross-download
.SHELLSTATUS=0
+ADD_COMMITID_TO_VERSION=
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
BASEVERSION=5.16.0-0.rc5.6.test
diff --git a/redhat/self-test/data/fedora-78e36f3b0dae.el7
b/redhat/self-test/data/fedora-78e36f3b0dae.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/fedora-78e36f3b0dae.el7
+++ b/redhat/self-test/data/fedora-78e36f3b0dae.el7
@@ -1,5 +1,6 @@
.DEFAULT_GOAL=dist-cross-download
.SHELLSTATUS=0
+ADD_COMMITID_TO_VERSION=
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
BASEVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test
diff --git a/redhat/self-test/data/fedora-78e36f3b0dae.fc25
b/redhat/self-test/data/fedora-78e36f3b0dae.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/fedora-78e36f3b0dae.fc25
+++ b/redhat/self-test/data/fedora-78e36f3b0dae.fc25
@@ -1,5 +1,6 @@
.DEFAULT_GOAL=dist-cross-download
.SHELLSTATUS=0
+ADD_COMMITID_TO_VERSION=
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
BASEVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test
diff --git a/redhat/self-test/data/fedora-df0cc57e057f.el7
b/redhat/self-test/data/fedora-df0cc57e057f.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/fedora-df0cc57e057f.el7
+++ b/redhat/self-test/data/fedora-df0cc57e057f.el7
@@ -1,5 +1,6 @@
.DEFAULT_GOAL=dist-cross-download
.SHELLSTATUS=0
+ADD_COMMITID_TO_VERSION=
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
BASEVERSION=5.16.0-6.test
diff --git a/redhat/self-test/data/fedora-df0cc57e057f.fc25
b/redhat/self-test/data/fedora-df0cc57e057f.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/fedora-df0cc57e057f.fc25
+++ b/redhat/self-test/data/fedora-df0cc57e057f.fc25
@@ -1,5 +1,6 @@
.DEFAULT_GOAL=dist-cross-download
.SHELLSTATUS=0
+ADD_COMMITID_TO_VERSION=
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
BASEVERSION=5.16.0-6.test
diff --git a/redhat/self-test/data/fedora-fce15c45d3fb.el7
b/redhat/self-test/data/fedora-fce15c45d3fb.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/fedora-fce15c45d3fb.el7
+++ b/redhat/self-test/data/fedora-fce15c45d3fb.el7
@@ -1,5 +1,6 @@
.DEFAULT_GOAL=dist-cross-download
.SHELLSTATUS=0
+ADD_COMMITID_TO_VERSION=
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
BASEVERSION=5.16.0-0.rc5.fce15c45d3fb.6.test
diff --git a/redhat/self-test/data/fedora-fce15c45d3fb.fc25
b/redhat/self-test/data/fedora-fce15c45d3fb.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/fedora-fce15c45d3fb.fc25
+++ b/redhat/self-test/data/fedora-fce15c45d3fb.fc25
@@ -1,5 +1,6 @@
.DEFAULT_GOAL=dist-cross-download
.SHELLSTATUS=0
+ADD_COMMITID_TO_VERSION=
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
BASEVERSION=5.16.0-0.rc5.fce15c45d3fb.6.test
diff --git a/redhat/self-test/data/rhel-2585cf9dfaad.el7
b/redhat/self-test/data/rhel-2585cf9dfaad.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/rhel-2585cf9dfaad.el7
+++ b/redhat/self-test/data/rhel-2585cf9dfaad.el7
@@ -1,5 +1,6 @@
.DEFAULT_GOAL=dist-cross-download
.SHELLSTATUS=0
+ADD_COMMITID_TO_VERSION=
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
BASEVERSION=5.16.0-0.rc5.6.test
diff --git a/redhat/self-test/data/rhel-2585cf9dfaad.fc25
b/redhat/self-test/data/rhel-2585cf9dfaad.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/rhel-2585cf9dfaad.fc25
+++ b/redhat/self-test/data/rhel-2585cf9dfaad.fc25
@@ -1,5 +1,6 @@
.DEFAULT_GOAL=dist-cross-download
.SHELLSTATUS=0
+ADD_COMMITID_TO_VERSION=
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
BASEVERSION=5.16.0-0.rc5.6.test
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2021
12:27 p.m.
New subject: [OS-BUILD PATCHv4 17/19] redhat: remove GL_DISTGIT_USER,
RHDISTGIT and unify dist-git cloning
From: Prarit Bhargava <prarit(a)redhat.com>
redhat: remove GL_DISTGIT_USER, RHDISTGIT and unify dist-git cloning
Tested: make DISTRO=centos dist-git-test
1) GL_DISTGIT_USER is used for private fork cloning. There is no
reason to use private fork in dist-git cloning. First this would
require to keep the fork in sync with the orig repo main branch
and moreover this behaves differently if the local repo cache is
specified or not(*pkg vs git).
2) Copying sources from repo cache depends on working dir and it
requires the sources to be updated anyways. Just remove this step.
3) *pkg commands allow to pass extra args to git. There is no need
to use two ways how to clone the repo. This also makes RHDISTGIT
obsolete. Use just *pkg for cloning and remove RHDISTGIT.
4) With these clean-ups there is no need to keep clone_tree.sh around.
Just remove it and move the few commands directly into rh-dist-git.sh
Signed-off-by: Frantisek Hrbata <fhrbata(a)redhat.com>
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
@@ -755,12 +755,6 @@ dist-git: dist-srpm $(KABI_TARBALL) $(KABIDW_TARBALL)
ifeq ("$(RHDISTGIT_BRANCH)", "")
$(error RHDISTGIT_BRANCH unset)
endif
- @if [ "$(DISTRO)" == "centos" ]; then \
- if [ -z "$(GL_DISTGIT_USER)" ]; then \
- echo "Error: please provide your gitlab username with GL_DISTGIT_USER"; \
- exit 1; \
- fi; \
- fi
$(REDHAT)/scripts/rh-dist-git.sh
dist-rtg: dist-release
diff --git a/redhat/Makefile.rhpkg b/redhat/Makefile.rhpkg
index blahblah..blahblah 100644
--- a/redhat/Makefile.rhpkg
+++ b/redhat/Makefile.rhpkg
@@ -30,16 +30,3 @@ ifeq ("$(RHDISTGIT_CACHE)", "")
include $(TOPDIR)/.rhpkg.mk
endif
endif
-
-ifeq ("$(DISTRO)", "fedora")
- RHDISTGIT:=ssh://$(RHDISTGIT_USER)@pkgs.fedoraproject.org/rpms/$(PACKAGE_NAME)
-else ifeq ("$(DISTRO)", "centos")
- # CentOS uses a fork + merge request based workflow with dist-git to
- # handle changes, so you need to provide the gitlab username and we by
- # default set the default user's fork path. The dist-git target in
- # redhat/Makefile has a check to see if the variable is not set.
- GL_FORK_PATH?=$(PACKAGE_NAME).git
- RHDISTGIT:=git@gitlab.com:$(GL_DISTGIT_USER)/$(GL_FORK_PATH)
-else
- RHDISTGIT:=ssh://$(RHDISTGIT_USER)@pkgs.devel.redhat.com/rpms/$(PACKAGE_NAME)
-endif
diff --git a/redhat/scripts/clone_tree.sh b/redhat/scripts/clone_tree.sh
deleted file mode 100755
index blahblah..blahblah 0
--- a/redhat/scripts/clone_tree.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-
-# Clones a RHEL dist-git tree using a local reference if existent
-
-function die
-{
- echo "Error: $1" >&2;
- exit 1;
-}
-
-date=$(date +"%Y-%m-%d")
-tmp="$(mktemp -d --tmpdir="$RHDISTGIT_TMP"
RHEL"$RHEL_MAJOR"."$date".XXXXXXXX)";
-cd "$tmp" || die "Unable to create temporary directory";
-
-if [[ -n $RHDISTGIT && -n $RHDISTGIT_CACHE ]]; then
- git clone --reference "$RHDISTGIT_CACHE" "$RHDISTGIT"
"$PACKAGE_NAME" >/dev/null || die "Unable to clone using local
cache";
- # if there're tarballs present that are listed in the "sources" file,
- # copy them or it'll be downloaded again
- if [ -e "$RHDISTGIT_CACHE/sources" ]; then
- while IFS= read -r i; do
- if [ -f "$RHDISTGIT_CACHE/$i" ]; then
- cp "$RHDISTGIT_CACHE/$i" "$tmp/kernel/";
- fi
- done < "$RHDISTGIT_CACHE"/sources
- fi
-else
- echo "No local repo, cloning using $RHPKG_BIN" >&2;
- $RHPKG_BIN clone "$PACKAGE_NAME" >/dev/null || die "Unable to clone
using $RHPKG_BIN";
-fi
-
-echo "$tmp";
-
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
@@ -23,8 +23,14 @@ fi
echo "Cloning the repository"
# clone the dist-git, considering cache
-tmpdir=$("$REDHAT"/scripts/clone_tree.sh);
-
+date=$(date +"%Y-%m-%d")
+tmpdir="$(mktemp -d --tmpdir="$RHDISTGIT_TMP"
RHEL"$RHEL_MAJOR"."$date".XXXXXXXX)"
+cd "$tmpdir" || die "Unable to create temporary directory";
+test -n "$RHDISTGIT_CACHE" && reference="-- --reference
$RHDISTGIT_CACHE"
+echo "Cloning using $RHPKG_BIN" >&2;
+# shellcheck disable=SC2086
+eval $RHPKG_BIN clone "$PACKAGE_NAME" "$reference" >/dev/null ||
die "Unable to clone using $RHPKG_BIN";
+
echo "Switching the branch"
# change in the correct branch
cd "$tmpdir/$PACKAGE_NAME";
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
@@ -21,7 +21,6 @@ EARLY_YRELEASE=
FLAVOR=
GIT=git
GITID=2585cf9dfaaddf00b069673f27bb3f8530e2039c
-GL_FORK_PATH=kernel.git
GNUMAKEFLAGS=
HEAD=2585cf9dfaad
INCLUDE_FEDORA_FILES=1
@@ -48,7 +47,6 @@ PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
RELEASED_KERNEL=0
RELEASETAG=kernel-5.16.0-0.rc5.6.test
-RHDISTGIT=git@gitlab.com:/kernel.git
RHDISTGIT_BRANCH=c9s
RHDISTGIT_TMP=/tmp
RHDISTGIT_USER="shadowman"
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
@@ -21,7 +21,6 @@ EARLY_YRELEASE=
FLAVOR=
GIT=git
GITID=2585cf9dfaaddf00b069673f27bb3f8530e2039c
-GL_FORK_PATH=kernel.git
GNUMAKEFLAGS=
HEAD=2585cf9dfaad
INCLUDE_FEDORA_FILES=1
@@ -48,7 +47,6 @@ PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
RELEASED_KERNEL=0
RELEASETAG=kernel-5.16.0-0.rc5.6.test
-RHDISTGIT=git@gitlab.com:/kernel.git
RHDISTGIT_BRANCH=c9s
RHDISTGIT_TMP=/tmp
RHDISTGIT_USER="shadowman"
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
@@ -21,7 +21,6 @@ EARLY_YRELEASE=
FLAVOR=
GIT=git
GITID=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1
-GL_FORK_PATH=kernel.git
GNUMAKEFLAGS=
HEAD=78e36f3b0dae
INCLUDE_FEDORA_FILES=1
@@ -48,7 +47,6 @@ PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
RELEASED_KERNEL=0
RELEASETAG=kernel-5.17.0-0.rc0.78e36f3b0dae.6.test
-RHDISTGIT=git@gitlab.com:/kernel.git
RHDISTGIT_BRANCH=c9s
RHDISTGIT_TMP=/tmp
RHDISTGIT_USER="shadowman"
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
@@ -21,7 +21,6 @@ EARLY_YRELEASE=
FLAVOR=
GIT=git
GITID=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1
-GL_FORK_PATH=kernel.git
GNUMAKEFLAGS=
HEAD=78e36f3b0dae
INCLUDE_FEDORA_FILES=1
@@ -48,7 +47,6 @@ PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
RELEASED_KERNEL=0
RELEASETAG=kernel-5.17.0-0.rc0.78e36f3b0dae.6.test
-RHDISTGIT=git@gitlab.com:/kernel.git
RHDISTGIT_BRANCH=c9s
RHDISTGIT_TMP=/tmp
RHDISTGIT_USER="shadowman"
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
@@ -21,7 +21,6 @@ EARLY_YRELEASE=
FLAVOR=
GIT=git
GITID=df0cc57e057f18e44dac8e6c18aba47ab53202f9
-GL_FORK_PATH=kernel.git
GNUMAKEFLAGS=
HEAD=df0cc57e057f
INCLUDE_FEDORA_FILES=1
@@ -48,7 +47,6 @@ PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
RELEASED_KERNEL=0
RELEASETAG=kernel-5.16.0-6.test
-RHDISTGIT=git@gitlab.com:/kernel.git
RHDISTGIT_BRANCH=c9s
RHDISTGIT_TMP=/tmp
RHDISTGIT_USER="shadowman"
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
@@ -21,7 +21,6 @@ EARLY_YRELEASE=
FLAVOR=
GIT=git
GITID=df0cc57e057f18e44dac8e6c18aba47ab53202f9
-GL_FORK_PATH=kernel.git
GNUMAKEFLAGS=
HEAD=df0cc57e057f
INCLUDE_FEDORA_FILES=1
@@ -48,7 +47,6 @@ PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
RELEASED_KERNEL=0
RELEASETAG=kernel-5.16.0-6.test
-RHDISTGIT=git@gitlab.com:/kernel.git
RHDISTGIT_BRANCH=c9s
RHDISTGIT_TMP=/tmp
RHDISTGIT_USER="shadowman"
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
@@ -21,7 +21,6 @@ EARLY_YRELEASE=
FLAVOR=
GIT=git
GITID=fce15c45d3fbd9fc1feaaf3210d8e3f8b33dfd3a
-GL_FORK_PATH=kernel.git
GNUMAKEFLAGS=
HEAD=fce15c45d3fb
INCLUDE_FEDORA_FILES=1
@@ -48,7 +47,6 @@ PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
RELEASED_KERNEL=0
RELEASETAG=kernel-5.16.0-0.rc5.fce15c45d3fb.6.test
-RHDISTGIT=git@gitlab.com:/kernel.git
RHDISTGIT_BRANCH=c9s
RHDISTGIT_TMP=/tmp
RHDISTGIT_USER="shadowman"
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
@@ -21,7 +21,6 @@ EARLY_YRELEASE=
FLAVOR=
GIT=git
GITID=fce15c45d3fbd9fc1feaaf3210d8e3f8b33dfd3a
-GL_FORK_PATH=kernel.git
GNUMAKEFLAGS=
HEAD=fce15c45d3fb
INCLUDE_FEDORA_FILES=1
@@ -48,7 +47,6 @@ PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
RELEASED_KERNEL=0
RELEASETAG=kernel-5.16.0-0.rc5.fce15c45d3fb.6.test
-RHDISTGIT=git@gitlab.com:/kernel.git
RHDISTGIT_BRANCH=c9s
RHDISTGIT_TMP=/tmp
RHDISTGIT_USER="shadowman"
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
@@ -47,7 +47,6 @@ PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
RELEASED_KERNEL=0
RELEASETAG=kernel-5.16.0-0.rc5.6.test
-RHDISTGIT=ssh://"shadowman"@pkgs.fedoraproject.org/rpms/kernel
RHDISTGIT_BRANCH=rawhide
RHDISTGIT_TMP=/tmp
RHDISTGIT_USER="shadowman"
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
@@ -47,7 +47,6 @@ PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
RELEASED_KERNEL=0
RELEASETAG=kernel-5.16.0-0.rc5.6.test
-RHDISTGIT=ssh://"shadowman"@pkgs.fedoraproject.org/rpms/kernel
RHDISTGIT_BRANCH=rawhide
RHDISTGIT_TMP=/tmp
RHDISTGIT_USER="shadowman"
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
@@ -47,7 +47,6 @@ PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
RELEASED_KERNEL=0
RELEASETAG=kernel-5.17.0-0.rc0.78e36f3b0dae.6.test
-RHDISTGIT=ssh://"shadowman"@pkgs.fedoraproject.org/rpms/kernel
RHDISTGIT_BRANCH=rawhide
RHDISTGIT_TMP=/tmp
RHDISTGIT_USER="shadowman"
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
@@ -47,7 +47,6 @@ PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
RELEASED_KERNEL=0
RELEASETAG=kernel-5.17.0-0.rc0.78e36f3b0dae.6.test
-RHDISTGIT=ssh://"shadowman"@pkgs.fedoraproject.org/rpms/kernel
RHDISTGIT_BRANCH=rawhide
RHDISTGIT_TMP=/tmp
RHDISTGIT_USER="shadowman"
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
@@ -47,7 +47,6 @@ PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
RELEASED_KERNEL=0
RELEASETAG=kernel-5.16.0-6.test
-RHDISTGIT=ssh://"shadowman"@pkgs.fedoraproject.org/rpms/kernel
RHDISTGIT_BRANCH=rawhide
RHDISTGIT_TMP=/tmp
RHDISTGIT_USER="shadowman"
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
@@ -47,7 +47,6 @@ PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
RELEASED_KERNEL=0
RELEASETAG=kernel-5.16.0-6.test
-RHDISTGIT=ssh://"shadowman"@pkgs.fedoraproject.org/rpms/kernel
RHDISTGIT_BRANCH=rawhide
RHDISTGIT_TMP=/tmp
RHDISTGIT_USER="shadowman"
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
@@ -47,7 +47,6 @@ PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
RELEASED_KERNEL=0
RELEASETAG=kernel-5.16.0-0.rc5.fce15c45d3fb.6.test
-RHDISTGIT=ssh://"shadowman"@pkgs.fedoraproject.org/rpms/kernel
RHDISTGIT_BRANCH=rawhide
RHDISTGIT_TMP=/tmp
RHDISTGIT_USER="shadowman"
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
@@ -47,7 +47,6 @@ PROCESS_CONFIGS_OPTS=-n -w -c
REDHAT=../redhat
RELEASED_KERNEL=0
RELEASETAG=kernel-5.16.0-0.rc5.fce15c45d3fb.6.test
-RHDISTGIT=ssh://"shadowman"@pkgs.fedoraproject.org/rpms/kernel
RHDISTGIT_BRANCH=rawhide
RHDISTGIT_TMP=/tmp
RHDISTGIT_USER="shadowman"
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2021
12:27 p.m.
New subject: [OS-BUILD PATCHv4 19/19] redhat: Remove filter-i686.sh.rhel
From: Prarit Bhargava <prarit(a)redhat.com>
redhat: Remove filter-i686.sh.rhel
This file is no longer used and can be deleted.
Suggested by: Herton R. Krzesinski <herton(a)redhat.com>
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
diff --git a/redhat/rhel_files/filter-i686.sh.rhel
b/redhat/rhel_files/filter-i686.sh.rhel
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/rhel_files/filter-i686.sh.rhel
+++ /dev/null
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2021
634
days inactive
634
days old
kernel@lists.fedoraproject.org
18 comments
1 participants
participants (1)
-
Prarit Bhargava (via Email Bridge)