summaryrefslogtreecommitdiffstats
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:46:06 +0100
commitdd2f42352578bee8ad00f04c94faab9b0a7e18e2 (patch)
tree9e9a8f3ba2edee7d1e2b98bc5aaee6b229f18933
parent04292b815cb1fdad777e83bfcb65712609c946df (diff)
downloadpoky-dd2f42352578bee8ad00f04c94faab9b0a7e18e2.tar.gz
devtool: deploy-target: Don't use find -exec
find may be provided by busybox, which might be compiled without support for -exec. (From OE-Core rev: 404e8e3661469175e1ea087ebfaf3a7867bf4df2) Signed-off-by: Daniel Lublin <daniel@lublin.se> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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
119 # Put any preserved files back 119 # Put any preserved files back
120 lines.append('if [ -d $preservedir ] ; then') 120 lines.append('if [ -d $preservedir ] ; then')
121 lines.append(' cd $preservedir') 121 lines.append(' cd $preservedir')
122 lines.append(' find . -type f -exec mv {} /{} \;') 122 # find from busybox might not have -exec, so we don't use that
123 lines.append(' find . -type f | while read file')
124 lines.append(' do')
125 lines.append(' mv $file /$file')
126 lines.append(' done')
123 lines.append(' cd /') 127 lines.append(' cd /')
124 lines.append(' rm -rf $preservedir') 128 lines.append(' rm -rf $preservedir')
125 lines.append('fi') 129 lines.append('fi')