[gnome-continuous-yocto/gnomeostree-3.28-rocko: 8123/8267] wic: add 'part-name' argument for naming GPT partitions

[Emmanuele Bassi <ebassi src gnome org>]

commit 67094521712fa85138e216bb05876fd0c6161598
Author: Artur Mądrzak <artur madrzak eu>
Date:   Wed Nov 8 12:04:09 2017 +0100

    wic: add 'part-name' argument for naming GPT partitions
    
    The WIC's 'part' can now give a name for GPT partition in WKS file.
    It's similar to '--label', but is naming partintions instead file systems.
    It's required by some bootloaders to partitions have specified names.
    
    Backport from master, without it WIC cannot be used on Qualcomm based machines.
    
    (From OE-Core rev: 45aee3d57697f8dcc967120b5afd280d5ceadd21)
    
    Signed-off-by: Artur Mądrzak <artur madrzak eu>
    Signed-off-by: Nicolas Dechesne <nicolas dechesne linaro org>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>
    (cherry picked from commit 9b60e3466ed7cff0cea10815851eb1304002eb52)
    Signed-off-by: Armin Kuster <akuster808 gmail com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/lib/wic/help.py                  |    2 ++
 scripts/lib/wic/ksparser.py              |    1 +
 scripts/lib/wic/partition.py             |    1 +
 scripts/lib/wic/plugins/imager/direct.py |   11 +++++++++++
 4 files changed, 15 insertions(+), 0 deletions(-)
---
diff --git a/scripts/lib/wic/help.py b/scripts/lib/wic/help.py
index bd9c62e..2ac45e0 100644
--- a/scripts/lib/wic/help.py
+++ b/scripts/lib/wic/help.py
@@ -970,6 +970,8 @@ DESCRIPTION
                             This option cannot be used with --fixed-size
                             option.
 
+         --part-name: This option is specific to wic. It specifies name for GPT partitions.
+
          --part-type: This option is specific to wic. It specifies partition
                       type GUID for GPT partitions.
                       List of partition type GUIDS can be found here:
diff --git a/scripts/lib/wic/ksparser.py b/scripts/lib/wic/ksparser.py
index 99b66ee..7850e81 100644
--- a/scripts/lib/wic/ksparser.py
+++ b/scripts/lib/wic/ksparser.py
@@ -144,6 +144,7 @@ class KickStart():
         part.add_argument('--no-table', action='store_true')
         part.add_argument('--ondisk', '--ondrive', dest='disk', default='sda')
         part.add_argument("--overhead-factor", type=overheadtype)
+        part.add_argument('--part-name')
         part.add_argument('--part-type')
         part.add_argument('--rootfs-dir')
 
diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py
index b623bb9..66e61ba 100644
--- a/scripts/lib/wic/partition.py
+++ b/scripts/lib/wic/partition.py
@@ -51,6 +51,7 @@ class Partition():
         self.no_table = args.no_table
         self.num = None
         self.overhead_factor = args.overhead_factor
+        self.part_name = args.part_name
         self.part_type = args.part_type
         self.rootfs_dir = args.rootfs_dir
         self.size = args.size
diff --git a/scripts/lib/wic/plugins/imager/direct.py b/scripts/lib/wic/plugins/imager/direct.py
index 60317ee..bdb8385 100644
--- a/scripts/lib/wic/plugins/imager/direct.py
+++ b/scripts/lib/wic/plugins/imager/direct.py
@@ -366,6 +366,10 @@ class PartitionedImage():
         for num in range(len(self.partitions)):
             part = self.partitions[num]
 
+            if self.ptable_format == 'msdos' and part.part_name:
+                raise WicError("setting custom partition name is not " \
+                               "implemented for msdos partitions")
+
             if self.ptable_format == 'msdos' and part.part_type:
                 # The --part-type can also be implemented for MBR partitions,
                 # in which case it would map to the 1-byte "partition type"
@@ -519,6 +523,13 @@ class PartitionedImage():
             self._create_partition(self.path, part.type,
                                    parted_fs_type, part.start, part.size_sec)
 
+            if part.part_name:
+                logger.debug("partition %d: set name to %s",
+                             part.num, part.part_name)
+                exec_native_cmd("sgdisk --change-name=%d:%s %s" % \
+                                         (part.num, part.part_name,
+                                          self.path), self.native_sysroot)
+
             if part.part_type:
                 logger.debug("partition %d: set type UID to %s",
                              part.num, part.part_type)