From eea30774b452cd7901b8eb2a61b437731c7a2718 Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Fri, 1 Jul 2016 11:05:39 +0300 Subject: 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 .p. If the same source file is used in multiple partitions wic breaks trying to rename file that doesn't exist. Added 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] (From OE-Core rev: 6f7afd6f76c40e1b050e40bc4965cb5000df7088) Signed-off-by: Ed Bartosh Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie --- scripts/lib/wic/plugins/source/rawcopy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') 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" % \ -- cgit v1.2.3-54-g00ecf