[elbe-devel] [PATCH] elbepack: hdimg: copy partition binary blobs from target

[John Ogness]

There are two methods for inserting binary blobs into an image:

1. directly, implemented by add_binary_blob()

2. as a partition, implemented by create_binary()

The second method is newer and was introduced with
commit 1058f6c89f02 ("hdimg: implement partition filles with
binary data from file"). It is obviously a complete new
implementation as it does not use the same style or naming
as add_binary_blob(). And unfortunately, it was implemented
such that the binary blob file is taken from 'chroot' instead
of from 'target'. This means that binary blob files can only
be used if available from a package. 'chroot' does not contain
any files created from fine-tuning or archives.

The first, older method uses files from 'target'.

Modify create_binary() so that it also uses files from 'target'
thus allowing fine-tuning and archive files to be used as well
as mirroring the behavior of add_binary_blob().

Signed-off-by: John Ogness <john.ogness at linutronix.de>
---
 elbepack/hdimg.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/elbepack/hdimg.py b/elbepack/hdimg.py
index faeea2c3..43e7945d 100644
--- a/elbepack/hdimg.py
+++ b/elbepack/hdimg.py
@@ -335,7 +335,7 @@ def create_binary(disk, part, ppart, target):
     with entry.losetup() as loopdev:
         # copy from buildenv if path starts with /
         if part.text('binary')[0] == '/':
-            tmp = target + '/' + 'chroot' + part.text('binary')
+            tmp = target + '/' + 'target' + part.text('binary')
         # copy from project directory
         else:
             tmp = target + '/' + part.text('binary')

base-commit: 26213ec6894cb8b28a9f5126bc80d1f51b211741
-- 
2.39.5