d5d642a43f
In commit 2f6c5e513c
("support/check-bin-arch: fix for filenames with spaces"), Yann
adjuste the check-bin-arch script to properly handle filenames with
spaces.
However, he also did a subtle change of the regexp that extracts the
path of the files. It was:
"/^${package},(.+)$/!d; s//\1/;"
and Yann changed it to:
"/^${package},\.(.+)$/!d; s//\1/;"
So the file paths used to start with a dot (like "./usr/share/foo"),
and now they no longer start with a dot (like "/usr/share/foo"). While
this modification is good and makes sense, the match for
/lib/firmware/ was not adjusted accordingly, and the follow-up patch
also ignoring /usr/share was not adjusted as well.
This commit fixes those /lib/firmware/ and /usr/share/ special cases,
which will fix:
http://autobuild.buildroot.net/results/76a1475f4cdedb80426fb022ef2e644aa5625660/
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
62 lines
1.6 KiB
Bash
Executable File
62 lines
1.6 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
while getopts p:l:r:a: OPT ; do
|
|
case "${OPT}" in
|
|
p) package="${OPTARG}";;
|
|
l) pkg_list="${OPTARG}";;
|
|
r) readelf="${OPTARG}";;
|
|
a) arch_name="${OPTARG}";;
|
|
:) error "option '%s' expects a mandatory argument\n" "${OPTARG}";;
|
|
\?) error "unknown option '%s'\n" "${OPTARG}";;
|
|
esac
|
|
done
|
|
|
|
if test -z "${package}" -o -z "${pkg_list}" -o -z "${readelf}" -o -z "${arch_name}" ; then
|
|
echo "Usage: $0 -p <pkg> -l <pkg-file-list> -r <readelf> -a <arch name>"
|
|
exit 1
|
|
fi
|
|
|
|
exitcode=0
|
|
|
|
# Only split on new lines, for filenames-with-spaces
|
|
IFS="
|
|
"
|
|
|
|
while read f; do
|
|
# Skip firmware files, they could be ELF files for other
|
|
# architectures
|
|
if [[ "${f}" =~ ^/(usr/)?lib/firmware/.* ]]; then
|
|
continue
|
|
fi
|
|
|
|
# Skip files in /usr/share, several packages (qemu,
|
|
# pru-software-support) legitimately install ELF binaries that
|
|
# are not for the target architecture
|
|
if [[ "${f}" =~ ^/usr/share/.* ]]; 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 test "${arch}" = "" ; then
|
|
continue
|
|
fi
|
|
|
|
# Architecture is correct
|
|
if test "${arch}" = "${arch_name}" ; then
|
|
continue
|
|
fi
|
|
|
|
printf 'ERROR: architecture for "%s" is "%s", should be "%s"\n' \
|
|
"${f}" "${arch}" "${arch_name}"
|
|
|
|
exitcode=1
|
|
done < <( sed -r -e "/^${package},\.(.+)$/!d; s//\1/;" ${pkg_list} )
|
|
|
|
exit ${exitcode}
|