summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChee Yang Lee <chee.yang.lee@intel.com>2019-10-22 13:27:06 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-10-29 08:20:37 +0000
commit759a37e315d72e462a617f1cda326b8f198e3d4e (patch)
tree8bcf044e0d0ba3707dc3cbce525f687aff891b52
parentdba4cc01463c2edad29f6f8c854b298255cc7562 (diff)
downloadopenembedded-core-759a37e315d72e462a617f1cda326b8f198e3d4e.tar.gz
openembedded-core-759a37e315d72e462a617f1cda326b8f198e3d4e.tar.bz2
openembedded-core-759a37e315d72e462a617f1cda326b8f198e3d4e.zip
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@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 7e6da22fe4faf841bcec02e55f376b4dae04d6a8) Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--scripts/lib/wic/engine.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py
index 61939ad194..18776fa8a0 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):