[oe-commits] [openembedded-core] 26/27: wic/engine: use 'linux-swap' for swap file system

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch zeus
in repository openembedded-core.

commit 759a37e315d72e462a617f1cda326b8f198e3d4e
Author: Chee Yang Lee <chee.yang.lee at intel.com>
AuthorDate: Tue Oct 22 13:27:06 2019 +0800

    wic/engine: use 'linux-swap' for swap file system
    
    [YOCTO #13312]
    see https://bugzilla.yoctoproject.org/show_bug.cgi?id=13312
    
    wic/engine.Disk._get_part_image was looking at variable fstypes for
    supported fstype which is 'swap' but image build with 'linux-swap'.
    supported fstype should be 'linux-swap'.
    
    Signed-off-by: Chee Yang Lee <chee.yang.lee at intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
    (cherry picked from commit 7e6da22fe4faf841bcec02e55f376b4dae04d6a8)
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 scripts/lib/wic/engine.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py
index 61939ad1..18776fa 100644
--- a/scripts/lib/wic/engine.py
+++ b/scripts/lib/wic/engine.py
@@ -541,7 +541,7 @@ def wic_write(args, native_sysroot):
     """
     Write image to a target device.
     """
-    disk = Disk(args.image, native_sysroot, ('fat', 'ext', 'swap'))
+    disk = Disk(args.image, native_sysroot, ('fat', 'ext', 'linux-swap'))
     disk.write(args.target, args.expand)
 
 def find_canned(scripts_path, file_name):

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.