From: Pierre-Jean Texier Date: Sat, 29 Feb 2020 20:38:02 +0000 (+0100) Subject: wic/engine: dump the partition table in JSON format only X-Git-Tag: 2020-04-dunfell~283 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=49e7f3e8e3a775510d8b0e2826a06d000934706b;p=openembedded-core.git wic/engine: dump the partition table in JSON format only since commit 03154d2cf25c1d5ce908da9e72d324004b8d5722 ("sfdisk: add -J between mutually exclusive options") in util-linux [1], the '-J' can't be used with the '-d' option anymore. So, since we're using json format output, drop the '-d' option. Fixes: ERROR: _exec_cmd: /usr/sbin/sfdisk -dJ /core-image-minimal-qemux86-64.wic returned '1' instead of 0 output: sfdisk: mutually exclusive arguments: --list-free --json --dump [1] - https://github.com/karelzak/util-linux/commit/03154d2cf25c1d5ce908da9e72d324004b8d5722#diff-31d5cc325380dbdafe64d0e019846f12 Signed-off-by: Pierre-Jean Texier Signed-off-by: Richard Purdie --- diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py index 24797511e5..83c42c9987 100644 --- a/scripts/lib/wic/engine.py +++ b/scripts/lib/wic/engine.py @@ -439,7 +439,7 @@ class Disk: outf.flush() def read_ptable(path): - out = exec_cmd("{} -dJ {}".format(self.sfdisk, path)) + out = exec_cmd("{} -J {}".format(self.sfdisk, path)) return json.loads(out) def write_ptable(parts, target):