Re: [Buildroot] [PATCH] package/linux-tools: Exclude checking PE binaries from perf test

["Yann E. MORIN" <yann.morin.1998@free.fr>]

Florian, All,

On 2022-09-27 15:11 -0700, Florian Fainelli spake thusly:
> Since upstream Linux commit ed21d6d7c48e6e96c2d617e304a7ebfbd17b1807
> ("perf tests: Add test for PE binary format support") present in >=
> v5.10 there is an unconditional installation of PE binaries which will
> be rejected by the check-bin-arch script.
> 
> Make sure that these binaries are excluded from being checked to allow
> the installation of the perf tests.
> 
> Fixes: 6fcdaa4c5096 ("package/linux-tools: Allow installation of perf scripts")
> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>

I've finally applied to master, thanks.

However, I wonder if we could not be a bit more robust in check-bin-arch
itself, something like:

    diff --git a/support/scripts/check-bin-arch b/support/scripts/check-bin-arch
    index 27cc59bca0..2920a95ae3 100755
    --- a/support/scripts/check-bin-arch
    +++ b/support/scripts/check-bin-arch
    @@ -58,6 +58,9 @@ exitcode=0
     IFS="
     "
     
    +# ELF magic
    +ELF_MAGIC="$(printf "\x7f\x45\x4c\x46")"
    +
     while read f; do
     	for ignore in "${IGNORES[@]}"; do
     		if [[ "${f}" =~ ^"${ignore}" ]]; then
    @@ -71,13 +74,19 @@ while read f; do
     		continue
     	fi
     
    +	# Check if it looks like it is an ELF file
    +	read -N 4 magic <"${TARGET_DIR}/${f}"
    +	if [ "${magic}" != "${ELF_MAGIC}" ]; then
    +		continue
    +	fi
    +
     	# Get architecture using readelf. We pipe through 'head -1' so
     	# that when the file is a static library (.a), we only take
     	# into account the architecture of the first object file.
     	arch=$(LC_ALL=C ${readelf} -h "${TARGET_DIR}/${f}" 2>&1 | \
     		       sed -r -e '/^  Machine: +(.+)/!d; s//\1/;' | head -1)
     
    -# If no architecture found, assume it was not an ELF file
    +# If no architecture found, assume it was in fact not an ELF file
     	if test "${arch}" = "" ; then
     		continue
     	fi

(with the read -N 4 trick as discussed in [0])

Thoughts?

[0] https://lore.kernel.org/buildroot/10267_1663749711_632ACE4F_10267_83_8_20220921084149.GB2398274@tl-lnx-nyma7486/

Regards,
Yann E. MORIN.

> ---
>  package/linux-tools/linux-tool-perf.mk.in | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/package/linux-tools/linux-tool-perf.mk.in b/package/linux-tools/linux-tool-perf.mk.in
> index dda63cccecb4..c22097316264 100644
> --- a/package/linux-tools/linux-tool-perf.mk.in
> +++ b/package/linux-tools/linux-tool-perf.mk.in
> @@ -169,6 +169,10 @@ define PERF_INSTALL_REMOVE_SCRIPTS
>  	$(RM) -rf $(TARGET_DIR)/usr/libexec/perf-core/scripts/
>  	$(RM) -rf $(TARGET_DIR)/usr/libexec/perf-core/tests/
>  endef
> +
> +LINUX_TOOLS_BIN_ARCH_EXCLUDE += \
> +	/usr/libexec/perf-core/tests/pe-file.exe \
> +	/usr/libexec/perf-core/tests/pe-file.exe.debug
>  endif
>  
>  define PERF_INSTALL_TARGET_CMDS
> -- 
> 2.25.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot