From: Tom Rini <trini@konsulko.com>
Date: Thu, 14 Dec 2017 03:20:23 +0000 (-0500)
Subject: wic: kparser.py: Check for SquashFS and use-uuid
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~19304
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2fbdcf4e59c835af0f4041bc34243decb42321ef;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

wic: kparser.py: Check for SquashFS and use-uuid

The SquashFS filesystem does not support UUIDs so make this combination
be an error.

Signed-off-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---

diff --git a/scripts/lib/wic/ksparser.py b/scripts/lib/wic/ksparser.py
index 7850e81d2f3..4fb6868531d 100644
--- a/scripts/lib/wic/ksparser.py
+++ b/scripts/lib/wic/ksparser.py
@@ -195,6 +195,11 @@ class KickStart():
                         raise KickStartError('%s:%d: %s' % \
                                              (confpath, lineno, err))
                     if line.startswith('part'):
+                        # SquashFS does not support UUID
+                        if parsed.fstype == 'squashfs' and parsed.use_uuid:
+                            err = "%s:%d: SquashFS does not support UUID" \
+                                  % (confpath, lineno)
+                            raise KickStartError(err)
                         # using ArgumentParser one cannot easily tell if option
                         # was passed as argument, if said option has a default
                         # value; --overhead-factor/--extra-space cannot be used