diff options
| author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2016-07-01 11:05:39 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-07-06 17:25:33 +0100 |
| commit | 6f7afd6f76c40e1b050e40bc4965cb5000df7088 (patch) | |
| tree | ad5e79ef1062e3d7cc6a61f49156dcdf20effc16 /scripts | |
| parent | 463909e876a66555d5df628591bace8cea0a6b0c (diff) | |
| download | openembedded-core-6f7afd6f76c40e1b050e40bc4965cb5000df7088.tar.gz openembedded-core-6f7afd6f76c40e1b050e40bc4965cb5000df7088.tar.bz2 openembedded-core-6f7afd6f76c40e1b050e40bc4965cb5000df7088.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: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/lib/wic/plugins/source/rawcopy.py | 2 |
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 0472f536ba..7ce0cc4154 100644 --- a/scripts/lib/wic/plugins/source/rawcopy.py +++ b/scripts/lib/wic/plugins/source/rawcopy.py @@ -67,7 +67,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: dd_cmd = "dd if=%s of=%s ibs=%s skip=1 conv=notrunc" % \ |