summaryrefslogtreecommitdiffstats
path: root/scripts
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 09:08:18 +0000
commitb3d7793ccd90c724db2c96016956102907b9e89f (patch)
tree275dc4945ba2a2b26c5dfb709c652809552800d9 /scripts
parent4094715887a4200c1fe414fa8de505d77eb57f3b (diff)
downloadpoky-b3d7793ccd90c724db2c96016956102907b9e89f.tar.gz
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'. (From OE-Core rev: 759a37e315d72e462a617f1cda326b8f198e3d4e) 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> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-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):
541 """ 541 """
542 Write image to a target device. 542 Write image to a target device.
543 """ 543 """
544 disk = Disk(args.image, native_sysroot, ('fat', 'ext', 'swap')) 544 disk = Disk(args.image, native_sysroot, ('fat', 'ext', 'linux-swap'))
545 disk.write(args.target, args.expand) 545 disk.write(args.target, args.expand)
546 546
547def find_canned(scripts_path, file_name): 547def find_canned(scripts_path, file_name):