<div dir="ltr"><div class="gmail_default" style="font-family:monospace,monospace;font-size:small">Hi Ed,<br><br></div><div class="gmail_default" style="font-family:monospace,monospace;font-size:small">This patch was already tested, can be applied to krogoth?<br><br></div><div class="gmail_default" style="font-family:monospace,monospace;font-size:small">Regards,<br><br></div><div class="gmail_default" style="font-family:monospace,monospace;font-size:small">Fabio<br></div></div><div class="gmail_extra"><br><div class="gmail_quote">On Fri, Jul 1, 2016 at 5:05 AM, Ed Bartosh <span dir="ltr"><<a href="mailto:ed.bartosh@linux.intel.com" target="_blank">ed.bartosh@linux.intel.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Rawcopy plugin copies source files to build folder before using them<br>
to assemble result image. After assembling the image wic renames<br>
source files to <image>.p<partition number>. If the same source file<br>
is used in multiple partitions wic breaks trying to rename file that<br>
doesn't exist.<br>
<br>
Added <line number> suffix to the files when copying them to the<br>
build dir. This should make filename unique even if the same source<br>
file is used for multiple partitions.<br>
<br>
[YOCTO #9826]<br>
<br>
Signed-off-by: Ed Bartosh <<a href="mailto:ed.bartosh@linux.intel.com">ed.bartosh@linux.intel.com</a>><br>
---<br>
scripts/lib/wic/plugins/source/rawcopy.py | 2 +-<br>
1 file changed, 1 insertion(+), 1 deletion(-)<br>
<br>
diff --git a/scripts/lib/wic/plugins/source/rawcopy.py b/scripts/lib/wic/plugins/source/rawcopy.py<br>
index 0472f53..7ce0cc4 100644<br>
--- a/scripts/lib/wic/plugins/source/rawcopy.py<br>
+++ b/scripts/lib/wic/plugins/source/rawcopy.py<br>
@@ -67,7 +67,7 @@ class RawCopyPlugin(SourcePlugin):<br>
return<br>
<br>
src = os.path.join(bootimg_dir, source_params['file'])<br>
- dst = os.path.join(cr_workdir, source_params['file'])<br>
+ dst = os.path.join(cr_workdir, "%s.%s" % (source_params['file'], part.lineno))<br>
<br>
if 'skip' in source_params:<br>
dd_cmd = "dd if=%s of=%s ibs=%s skip=1 conv=notrunc" % \<br>
<span class="HOEnZb"><font color="#888888">--<br>
2.1.4<br>
<br>
--<br>
_______________________________________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org">Openembedded-core@lists.openembedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/mailman/listinfo/openembedded-core</a><br>
</font></span></blockquote></div><br></div>