From 33c52b1f2d39feb641465bf42e8b16d0ab22a316 Mon Sep 17 00:00:00 2001 From: Noor Ahsan Date: Wed, 23 Dec 2015 15:50:35 +0200 Subject: wic: rawcopy: Copy source file to build folder When a file is given using --sourceparams then wic directly use that file instead of copying them to build folder. At time of assembling it os.rename is called which renames all the files to name. In that process the original file is renamed. When image recipe is rebuilt then wic complains about missing file which was renamed in previous build. [YOCTO #8854] Signed-off-by: Ed Bartosh Signed-off-by: Ross Burton --- scripts/lib/wic/plugins/source/rawcopy.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/lib/wic/plugins/source/rawcopy.py b/scripts/lib/wic/plugins/source/rawcopy.py index f0691baa91..0472f536ba 100644 --- a/scripts/lib/wic/plugins/source/rawcopy.py +++ b/scripts/lib/wic/plugins/source/rawcopy.py @@ -67,13 +67,14 @@ class RawCopyPlugin(SourcePlugin): return src = os.path.join(bootimg_dir, source_params['file']) - dst = src + dst = os.path.join(cr_workdir, source_params['file']) if 'skip' in source_params: - dst = os.path.join(cr_workdir, source_params['file']) dd_cmd = "dd if=%s of=%s ibs=%s skip=1 conv=notrunc" % \ (src, dst, source_params['skip']) - exec_cmd(dd_cmd) + else: + dd_cmd = "cp %s %s" % (src, dst) + exec_cmd(dd_cmd) # get the size in the right units for kickstart (kB) du_cmd = "du -Lbks %s" % dst -- cgit 1.2.3-korg