summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorDaniel Schultz <d.schultz@phytec.de>2017-03-07 14:41:56 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-05-18 13:04:44 +0100
commite29deac69ed29226b68001db2fcfb3ed24c0568a (patch)
tree772b1979062f27c105f99a293e821247b158e0dd /scripts
parent313d977fdfe571ad6edf65c6ed20bbb0110dc320 (diff)
downloadopenembedded-core-contrib-e29deac69ed29226b68001db2fcfb3ed24c0568a.tar.gz
openembedded-core-contrib-e29deac69ed29226b68001db2fcfb3ed24c0568a.tar.bz2
openembedded-core-contrib-e29deac69ed29226b68001db2fcfb3ed24c0568a.zip
wic: filemap: Fixed spared_copy skip
This patches removes the empty space in front of the copied file which was skipped. Without this reduction it's not possible to place a partition with rawcopy and skip parameter on a desired alignment. Signed-off-by: Daniel Schultz <d.schultz@phytec.de> Signed-off-by: Ross Burton <ross.burton@intel.com> (cherry picked from commit 5c024d71f9413b81ee1707dbc41f0721f8f27bdb) Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/wic/filemap.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/lib/wic/filemap.py b/scripts/lib/wic/filemap.py
index f3240ba8d8..162603ed0a 100644
--- a/scripts/lib/wic/filemap.py
+++ b/scripts/lib/wic/filemap.py
@@ -543,9 +543,9 @@ def sparse_copy(src_fname, dst_fname, offset=0, skip=0):
end = (last + 1) * fmap.block_size
if start < skip < end:
- start = skip
-
- fmap._f_image.seek(start, os.SEEK_SET)
+ fmap._f_image.seek(skip, os.SEEK_SET)
+ else:
+ fmap._f_image.seek(start, os.SEEK_SET)
dst_file.seek(offset + start, os.SEEK_SET)
chunk_size = 1024 * 1024