[Buildroot] [git commit branch/2022.02.x] support/scripts: handle paths with regex characters in per-package
Peter Korsgaard
peter at korsgaard.com
Tue Jun 7 14:03:39 UTC 2022
commit: https://git.buildroot.net/buildroot/commit/?id=cc6b902095c5ea847265dc408265ed87a7a05dd4
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x
Some constraints on a setup ended up with a plus sign in the path
for historical reasons and would then fail to match on the comparison
of the host/lib dir match. So, the =~ for bash can be augmented
with a double quote expansion to preserve the literal value of
the characters in the variable.
Example Path: /home/vagrant/test+buildroot/per-package
Signed-off-by: Charles Hardin <ckhardin at gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998 at free.fr>
(cherry picked from commit 2a9ef1f5721990322b6965e00b7f099239d7ad23)
Signed-off-by: Peter Korsgaard <peter at korsgaard.com>
---
support/scripts/check-host-rpath | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/support/scripts/check-host-rpath b/support/scripts/check-host-rpath
index 9a3866982b..b27cb883f3 100755
--- a/support/scripts/check-host-rpath
+++ b/support/scripts/check-host-rpath
@@ -98,7 +98,7 @@ check_elf_has_rpath() {
# PER_PACKAGE_DIR and therefore ${perpackagedir} points to
# a non-existent directory, and this check will always be
# false.
- [[ ${dir} =~ ${perpackagedir}/[^/]+/host/lib ]] && return 0
+ [[ ${dir} =~ "${perpackagedir}/"[^/]+/host/lib ]] && return 0
done
done < <( readelf -d "${file}" \
|sed -r -e '/.* \(R(UN)?PATH\) +Library r(un)?path: \[(.+)\]$/!d' \
More information about the buildroot
mailing list