mirror of
https://github.com/torvalds/linux.git
synced 2026-03-08 03:24:45 +01:00
6d6b8b0e28
Commit62089b8048("kbuild: rpm-pkg: Generate debuginfo package manually") moved away from the built-in RPM machinery for generating -debuginfo packages to a more manual way to be compatible with module signing, as the built-in machinery strips the modules after the installation process, breaking the signatures. Unfortunately, prior to rpm 4.20.0, there is a bug where a custom %files directive is ignored for a -debuginfo subpackage [1], meaning builds using older versions of RPM (such as on RHEL9 or RHEL10) fail with: Checking for unpackaged file(s): /usr/lib/rpm/check-files .../rpmbuild/BUILDROOT/kernel-6.19.0_dirty-1.x86_64 error: Installed (but unpackaged) file(s) found: /debuginfo.list /usr/lib/debug/.build-id/09/748c214974bfba1522d434a7e0a02e2fd7f29b.debug /usr/lib/debug/.build-id/0b/b96dd9c7d3689d82e56d2e73b46f53103cc6c7.debug /usr/lib/debug/.build-id/0e/979a2f34967c7437fd30aabb41de1f0c8b6a66.debug ... To workaround this, restrict the manual debug info package creation process to when it is necessary (CONFIG_MODULE_SIG=y) and possible (when using RPM >= 4.20.0). A follow up change will restore the RPM debuginfo creation process using a separate internal flag to allow the package to be built in more situations, as RPM 4.20.0 is a fairly recent version and the built-in -debuginfo generation works fine when module signing is disabled. Cc: stable@vger.kernel.org Fixes:62089b8048("kbuild: rpm-pkg: Generate debuginfo package manually") Link:49f906998f[1] Reported-by: Steve French <smfrench@gmail.com> Closes: https://lore.kernel.org/CAH2r5mugbrHTwnaQwQiYEUVwbtqmvFYf0WZiLrrJWpgT8iwftw@mail.gmail.com/ Tested-by: Stefano Garzarella <sgarzare@redhat.com> Tested-by: Steve French <stfrench@microsoft.com> Tested-by: Juergen Gross <jgross@suse.com> Acked-by: Nicolas Schier <nsc@kernel.org> Link: https://patch.msgid.link/20260210-kbuild-fix-debuginfo-rpm-v1-1-0730b92b14bc@kernel.org Signed-off-by: Nathan Chancellor <nathan@kernel.org>
92 lines
2.8 KiB
Bash
Executable file
92 lines
2.8 KiB
Bash
Executable file
#!/bin/sh
|
|
#
|
|
# Output a simple RPM spec file.
|
|
# This version assumes a minimum of RPM 4.13
|
|
#
|
|
# The only gothic bit here is redefining install_post to avoid
|
|
# stripping the symbols from files in the kernel which we want
|
|
#
|
|
# Patched for non-x86 by Opencon (L) 2002 <opencon@rio.skydome.net>
|
|
#
|
|
|
|
set -eu
|
|
|
|
output=$1
|
|
|
|
mkdir -p "$(dirname "${output}")"
|
|
|
|
exec >"${output}"
|
|
|
|
if grep -q CONFIG_MODULES=y include/config/auto.conf; then
|
|
echo '%define with_devel %{?_without_devel: 0} %{?!_without_devel: 1}'
|
|
else
|
|
echo '%define with_devel 0'
|
|
fi
|
|
|
|
# manually generate -debuginfo package
|
|
with_debuginfo_manual=0
|
|
# debuginfo package generation uses find-debuginfo.sh under the hood,
|
|
# which only works on uncompressed modules that contain debuginfo
|
|
if grep -q CONFIG_DEBUG_INFO=y include/config/auto.conf &&
|
|
(! grep -q CONFIG_MODULE_COMPRESS=y include/config/auto.conf) &&
|
|
(! grep -q CONFIG_DEBUG_INFO_SPLIT=y include/config/auto.conf); then
|
|
# If module signing is enabled (which may be required to boot with
|
|
# lockdown enabled), the find-debuginfo.sh machinery cannot be used
|
|
# because the signatures will be stripped off the modules. However, due
|
|
# to an rpm bug in versions prior to 4.20.0
|
|
#
|
|
# https://github.com/rpm-software-management/rpm/issues/3057
|
|
# https://github.com/rpm-software-management/rpm/commit/49f906998f3cf1f4152162ca61ac0869251c380f
|
|
#
|
|
# We cannot provide our own debuginfo package because it does not listen
|
|
# to our custom files list, failing the build due to unpackaged files.
|
|
# Manually generate the debug info package if using rpm 4.20.0. If not
|
|
# using rpm 4.20.0, avoid generating a -debuginfo package altogether,
|
|
# as it is not safe.
|
|
if grep -q CONFIG_MODULE_SIG=y include/config/auto.conf; then
|
|
rpm_ver_str=$(rpm --version 2>/dev/null)
|
|
# Split the version on spaces
|
|
IFS=' '
|
|
set -- $rpm_ver_str
|
|
if [ "${1:-}" = RPM -a "${2:-}" = version ]; then
|
|
IFS=.
|
|
set -- $3
|
|
rpm_ver=$(( 1000000 * $1 + 10000 * $2 + 100 * $3 + ${4:-0} ))
|
|
if [ "$rpm_ver" -ge 4200000 ]; then
|
|
with_debuginfo_manual='%{?_without_debuginfo:0}%{?!_without_debuginfo:1}'
|
|
fi
|
|
fi
|
|
fi
|
|
fi
|
|
echo "%define with_debuginfo_manual $with_debuginfo_manual"
|
|
|
|
cat<<EOF
|
|
%define ARCH ${ARCH}
|
|
%define KERNELRELEASE ${KERNELRELEASE}
|
|
%define pkg_release $("${srctree}/scripts/build-version")
|
|
EOF
|
|
|
|
cat "${srctree}/scripts/package/kernel.spec"
|
|
|
|
# collect the user's name and email address for the changelog entry
|
|
if [ "$(command -v git)" ]; then
|
|
name=$(git config user.name) || true
|
|
email=$(git config user.email) || true
|
|
fi
|
|
|
|
if [ ! "${name:+set}" ]; then
|
|
name=${KBUILD_BUILD_USER:-$(id -nu)}
|
|
fi
|
|
|
|
if [ ! "${email:+set}" ]; then
|
|
buildhost=${KBUILD_BUILD_HOST:-$(hostname -f 2>/dev/null || hostname)}
|
|
builduser=${KBUILD_BUILD_USER:-$(id -nu)}
|
|
email="${builduser}@${buildhost}"
|
|
fi
|
|
|
|
cat << EOF
|
|
|
|
%changelog
|
|
* $(LC_ALL=C date +'%a %b %d %Y') ${name} <${email}>
|
|
- Custom built Linux kernel.
|
|
EOF
|