aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Lublin <daniel@lublin.se>2017-05-31 08:02:20 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-03 23:43:27 +0100
commit404e8e3661469175e1ea087ebfaf3a7867bf4df2 (patch)
tree0c48c35ee2142081e7fd29173bb5b0db49d00459
parentb49a4a47783609fe9161fbc11cc7c7ff3ff4b6bb (diff)
downloadopenembedded-core-404e8e3661469175e1ea087ebfaf3a7867bf4df2.tar.gz
openembedded-core-404e8e3661469175e1ea087ebfaf3a7867bf4df2.tar.bz2
openembedded-core-404e8e3661469175e1ea087ebfaf3a7867bf4df2.zip
devtool: deploy-target: Don't use find -exec
find may be provided by busybox, which might be compiled without support for -exec. Signed-off-by: Daniel Lublin <daniel@lublin.se> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--scripts/lib/devtool/deploy.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/lib/devtool/deploy.py b/scripts/lib/devtool/deploy.py
index b3730ae833..d181135a9d 100644
--- a/scripts/lib/devtool/deploy.py
+++ b/scripts/lib/devtool/deploy.py
@@ -119,7 +119,11 @@ def _prepare_remote_script(deploy, verbose=False, dryrun=False, undeployall=Fals
# Put any preserved files back
lines.append('if [ -d $preservedir ] ; then')
lines.append(' cd $preservedir')
- lines.append(' find . -type f -exec mv {} /{} \;')
+ # find from busybox might not have -exec, so we don't use that
+ lines.append(' find . -type f | while read file')
+ lines.append(' do')
+ lines.append(' mv $file /$file')
+ lines.append(' done')
lines.append(' cd /')
lines.append(' rm -rf $preservedir')
lines.append('fi')