From e52d1f246e7db3f3dc215593892842ba6048e4cd Mon Sep 17 00:00:00 2001
From: Andrei Gherzan <andrei.gherzan@huawei.com>
Date: Tue, 14 Sep 2021 16:24:44 +0100
Subject: [PATCH] ohos-image.bbclass: Avoid duplicates in install_task when
deploying boot assets
The code detects when boot assets would overwrite something already
deployed/installed in the rootfs. This helps to avoid breaking packaging
at runtime. On the other hand, if IMAGE_BOOT_FILES has duplicates, this
check will fail when trying to install the same file multiple times. To
avoid this, treat the install_task as a set.
Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com>
---
meta-ohos-core/classes/ohos-image.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-ohos-core/classes/ohos-image.bbclass b/meta-ohos-core/classes/ohos-image.bbclass
index 1e699801..2a4fc7e5 100644
--- a/meta-ohos-core/classes/ohos-image.bbclass
+++ b/meta-ohos-core/classes/ohos-image.bbclass
@@ -160,7 +160,7 @@ python deploy_boot_artifacts_to_rootfs() {
else:
install_task.append((src, dst))
- for task in install_task:
+ for task in set(install_task):
src_path, dst_path = task
bb.debug(1, 'Install %s as %s' % (src_path, dst_path))
if os.path.exists(os.path.join(rootfs_dir, dst_path)):
--
GitLab