]> code.ossystems Code Review - openembedded-core.git/commitdiff
binconfig: only try to mangles files
authorRoss Burton <ross.burton@intel.com>
Fri, 30 Nov 2018 10:40:38 +0000 (10:40 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sat, 1 Dec 2018 11:37:49 +0000 (11:37 +0000)
If a file matches the glob that is an absolute symlink then sed will try to
alter files on the host, so restrict the search to just actual files.

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/classes/binconfig.bbclass

index 39c3e2b17bbf5fa91fd24cd955342dbaad6385b9..133b9537cf0d504cf4c178a288f9e6a8a2e3c1f3 100644 (file)
@@ -31,7 +31,7 @@ BINCONFIG_GLOB ?= "*-config"
 PACKAGE_PREPROCESS_FUNCS += "binconfig_package_preprocess"
 
 binconfig_package_preprocess () {
-       for config in `find ${PKGD} -name '${BINCONFIG_GLOB}'`; do
+       for config in `find ${PKGD} -type f -name '${BINCONFIG_GLOB}'`; do
                sed -i \
                    -e 's:${STAGING_BASELIBDIR}:${base_libdir}:g;' \
                    -e 's:${STAGING_LIBDIR}:${libdir}:g;' \
@@ -40,7 +40,7 @@ binconfig_package_preprocess () {
                    -e 's:${STAGING_DIR_HOST}${prefix}:${prefix}:' \
                     $config
        done
-       for lafile in `find ${PKGD} -name "*.la"` ; do
+       for lafile in `find ${PKGD} -type f -name "*.la"` ; do
                sed -i \
                    -e 's:${STAGING_BASELIBDIR}:${base_libdir}:g;' \
                    -e 's:${STAGING_LIBDIR}:${libdir}:g;' \
@@ -54,7 +54,7 @@ binconfig_package_preprocess () {
 SYSROOT_PREPROCESS_FUNCS += "binconfig_sysroot_preprocess"
 
 binconfig_sysroot_preprocess () {
-       for config in `find ${S} -name '${BINCONFIG_GLOB}'` `find ${B} -name '${BINCONFIG_GLOB}'`; do
+       for config in `find ${S} -type f -name '${BINCONFIG_GLOB}'` `find ${B} -type f -name '${BINCONFIG_GLOB}'`; do
                configname=`basename $config`
                install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}
                sed ${@get_binconfig_mangle(d)} $config > ${SYSROOT_DESTDIR}${bindir_crossscripts}/$configname