diff options
author | Stefan Stanacar <stefanx.stanacar@intel.com> | 2013-07-16 14:42:35 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-07-29 13:28:21 +0100 |
commit | 1b86653740722b1bd4133269b7efc67e85cf54ff (patch) | |
tree | e7082b45851e135c53cb2179da9db9e3dc6fe762 /meta | |
parent | d6d12689c0628f11a282c2b54ebcb8aa3ab8c673 (diff) | |
download | poky-1b86653740722b1bd4133269b7efc67e85cf54ff.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 master rev: 21b079e01873e2fb4d8674541e8c5818ba73554e)
(From OE-Core rev: 761cf78f12d60179684ae16e66008204f278561e)
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>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/populate_sdk_base.bbclass | 2 | ||||
-rwxr-xr-x | meta/recipes-devtools/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 6378af98a8..897159addc 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 |
256 | fi | 256 | fi |
257 | executable_files=$($SUDO_EXEC find $native_sysroot -type f -perm +111) | 257 | executable_files=$($SUDO_EXEC find $native_sysroot -type f -perm /111) |
258 | 258 | ||
259 | tdir=`mktemp -d` | 259 | tdir=`mktemp -d` |
260 | if [ x$tdir = x ] ; then | 260 | 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 | |||
203 | $SUDO chmod +x scripts/relocate_sdk_tmp.py | 203 | $SUDO chmod +x scripts/relocate_sdk_tmp.py |
204 | 204 | ||
205 | dl_path=$(find $OECORE_NATIVE_SYSROOT/lib -name "ld-linux*") | 205 | dl_path=$(find $OECORE_NATIVE_SYSROOT/lib -name "ld-linux*") |
206 | executable_files=$(find $OECORE_NATIVE_SYSROOT -type f -perm +111) | 206 | executable_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 |
209 | check_result | 209 | check_result |