[oe-commits] [openembedded-core] 02/06: wic: bootimg-partition: Use the relative path in the install_task
git at git.openembedded.org
git at git.openembedded.org
Wed Aug 15 09:03:44 UTC 2018
This is an automated email from the git hooks/post-receive script.
rpurdie pushed a commit to branch master-next
in repository openembedded-core.
commit da837a68b622945b392a9221a48490be257d2ff0
Author: Kevin Hao <kexin.hao at windriver.com>
AuthorDate: Tue Aug 14 09:31:22 2018 +0800
wic: bootimg-partition: Use the relative path in the install_task
Signed-off-by: Kevin Hao <kexin.hao at windriver.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
scripts/lib/wic/plugins/source/bootimg-partition.py | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/scripts/lib/wic/plugins/source/bootimg-partition.py b/scripts/lib/wic/plugins/source/bootimg-partition.py
index b239fc0..9480eed 100644
--- a/scripts/lib/wic/plugins/source/bootimg-partition.py
+++ b/scripts/lib/wic/plugins/source/bootimg-partition.py
@@ -111,20 +111,18 @@ class BootimgPartitionPlugin(SourcePlugin):
logger.debug('Globbed sources: %s', ', '.join(srcs))
for entry in srcs:
+ src = os.path.relpath(entry, kernel_dir)
entry_dst_name = entry_name_fn(entry)
- install_task.append((entry,
- os.path.join(hdddir,
- entry_dst_name)))
+ install_task.append((src, entry_dst_name)))
else:
- install_task = [(os.path.join(kernel_dir, src),
- os.path.join(hdddir, dst))]
+ install_task = [(src, dst)]
for task in install_task:
src_path, dst_path = task
- logger.debug('Install %s as %s',
- os.path.basename(src_path), dst_path)
+ logger.debug('Install %s as %s', src_path, dst_path)
install_cmd = "install -m 0644 -D %s %s" \
- % (src_path, dst_path)
+ % (os.path.join(kernel_dir, src_path),
+ os.path.join(hdddir, dst_path))
exec_cmd(install_cmd)
logger.debug('Prepare boot partition using rootfs in %s', hdddir)
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list