| Message ID | 20250810233911.1259884-11-sandeep.gundlupet-raju@amd.com |
|---|---|
| State | New |
| Headers | show |
| Series | Update for scarthgap release | expand |
diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-image.inc b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-image.inc index 93d36b1..ca728b9 100644 --- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-image.inc +++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-image.inc @@ -1,5 +1,5 @@ -require zephyr-kernel-src.inc -require zephyr-kernel-common.inc +require recipes-kernel/zephyr-kernel/zephyr-kernel-src.inc +require recipes-kernel/zephyr-kernel/zephyr-kernel-common.inc inherit deploy image-artifact-names OECMAKE_SOURCEPATH = "${ZEPHYR_SRC_DIR}" diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-common.inc b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-common.inc index ba70a29..5191b9a 100644 --- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-common.inc +++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-common.inc @@ -8,7 +8,7 @@ inherit ${ZEPHYR_INHERIT_CLASSES} IMAGE_NO_MANIFEST = "1" ZEPHYR_TOOLCHAIN_VARIANT ?= "cross-compile" -require zephyr-toolchain-${ZEPHYR_TOOLCHAIN_VARIANT}.inc +require recipes-kernel/zephyr-kernel/zephyr-toolchain-${ZEPHYR_TOOLCHAIN_VARIANT}.inc ZEPHYR_MAKE_OUTPUT = "zephyr.elf" ZEPHYR_MAKE_BIN_OUTPUT = "zephyr.bin" diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-test-all.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-test-all.bb index 85efd24..d9dbb40 100644 --- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-test-all.bb +++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-test-all.bb @@ -1,7 +1,7 @@ LICENSE = "Apache-2.0" INHIBIT_DEFAULT_DEPS = "1" -require zephyr-kernel-test.inc +require recipes-kernel/zephyr-kernel/zephyr-kernel-test.inc addtask testimage deltask compile diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-test.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-test.bb index 2918d2d..75b1757 100644 --- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-test.bb +++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-test.bb @@ -1,4 +1,4 @@ -require zephyr-image.inc -require zephyr-kernel-test.inc +require recipes-kernel/zephyr-kernel/zephyr-image.inc +require recipes-kernel/zephyr-kernel/zephyr-kernel-test.inc BBCLASSEXTEND = '${@" ".join(["zephyrtest:" + x for x in d.getVar("ZEPHYRTESTS", True).split()])}'
Use relative path for all the include files to avoid overlaying the include files. Signed-off-by: Sandeep Gundlupet Raju <sandeep.gundlupet-raju@amd.com> --- .../recipes-kernel/zephyr-kernel/zephyr-image.inc | 4 ++-- .../recipes-kernel/zephyr-kernel/zephyr-kernel-common.inc | 2 +- .../recipes-kernel/zephyr-kernel/zephyr-kernel-test-all.bb | 2 +- .../recipes-kernel/zephyr-kernel/zephyr-kernel-test.bb | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-)