From: Daniel Schultz <d.schultz@phytec.de>
Date: Tue, 7 Mar 2017 13:41:56 +0000 (+0100)
Subject: wic: filemap: Fixed spared_copy skip
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=e29deac69ed29226b68001db2fcfb3ed24c0568a;p=openembedded-core.git

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>
---

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