diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-04-03 12:52:48 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-04-03 14:50:14 +0100 |
commit | 904873381133d631e44640cd5e303b9352bd7f29 (patch) | |
tree | 01a741990f7bbf5730894d429c5b7870ae6c1eb6 /scripts | |
parent | 29edc44efabf605c4ba1d7a5ca34d1a574e0e016 (diff) | |
download | poky-904873381133d631e44640cd5e303b9352bd7f29.tar.gz |
wic/engine: Add missing newline
On some hosts the wic.Wic2.test_wic_cp_ext selftest was failing as files weren't
being copied into the rootfs with "wic cp". This was due to a bug added by:
http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=89d4a8df074598cfb3a76e41db7c45d845afd961
where there should be a second newline added at the end of the expression due
to the difference in the way echo -e and printf behave.
[YOCTO #13237]
(From OE-Core rev: 2f3adb21cc5067458a12964d0bde235966a20a60)
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 ea600d2854..ab33fa6042 100644 --- a/scripts/lib/wic/engine.py +++ b/scripts/lib/wic/engine.py | |||
@@ -338,7 +338,7 @@ class Disk: | |||
338 | def copy(self, src, pnum, path): | 338 | def copy(self, src, pnum, path): |
339 | """Copy partition image into wic image.""" | 339 | """Copy partition image into wic image.""" |
340 | if self.partitions[pnum].fstype.startswith('ext'): | 340 | if self.partitions[pnum].fstype.startswith('ext'): |
341 | cmd = "printf 'cd {}\nwrite {} {}' | {} -w {}".\ | 341 | cmd = "printf 'cd {}\nwrite {} {}\n' | {} -w {}".\ |
342 | format(path, src, os.path.basename(src), | 342 | format(path, src, os.path.basename(src), |
343 | self.debugfs, self._get_part_image(pnum)) | 343 | self.debugfs, self._get_part_image(pnum)) |
344 | else: # fat | 344 | else: # fat |