summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2017-12-13 22:20:23 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-12-18 18:03:58 +0000
commitcce54f6a19e0fcc511d328aabca32af7d99b631b (patch)
tree13a96c9354414274ca4e5be5634d6cb716f71d91 /scripts
parentcc30969e9881df43c780ad30d4177957c04aec9f (diff)
downloadpoky-cce54f6a19e0fcc511d328aabca32af7d99b631b.tar.gz
wic: kparser.py: Check for SquashFS and use-uuid
The SquashFS filesystem does not support UUIDs so make this combination be an error. (From OE-Core rev: 2fbdcf4e59c835af0f4041bc34243decb42321ef) Signed-off-by: Tom Rini <trini@konsulko.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/wic/ksparser.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/scripts/lib/wic/ksparser.py b/scripts/lib/wic/ksparser.py
index 7850e81d2f..4fb6868531 100644
--- a/scripts/lib/wic/ksparser.py
+++ b/scripts/lib/wic/ksparser.py
@@ -195,6 +195,11 @@ class KickStart():
195 raise KickStartError('%s:%d: %s' % \ 195 raise KickStartError('%s:%d: %s' % \
196 (confpath, lineno, err)) 196 (confpath, lineno, err))
197 if line.startswith('part'): 197 if line.startswith('part'):
198 # SquashFS does not support UUID
199 if parsed.fstype == 'squashfs' and parsed.use_uuid:
200 err = "%s:%d: SquashFS does not support UUID" \
201 % (confpath, lineno)
202 raise KickStartError(err)
198 # using ArgumentParser one cannot easily tell if option 203 # using ArgumentParser one cannot easily tell if option
199 # was passed as argument, if said option has a default 204 # was passed as argument, if said option has a default
200 # value; --overhead-factor/--extra-space cannot be used 205 # value; --overhead-factor/--extra-space cannot be used