[gnome-continuous-yocto/gnomeostree-3.28-rocko: 6074/8267] devtool: deploy-target: Don't use find -exec

[Emmanuele Bassi <ebassi src gnome org>]

commit dd2f42352578bee8ad00f04c94faab9b0a7e18e2
Author: Daniel Lublin <daniel lublin se>
Date:   Wed May 31 08:02:20 2017 +0200

    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>

 scripts/lib/devtool/deploy.py |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/scripts/lib/devtool/deploy.py b/scripts/lib/devtool/deploy.py
index b3730ae..d181135 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')