From 8db36429ef328b97340ee1d9fc2e697cfdd68bff Mon Sep 17 00:00:00 2001 From: Stefan Stanacar Date: Tue, 16 Jul 2013 14:42:35 +0300 Subject: populate_sdk_base.bbclass: use new perm option for find Old way find -perm +mode is no longer supported in newer versions of find (Fedora 19). Man page says: -perm +mode This is no longer supported (and has been deprecated since 2005). Use -perm /mode instead. [YOCTO #4853] (From OE-Core rev: 21b079e01873e2fb4d8674541e8c5818ba73554e) Signed-off-by: Stefan Stanacar Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/classes/populate_sdk_base.bbclass | 2 +- .../installer/adt-installer/scripts/adt_installer_internal | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass index 30c1d29a28..aa3c2fa9fd 100644 --- a/meta/classes/populate_sdk_base.bbclass +++ b/meta/classes/populate_sdk_base.bbclass @@ -254,7 +254,7 @@ if [ "$dl_path" = "" ] ; then echo "SDK could not be set up. Relocate script unable to find ld-linux.so. Abort!" exit 1 fi -executable_files=$($SUDO_EXEC find $native_sysroot -type f -perm +111) +executable_files=$($SUDO_EXEC find $native_sysroot -type f -perm /111) tdir=`mktemp -d` if [ x$tdir = x ] ; then diff --git a/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal b/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal index 175d285f4a..065bcc7dad 100755 --- a/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal +++ b/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal @@ -203,7 +203,7 @@ $SUDO sh -c "sed -e '"s:##DEFAULT_INSTALL_DIR##:$escaped_sdkpath:"' scripts/relo $SUDO chmod +x scripts/relocate_sdk_tmp.py dl_path=$(find $OECORE_NATIVE_SYSROOT/lib -name "ld-linux*") -executable_files=$(find $OECORE_NATIVE_SYSROOT -type f -perm +111) +executable_files=$(find $OECORE_NATIVE_SYSROOT -type f -perm /111) $SUDO scripts/relocate_sdk_tmp.py $INSTALL_FOLDER $dl_path $executable_files check_result -- cgit v1.2.3-54-g00ecf