summaryrefslogtreecommitdiffstats
path: root/meta-agl-ic-container
diff options
context:
space:
mode:
authorNaoto Yamaguchi <naoto.yamaguchi@aisin.co.jp>2023-05-12 00:00:59 +0900
committerNaoto Yamaguchi <naoto.yamaguchi@aisin.co.jp>2023-05-12 00:23:11 +0900
commit524be1d47688e8053457b1037b059414efa3032c (patch)
tree7e4d0972904fb8f76c3fcf4d732070b606f24c87 /meta-agl-ic-container
parent8b5f7101e6ff970c1212ddedc53c3d3f28d75ac4 (diff)
Fix conditional check to out of tree image directory setting
In https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl-devel/+/28812, I receive review comment from reviewer to change conditional check. This patch fix that conditional check. Bug-AGL : SPEC-4790 Change-Id: Ie2f96d099a6186555cd190d86530ec2ba8df6e7a Signed-off-by: Naoto Yamaguchi <naoto.yamaguchi@aisin.co.jp>
Diffstat (limited to 'meta-agl-ic-container')
-rw-r--r--meta-agl-ic-container/dynamic-layers/meta-raspberrypi/recipes-platform/images/agl-instrument-cluster-container-demo.bbappend2
-rw-r--r--meta-agl-ic-container/recipes-platform/images/agl-lxc-multi-partition-image.inc8
2 files changed, 5 insertions, 5 deletions
diff --git a/meta-agl-ic-container/dynamic-layers/meta-raspberrypi/recipes-platform/images/agl-instrument-cluster-container-demo.bbappend b/meta-agl-ic-container/dynamic-layers/meta-raspberrypi/recipes-platform/images/agl-instrument-cluster-container-demo.bbappend
index ef2f75d9..644de32f 100644
--- a/meta-agl-ic-container/dynamic-layers/meta-raspberrypi/recipes-platform/images/agl-instrument-cluster-container-demo.bbappend
+++ b/meta-agl-ic-container/dynamic-layers/meta-raspberrypi/recipes-platform/images/agl-instrument-cluster-container-demo.bbappend
@@ -1,4 +1,4 @@
WKS_FILES:remove = "agl-ic-container-noloader.wks agl-ic-container-noloader-demo.wks"
WKS_FILES:prepend = " \
- ${@bb.utils.contains('OUT_OF_TREE_CONTAINER_IMAGE_DEPLOY_DIR', 'non', 'agl-ic-container-bootpart-uuid.wks ', 'agl-ic-container-bootpart-uuid-demo.wks ', d)} \
+ ${@oe.utils.conditional('OUT_OF_TREE_CONTAINER_IMAGE_DEPLOY_DIR', '', 'agl-ic-container-bootpart-uuid.wks ', 'agl-ic-container-bootpart-uuid-demo.wks ', d)} \
"
diff --git a/meta-agl-ic-container/recipes-platform/images/agl-lxc-multi-partition-image.inc b/meta-agl-ic-container/recipes-platform/images/agl-lxc-multi-partition-image.inc
index 9556c1e9..fa58c56e 100644
--- a/meta-agl-ic-container/recipes-platform/images/agl-lxc-multi-partition-image.inc
+++ b/meta-agl-ic-container/recipes-platform/images/agl-lxc-multi-partition-image.inc
@@ -3,7 +3,7 @@
require recipes-platform/images/agl-lxc-multiconfig-build.inc
# Install out of tree build image support
-OUT_OF_TREE_CONTAINER_IMAGE_DEPLOY_DIR ??= "non"
+OUT_OF_TREE_CONTAINER_IMAGE_DEPLOY_DIR ??= ""
OUT_OF_TREE_CONTAINER_IMAGES ??= " \
agl-ivi-demo-platform \
@@ -38,7 +38,7 @@ install_container_images() {
ln -s ${src} "${DEPLOY_DIR_IMAGE}/${image}.ext4"
done
- if ${@bb.utils.contains('OUT_OF_TREE_CONTAINER_IMAGE_DEPLOY_DIR', 'non', 'false', 'true', d)}; then
+ if ${@oe.utils.conditional('OUT_OF_TREE_CONTAINER_IMAGE_DEPLOY_DIR', '', 'false', 'true', d)}; then
er=0
for image in ${OUT_OF_TREE_CONTAINER_IMAGES}; do
rm -f "${DEPLOY_DIR_IMAGE}/${image}.ext4"
@@ -61,9 +61,9 @@ install_container_images() {
ROOTFS_POSTPROCESS_COMMAND += "install_container_images; "
IMAGE_INSTALL:append = " \
- ${@bb.utils.contains('OUT_OF_TREE_CONTAINER_IMAGE_DEPLOY_DIR', 'non', '', '${CONTAINER_MULTI_DEMO}', d)} \
+ ${@oe.utils.conditional('OUT_OF_TREE_CONTAINER_IMAGE_DEPLOY_DIR', '', '', '${CONTAINER_MULTI_DEMO}', d)} \
"
WKS_FILES:prepend = " \
- ${@bb.utils.contains('OUT_OF_TREE_CONTAINER_IMAGE_DEPLOY_DIR', 'non', 'agl-ic-container-noloader.wks ', 'agl-ic-container-noloader-demo.wks ', d)} \
+ ${@oe.utils.conditional('OUT_OF_TREE_CONTAINER_IMAGE_DEPLOY_DIR', '', 'agl-ic-container-noloader.wks ', 'agl-ic-container-noloader-demo.wks ', d)} \
"