summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Stanacar <stefanx.stanacar@intel.com>2013-07-16 14:42:35 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-07-18 21:23:45 +0100
commit8db36429ef328b97340ee1d9fc2e697cfdd68bff (patch)
tree7150e2525f8d6c8a6d51bfd79ede7e689b1534cd
parent16e1e1fa2dbb902c66e2a5a096ef272f20c28f97 (diff)
downloadpoky-8db36429ef328b97340ee1d9fc2e697cfdd68bff.tar.gz
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 <stefanx.stanacar@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/populate_sdk_base.bbclass2
-rwxr-xr-xmeta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal2
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
254 echo "SDK could not be set up. Relocate script unable to find ld-linux.so. Abort!" 254 echo "SDK could not be set up. Relocate script unable to find ld-linux.so. Abort!"
255 exit 1 255 exit 1
256fi 256fi
257executable_files=$($SUDO_EXEC find $native_sysroot -type f -perm +111) 257executable_files=$($SUDO_EXEC find $native_sysroot -type f -perm /111)
258 258
259tdir=`mktemp -d` 259tdir=`mktemp -d`
260if [ x$tdir = x ] ; then 260if [ 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
203$SUDO chmod +x scripts/relocate_sdk_tmp.py 203$SUDO chmod +x scripts/relocate_sdk_tmp.py
204 204
205dl_path=$(find $OECORE_NATIVE_SYSROOT/lib -name "ld-linux*") 205dl_path=$(find $OECORE_NATIVE_SYSROOT/lib -name "ld-linux*")
206executable_files=$(find $OECORE_NATIVE_SYSROOT -type f -perm +111) 206executable_files=$(find $OECORE_NATIVE_SYSROOT -type f -perm /111)
207 207
208$SUDO scripts/relocate_sdk_tmp.py $INSTALL_FOLDER $dl_path $executable_files 208$SUDO scripts/relocate_sdk_tmp.py $INSTALL_FOLDER $dl_path $executable_files
209check_result 209check_result