[gnome-continuous-yocto/gnomeostree-3.28-rocko: 6291/8267] bootimg-pcbios: make boot image file unique

[Emmanuele Bassi <ebassi src gnome org>]

commit 479c6a85af2a8572f807fdd12c842880fec8b78c
Author: Ed Bartosh <ed bartosh linux intel com>
Date:   Tue Jun 13 14:21:52 2017 +0300

    bootimg-pcbios: make boot image file unique
    
    Plugin code uses boot.img file name for an image file. If there are
    two partitions that use bootimg-pcbios wic breaks with an error
    "file already exists: boot.img"
    
    Made image file name unique by adding wks like number to it to fix
    the issue.
    
    (From OE-Core rev: eec6e946cce36cba304851fa4a1c1d7bfd7b0bed)
    
    Signed-off-by: Ed Bartosh <ed bartosh linux intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/lib/wic/plugins/source/bootimg-pcbios.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/scripts/lib/wic/plugins/source/bootimg-pcbios.py 
b/scripts/lib/wic/plugins/source/bootimg-pcbios.py
index 5890c12..98ad88b 100644
--- a/scripts/lib/wic/plugins/source/bootimg-pcbios.py
+++ b/scripts/lib/wic/plugins/source/bootimg-pcbios.py
@@ -186,7 +186,7 @@ class BootimgPcbiosPlugin(SourcePlugin):
                      extra_blocks, part.mountpoint, blocks)
 
         # dosfs image, created by mkdosfs
-        bootimg = "%s/boot.img" % cr_workdir
+        bootimg = "%s/boot%s.img" % (cr_workdir, part.lineno)
 
         dosfs_cmd = "mkdosfs -n boot -S 512 -C %s %d" % (bootimg, blocks)
         exec_native_cmd(dosfs_cmd, native_sysroot)