[meta-zephyr][PATCH 1/3] zephyr-kernel: Remove redundant ZEPHYR_BASE definitions


Peter Hoyes
 

From: Peter Hoyes <Peter.Hoyes@...>

zephyr-image.inc and zephyr-sample.inc both include
zephyr-kernel-common.inc, which already defines ZEPHYR_BASE. Remove the
redundant definitions.

Also, pass -DZEPHYR_BASE=3D${ZEPHYR_BASE} instead of ${S} in
EXTRA_OECMAKE.

Signed-off-by: Peter Hoyes <Peter.Hoyes@...>
---
meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-image.inc | 1 -
.../recipes-kernel/zephyr-kernel/zephyr-kernel-common.inc | 2 +-
meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-sample.inc | 1 -
3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-image.i=
nc b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-image.inc
index 2d4c6ff..d4127d6 100644
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-image.inc
+++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-image.inc
@@ -3,7 +3,6 @@ inherit testimage
=20
QEMU_BIN_PATH =3D "${STAGING_BINDIR_NATIVE}"
=20
-ZEPHYR_BASE =3D "${S}"
OECMAKE_SOURCEPATH =3D "${S}/${ZEPHYR_SRC_DIR}"
=20
addtask deploy after do_compile
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 e69ba3c..1c80fe0 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
@@ -15,7 +15,7 @@ ZEPHYR_MAKE_BIN_OUTPUT =3D "zephyr.bin"
ZEPHYR_MAKE_EFI_OUTPUT =3D "zephyr.efi"
=20
EXTRA_OECMAKE =3D "\
- -DZEPHYR_BASE=3D${S} \
+ -DZEPHYR_BASE=3D${ZEPHYR_BASE} \
-DZEPHYR_GCC_VARIANT=3Dyocto \
-DBOARD=3D${BOARD} \
-DARCH=3D${ARCH} \
diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-sample.=
inc b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-sample.inc
index 77fa5ad..10c25c5 100644
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-sample.inc
+++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-sample.inc
@@ -2,7 +2,6 @@ require zephyr-kernel-src.inc
require zephyr-kernel-common.inc
inherit deploy
=20
-ZEPHYR_BASE =3D "${S}"
OECMAKE_SOURCEPATH =3D "${ZEPHYR_SRC_DIR}"
=20
do_install[noexec] =3D "1"
--=20
2.25.1

Join yocto@lists.yoctoproject.org to automatically receive all group messages.