public inbox for linux-kbuild@vger.kernel.org
 help / color / mirror / Atom feed
From: Nathan Chancellor <nathan@kernel.org>
To: Lukas Herbolt <lukas@herbolt.com>
Cc: nsc@kernel.org, linux-kbuild@vger.kernel.org
Subject: Re: [PATCH] kbuild: rpm-pkg: Fix generating debuginfo manually.
Date: Thu, 12 Feb 2026 11:26:43 -0500	[thread overview]
Message-ID: <20260212162643.GB802926@ax162> (raw)
In-Reply-To: <20260212135855.147906-2-lukas@herbolt.com>

Hi Lukas,

Thanks for the patch!

On Thu, Feb 12, 2026 at 02:58:56PM +0100, Lukas Herbolt wrote:
> The ${OBJCOPY} and ${READELF} are not expanded into path to readelf
> and objcopy binary so just use the binary name with the %{_bindir}
> makro.
> 
> Signed-off-by: Lukas Herbolt <lukas@herbolt.com>
> ---
>  scripts/package/kernel.spec | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/scripts/package/kernel.spec b/scripts/package/kernel.spec
> index 0f1c8de1bd95..d032f6aff91b 100644
> --- a/scripts/package/kernel.spec
> +++ b/scripts/package/kernel.spec
> @@ -109,11 +109,11 @@ echo /usr/lib/debug/lib/modules/%{KERNELRELEASE}/vmlinux > %{buildroot}/debuginf
>  while read -r mod; do
>  	mod="${mod%.o}.ko"
>  	dbg="%{buildroot}/usr/lib/debug/lib/modules/%{KERNELRELEASE}/kernel/${mod}"
> -	buildid=$("${READELF}" -n "${mod}" | sed -n 's@^.*Build ID: \(..\)\(.*\)@\1/\2@p')
> +	buildid=$(%{_bindir}/eu-readelf -n "${mod}" | sed -n 's@^.*Build ID: \(..\)\(.*\)@\1/\2@p')

When using the binrpm-pkg target within Kbuild, I do see these expanded
to their Kbuild value:

  ++ .../toolchains/gcc/15.2.0/bin/x86_64-linux-readelf -n net/ipv6/netfilter/nf_reject_ipv6.ko
  ++ sed -n 's@^.*Build ID: \(..\)\(.*\)@\1/\2@p'

but I guess use of the spec file is not limited to being within Kbuild?
How are you using it? I guess using the srcrpm-pkg and building it
manually?

I would prefer to keep use of these variables so that the user's choice
of toolchain is properly respected. The proper way to fix this is likely
using a fallback only when the variable is not defined. Does this work
for your usecase?

diff --git a/scripts/package/kernel.spec b/scripts/package/kernel.spec
index 0f1c8de1bd95..c23ff98f63ed 100644
--- a/scripts/package/kernel.spec
+++ b/scripts/package/kernel.spec
@@ -109,11 +109,11 @@ echo /usr/lib/debug/lib/modules/%{KERNELRELEASE}/vmlinux > %{buildroot}/debuginf
 while read -r mod; do
 	mod="${mod%.o}.ko"
 	dbg="%{buildroot}/usr/lib/debug/lib/modules/%{KERNELRELEASE}/kernel/${mod}"
-	buildid=$("${READELF}" -n "${mod}" | sed -n 's@^.*Build ID: \(..\)\(.*\)@\1/\2@p')
+	buildid=$("${READELF:-readelf}" -n "${mod}" | sed -n 's@^.*Build ID: \(..\)\(.*\)@\1/\2@p')
 	link="%{buildroot}/usr/lib/debug/.build-id/${buildid}.debug"
 
 	mkdir -p "${dbg%/*}" "${link%/*}"
-	"${OBJCOPY}" --only-keep-debug "${mod}" "${dbg}"
+	"${OBJCOPY:-objcopy}" --only-keep-debug "${mod}" "${dbg}"
 	ln -sf --relative "${dbg}" "${link}"
 
 	echo "${dbg#%{buildroot}}" >> %{buildroot}/debuginfo.list

  reply	other threads:[~2026-02-12 16:26 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-02-12 13:58 [PATCH] kbuild: rpm-pkg: Fix generating debuginfo manually Lukas Herbolt
2026-02-12 16:26 ` Nathan Chancellor [this message]
2026-02-12 19:28   ` Lukas Herbolt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260212162643.GB802926@ax162 \
    --to=nathan@kernel.org \
    --cc=linux-kbuild@vger.kernel.org \
    --cc=lukas@herbolt.com \
    --cc=nsc@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox