support/scripts/check-bin-arch: fix after "fix for filenames with spaces"

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>
This commit is contained in:
Thomas Petazzoni 2017-03-22 21:43:54 +01:00
parent fb687f76a5
commit d5d642a43f

View File

@ -25,14 +25,14 @@ IFS="
while read f; do
# Skip firmware files, they could be ELF files for other
# architectures
if [[ "${f}" =~ ^\./(usr/)?lib/firmware/.* ]]; then
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
if [[ "${f}" =~ ^/usr/share/.* ]]; then
continue
fi