From e6f584142e4fe19cbf5e45ac05eb181ca96e393c Mon Sep 17 00:00:00 2001
From: Bartosz Golaszewski <bartosz.golaszewski@huawei.com>
Date: Mon, 25 Jul 2022 13:23:01 +0200
Subject: [PATCH] zephyr-kernel: fix the ACM0 patch application logic
The logic is currently inverted. Fix it by only applying the patch *if*
ONIRO_ENABLE_ACM0 is set to 1.
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@huawei.com>
---
.../recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.7.1.inc | 2 +-
.../recipes-kernel/zephyr-kernel/zephyr-kernel-src-3.0.0.inc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.7.1.inc b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.7.1.inc
index 3c31b64..4b38a75 100644
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.7.1.inc
+++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.7.1.inc
@@ -8,7 +8,7 @@ SRC_URI += " \
git://github.com/zephyrproject-rtos/trusted-firmware-m.git;protocol=https;nobranch=1;destsuffix=git/modules/tee/tfm;name=tfm \
git://github.com/zephyrproject-rtos/hal_cypress.git;protocol=https;nobranch=1;destsuffix=git/modules/hal/cypress;name=cypress \
file://0001-x86-fix-efi-binary-generation-issue-in-cross-compila.patch \
- ${@bb.utils.contains("ONIRO_ENABLE_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)} \
"
#
diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src-3.0.0.inc b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src-3.0.0.inc
index b680519..885c108 100644
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src-3.0.0.inc
+++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src-3.0.0.inc
@@ -74,5 +74,5 @@ SRC_URI += " \
file://0001-lvgl-add-support-for-lvgl-v8.2.0.patch \
file://0001-boards-arm-arduino_nano_33_ble-add-support-for-the-a.patch \
file://0001-x86-fix-efi-binary-generation-issue-in-cross-compila.patch \
- ${@bb.utils.contains("ONIRO_ENABLE_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)} \
"
--
GitLab