[gnome-continuous-yocto/gnomeostree-3.28-rocko: 1475/8267] wic: rawcopy: make source filenames unique

[Emmanuele Bassi <ebassi src gnome org>]

commit 2d5b282957680828dab15dc00c33056e6011f4e0
Author: Ed Bartosh <ed bartosh linux intel com>
Date:   Thu Jun 30 19:29:18 2016 +0300

    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]
    
    (From OE-Core rev: 43a809bfe99024083b4ab4eb9895b084c9c4fa80)
    
    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>

 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 ba014b0..e0b11f9 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'])