From 5b34462ea85aa61cbb646e84bac280fc176db0df Mon Sep 17 00:00:00 2001 From: Pavel Zhukov <pavel.zhukov@huawei.com> Date: Tue, 28 Jun 2022 10:35:45 +0200 Subject: [PATCH] zephyr-kernel-src.inc: Reverse logic of applying ACM0 patch Patch should be applied only in CI environment with "ONIRO_ENABLE_ACM0" flag set to not break UX Fixes: https://gitlab.eclipse.org/eclipse/oniro-core/meta-zephyr/-/issues/30 Signed-off-by: Pavel Zhukov <pavel.zhukov@huawei.com> --- .../recipes-kernel/zephyr-kernel/zephyr-kernel-src.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src.inc b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src.inc index 854b322..f95e1a5 100644 --- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src.inc +++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src.inc @@ -54,7 +54,7 @@ SRC_URI = "\ git://github.com/zephyrproject-rtos/tflite-micro.git;protocol=https;nobranch=1;destsuffix=git/modules/lib/tflite-micro;name=tflite-micro \ file://0001-cmake-add-yocto-toolchain.patch \ file://0001-x86-fix-efi-binary-generation-issue-in-cross-compila.patch \ - ${@bb.utils.contains("ONIRO_NO_ACM0", "1", "", "file://0001-console-enable-the-USB-ACM0-console-by-default.patch", d)} \ + ${@bb.utils.contains("ONIRO_ENABLE_ACM0", "1", "file://0001-console-enable-the-USB-ACM0-console-by-default.patch", "", d)} \ " S = "${WORKDIR}/git" -- GitLab