diff options
| author | Pierre-Jean Texier <pjtexier@koncepto.io> | 2020-02-29 21:38:02 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-03-01 10:40:11 +0000 |
| commit | 0c8892fa1d097b303665acc328f74d09b9a72120 (patch) | |
| tree | f6bb5b99ceea8b0783d294f915eb69386ba83562 /scripts | |
| parent | 5a8d7be90aa2dc86447aededceb972e4a112b43a (diff) | |
| download | poky-0c8892fa1d097b303665acc328f74d09b9a72120.tar.gz | |
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: <snip>/usr/sbin/sfdisk -dJ <snip>/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
(From OE-Core rev: 49e7f3e8e3a775510d8b0e2826a06d000934706b)
Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/lib/wic/engine.py | 2 |
1 files changed, 1 insertions, 1 deletions
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: | |||
| 439 | outf.flush() | 439 | outf.flush() |
| 440 | 440 | ||
| 441 | def read_ptable(path): | 441 | def read_ptable(path): |
| 442 | out = exec_cmd("{} -dJ {}".format(self.sfdisk, path)) | 442 | out = exec_cmd("{} -J {}".format(self.sfdisk, path)) |
| 443 | return json.loads(out) | 443 | return json.loads(out) |
| 444 | 444 | ||
| 445 | def write_ptable(parts, target): | 445 | def write_ptable(parts, target): |