summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2016-06-30 19:29:18 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-07-21 07:45:01 +0100
commit43a809bfe99024083b4ab4eb9895b084c9c4fa80 (patch)
tree209e7e82c0552b3b3537f41ba0fe8042b224f91a
parenta343788b11f6c4f92ae8d2035fe8cb54f922227e (diff)
downloadopenembedded-core-contrib-43a809bfe99024083b4ab4eb9895b084c9c4fa80.tar.gz
openembedded-core-contrib-43a809bfe99024083b4ab4eb9895b084c9c4fa80.tar.bz2
openembedded-core-contrib-43a809bfe99024083b4ab4eb9895b084c9c4fa80.zip
wic: rawcopy: make source filenames unique
Rawcopy plugin copies source files to build folder before using them to assemble result image. After assembling the image wic renames source files to <image>.p<partition number>. If the same source file is used in multiple partitions wic breaks trying to rename file that doesn't exist. Added <line number> suffix to the files when copying them to the build dir. This should make filename unique even if the same source file is used for multiple partitions. [YOCTO #9826] Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--scripts/lib/wic/plugins/source/rawcopy.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/lib/wic/plugins/source/rawcopy.py b/scripts/lib/wic/plugins/source/rawcopy.py
index ba014b0714..e0b11f95ad 100644
--- a/scripts/lib/wic/plugins/source/rawcopy.py
+++ b/scripts/lib/wic/plugins/source/rawcopy.py
@@ -68,7 +68,7 @@ class RawCopyPlugin(SourcePlugin):
return
src = os.path.join(bootimg_dir, source_params['file'])
- dst = os.path.join(cr_workdir, source_params['file'])
+ dst = os.path.join(cr_workdir, "%s.%s" % (source_params['file'], part.lineno))
if 'skip' in source_params:
sparse_copy(src, dst, skip=source_params['skip'])