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

When using West, Zephyr is checked out in a "zephyr" subdirectory of the
working directory. At the moment Zephyr is checked out at the root,
meaning a workaround is required to extract the module information.

In order to remove the workaround, change the Zephyr destsuffix in
SRC_URI and ZEPHYR_BASE. As a result of this change, modify patchdir for
the patches and the path to the LICENSE file.

Signed-off-by: Peter Hoyes <Peter.Hoyes@...>
---
meta-zephyr-core/classes/zephyr.bbclass | 8 +-------
.../recipes-kernel/zephyr-kernel/zephyr-kernel-common.inc | 2 +-
.../zephyr-kernel/zephyr-kernel-src-2.7.2.inc | 6 +++---
.../zephyr-kernel/zephyr-kernel-src-3.1.0.inc | 4 ++--
.../recipes-kernel/zephyr-kernel/zephyr-kernel-src.inc | 4 ++--
5 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/meta-zephyr-core/classes/zephyr.bbclass b/meta-zephyr-core/c=
lasses/zephyr.bbclass
index f3d16b7..8030456 100644
--- a/meta-zephyr-core/classes/zephyr.bbclass
+++ b/meta-zephyr-core/classes/zephyr.bbclass
@@ -34,16 +34,10 @@ do_get_zmods() {
rm -rf .west; mkdir .west
cat << EOF >> ${S}/.west/config
[manifest]
-path =3D .
+path =3D zephyr
file =3D west.yml
EOF
=20
- # Because of how we structure things, we need to either structure th=
is more like a west workspace or just tweak
- # the manifest in order to get access to the west extentions like bu=
ild and whatnot. Tweaking the manifest is the
- # easier path here and minimizes the amount of breakage that might o=
ccur.
- =20
- sed -i 's/path: zephyr/path: ./' west.yml
-
# Get all available modules and add them to ZEPHYR_MODULES
for i in $(west list|awk 'NR>1 {print $2}'); do
ZEPHYR_MODULES=3D"${S}/$i\;${ZEPHYR_MODULES}"
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 1c80fe0..a970abf 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
@@ -30,7 +30,7 @@ ZEPHYR_EXTRA_MODULES =3D ""
=20
EXTRA_OECMAKE:append =3D " -DZEPHYR_EXTRA_MODULES=3D${ZEPHYR_EXTRA_MODU=
LES}"
=20
-export ZEPHYR_BASE=3D"${S}"
+export ZEPHYR_BASE=3D"${S}/zephyr"
=20
DEPENDS +=3D "gperf-native"
=20
diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-=
src-2.7.2.inc b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kern=
el-src-2.7.2.inc
index 537a565..cbe761f 100644
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.7=
.2.inc
+++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.7=
.2.inc
@@ -63,8 +63,8 @@ ZEPHYR_BRANCH =3D "v2.7-branch"
PV =3D "2.7.2+git${SRCPV}"
=20
SRC_URI:append =3D " \
- file://dtc.patch \
- file://0001-x86-fix-efi-binary-generation-issue-in-cross-compila.pat=
ch \
- file://0001-2.7-cmake-add-yocto-toolchain.patch \
+ file://dtc.patch;patchdir=3Dzephyr \
+ file://0001-x86-fix-efi-binary-generation-issue-in-cross-compila.pat=
ch;patchdir=3Dzephyr \
+ file://0001-2.7-cmake-add-yocto-toolchain.patch;patchdir=3Dzephyr \
git://github.com/zephyrproject-rtos/hal_cypress.git;protocol=3Dhttps=
;nobranch=3D1;destsuffix=3Dgit/modules/hal/cypress;name=3Dcypress \
"
diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-=
src-3.1.0.inc b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kern=
el-src-3.1.0.inc
index 612cfd7..c0fe5f2 100644
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src-3.1=
.0.inc
+++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src-3.1=
.0.inc
@@ -72,6 +72,6 @@ ZEPHYR_BRANCH =3D "v3.1-branch"
PV =3D "3.1.0+git${SRCPV}"
=20
SRC_URI +=3D " \
- file://0001-3.1-cmake-add-yocto-toolchain.patch \
- file://0001-3.1-x86-fix-efi-binary-generation-issue-in-cross-compila=
.patch \
+ file://0001-3.1-cmake-add-yocto-toolchain.patch;patchdir=3Dzephyr \
+ file://0001-3.1-x86-fix-efi-binary-generation-issue-in-cross-compila=
.patch;patchdir=3Dzephyr \
"
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 e9b35c9..a4bab22 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
@@ -1,5 +1,5 @@
LICENSE =3D "Apache-2.0"
-LIC_FILES_CHKSUM =3D "file://LICENSE;md5=3Dfa818a259cbed7ce8bc2a22d35a46=
4fc"
+LIC_FILES_CHKSUM =3D "file://zephyr/LICENSE;md5=3Dfa818a259cbed7ce8bc2a2=
2d35a464fc"
=20
CVE_PRODUCT =3D "zephyr"
=20
@@ -11,7 +11,7 @@ inherit cmake
FILESEXTRAPATHS:prepend :=3D "${THISDIR}/files:"
=20
SRC_URI =3D "\
- git://github.com/zephyrproject-rtos/zephyr.git;protocol=3Dhttps;bran=
ch=3D${ZEPHYR_BRANCH};name=3Ddefault \
+ git://github.com/zephyrproject-rtos/zephyr.git;protocol=3Dhttps;bran=
ch=3D${ZEPHYR_BRANCH};name=3Ddefault;destsuffix=3Dgit/zephyr \
git://github.com/zephyrproject-rtos/canopennode.git;protocol=3Dhttps=
;nobranch=3D1;destsuffix=3Dgit/modules/lib/canopennode;name=3Dcanopennode=
\
git://github.com/zephyrproject-rtos/civetweb.git;protocol=3Dhttps;no=
branch=3D1;destsuffix=3Dgit/modules/lib/civetweb;name=3Dcivetweb \
git://github.com/zephyrproject-rtos/cmsis.git;protocol=3Dhttps;nobra=
nch=3D1;destsuffix=3Dgit/modules/hal/cmsis;name=3Dcmsis \
--=20
2.25.1

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

Change ${S} -> ${ZEPHYR_BASE} in all application recipes, as Zephyr
might not always be found at the root of the source directory.

Signed-off-by: Peter Hoyes <Peter.Hoyes@...>
---
meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-blinky.bb | 2 +-
.../recipes-kernel/zephyr-kernel/zephyr-coap-client.bb | 2 +-
.../recipes-kernel/zephyr-kernel/zephyr-coap-server.bb | 2 +-
.../recipes-kernel/zephyr-kernel/zephyr-echo-client.bb | 2 +-
.../recipes-kernel/zephyr-kernel/zephyr-hci-uart.bb | 2 +-
.../recipes-kernel/zephyr-kernel/zephyr-helloworld.bb | 2 +-
.../recipes-kernel/zephyr-kernel/zephyr-http-client.bb | 2 +-
meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-image.inc | 2 +-
meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-lvgl.bb | 2 +-
.../recipes-kernel/zephyr-kernel/zephyr-mqtt-publisher.bb | 2 +-
.../recipes-kernel/zephyr-kernel/zephyr-openamp-rsc-table.bb | 2 +-
.../zephyr-kernel/zephyr-openthread-echo-client.bb | 2 +-
.../recipes-kernel/zephyr-kernel/zephyr-openthread-rcp.bb | 2 +-
.../recipes-kernel/zephyr-kernel/zephyr-peripheral-esp.bb | 2 +-
.../recipes-kernel/zephyr-kernel/zephyr-peripheral-hr.bb | 2 +-
.../recipes-kernel/zephyr-kernel/zephyr-philosophers.bb | 2 +-
.../recipes-kernel/zephyr-kernel/zephyr-synchronization.bb | 2 +-
.../recipes-kernel/zephyr-kernel/zephyr-websocket-client.bb | 2 +-
18 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-blinky.=
bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-blinky.bb
index bd5ce4f..c2a1e55 100644
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-blinky.bb
+++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-blinky.bb
@@ -1,3 +1,3 @@
include zephyr-sample.inc
=20
-ZEPHYR_SRC_DIR =3D "${S}/samples/basic/blinky"
+ZEPHYR_SRC_DIR =3D "${ZEPHYR_BASE}/samples/basic/blinky"
diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-coap-cl=
ient.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-coap-clien=
t.bb
index d7ea837..7796f6b 100644
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-coap-client.bb
+++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-coap-client.bb
@@ -1,3 +1,3 @@
include zephyr-sample.inc
=20
-ZEPHYR_SRC_DIR =3D "${S}/samples/net/sockets/coap_client"
+ZEPHYR_SRC_DIR =3D "${ZEPHYR_BASE}/samples/net/sockets/coap_client"
diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-coap-se=
rver.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-coap-serve=
r.bb
index dece67d..5e345d4 100644
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-coap-server.bb
+++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-coap-server.bb
@@ -1,3 +1,3 @@
include zephyr-sample.inc
=20
-ZEPHYR_SRC_DIR =3D "${S}/samples/net/sockets/coap_server"
+ZEPHYR_SRC_DIR =3D "${ZEPHYR_BASE}/samples/net/sockets/coap_server"
diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-echo-cl=
ient.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-echo-clien=
t.bb
index 53d1ef3..73187cf 100644
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-echo-client.bb
+++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-echo-client.bb
@@ -1,3 +1,3 @@
include zephyr-sample.inc
=20
-ZEPHYR_SRC_DIR =3D "${S}/samples/net/sockets/echo_client"
+ZEPHYR_SRC_DIR =3D "${ZEPHYR_BASE}/samples/net/sockets/echo_client"
diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-hci-uar=
t.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-hci-uart.bb
index c66c7ec..ebc6dc3 100644
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-hci-uart.bb
+++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-hci-uart.bb
@@ -1,5 +1,5 @@
include zephyr-sample.inc
=20
-ZEPHYR_SRC_DIR =3D "${S}/samples/bluetooth/hci_uart"
+ZEPHYR_SRC_DIR =3D "${ZEPHYR_BASE}/samples/bluetooth/hci_uart"
=20
COMPATIBLE_MACHINE =3D "(96b-nitrogen)"
diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-hellowo=
rld.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-helloworld.=
bb
index 20d1700..68b42aa 100644
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-helloworld.bb
+++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-helloworld.bb
@@ -4,4 +4,4 @@ console"
=20
include zephyr-sample.inc
=20
-ZEPHYR_SRC_DIR =3D "${S}/samples/hello_world"
+ZEPHYR_SRC_DIR =3D "${ZEPHYR_BASE}/samples/hello_world"
diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-http-cl=
ient.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-http-clien=
t.bb
index bf99bbd..8bff2be 100644
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-http-client.bb
+++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-http-client.bb
@@ -1,4 +1,4 @@
include zephyr-sample.inc
=20
-ZEPHYR_SRC_DIR =3D "${S}/samples/net/sockets/http_client"
+ZEPHYR_SRC_DIR =3D "${ZEPHYR_BASE}/samples/net/sockets/http_client"
=20
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 d4127d6..f4c9db1 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,7 @@ inherit testimage
=20
QEMU_BIN_PATH =3D "${STAGING_BINDIR_NATIVE}"
=20
-OECMAKE_SOURCEPATH =3D "${S}/${ZEPHYR_SRC_DIR}"
+OECMAKE_SOURCEPATH =3D "${ZEPHYR_BASE}/${ZEPHYR_SRC_DIR}"
=20
addtask deploy after do_compile
do_install[noexec] =3D "1"
diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-lvgl.bb=
b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-lvgl.bb
index efe2154..a635da2 100644
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-lvgl.bb
+++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-lvgl.bb
@@ -1,6 +1,6 @@
include zephyr-sample.inc
=20
-ZEPHYR_SRC_DIR =3D "${S}/samples/subsys/display/lvgl"
+ZEPHYR_SRC_DIR =3D "${ZEPHYR_BASE}/samples/subsys/display/lvgl"
=20
# TODO Once more machines and displays are supported, add a PACKAGECONFI=
G.
EXTRA_OECMAKE:append =3D" -DSHIELD=3Dadafruit_2_8_tft_touch_v2"
diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-mqtt-pu=
blisher.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-mqtt-pu=
blisher.bb
index c679798..f314841 100644
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-mqtt-publisher=
.bb
+++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-mqtt-publisher=
.bb
@@ -1,3 +1,3 @@
include zephyr-sample.inc
=20
-ZEPHYR_SRC_DIR =3D "${S}/samples/net/mqtt_publisher"
+ZEPHYR_SRC_DIR =3D "${ZEPHYR_BASE}/samples/net/mqtt_publisher"
diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-openamp=
-rsc-table.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-open=
amp-rsc-table.bb
index 3eec58a..5e51c23 100644
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-openamp-rsc-ta=
ble.bb
+++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-openamp-rsc-ta=
ble.bb
@@ -5,6 +5,6 @@ ZEPHYR_MAKE_OUTPUT =3D "zephyr_openamp_rsc_table.elf"
ZEPHYR_MAKE_BIN_OUTPUT =3D "zephyr_openamp_rsc_table.bin"
ZEPHYR_MAKE_EFI_OUTPUT =3D "zephyr_openamp_rsc_table.efi"
=20
-ZEPHYR_SRC_DIR =3D "${S}/samples/subsys/ipc/openamp_rsc_table"
+ZEPHYR_SRC_DIR =3D "${ZEPHYR_BASE}/samples/subsys/ipc/openamp_rsc_table"
=20
COMPATIBLE_MACHINE =3D "(stm32mp157c-dk2)"
diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-openthr=
ead-echo-client.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr=
-openthread-echo-client.bb
index b83c6b3..e2b3efd 100644
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-openthread-ech=
o-client.bb
+++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-openthread-ech=
o-client.bb
@@ -1,6 +1,6 @@
include zephyr-sample.inc
=20
-ZEPHYR_SRC_DIR =3D "${S}/samples/net/sockets/echo_client"
+ZEPHYR_SRC_DIR =3D "${ZEPHYR_BASE}/samples/net/sockets/echo_client"
=20
EXTRA_OECMAKE +=3D "-DOVERLAY_CONFIG=3Doverlay-ot.conf"
=20
diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-openthr=
ead-rcp.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-openthr=
ead-rcp.bb
index 6d3f860..ed86a9b 100644
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-openthread-rcp=
.bb
+++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-openthread-rcp=
.bb
@@ -1,6 +1,6 @@
include zephyr-sample.inc
=20
-ZEPHYR_SRC_DIR =3D "${S}/samples/net/openthread/coprocessor"
+ZEPHYR_SRC_DIR =3D "${ZEPHYR_BASE}/samples/net/openthread/coprocessor"
=20
EXTRA_OECMAKE +=3D "-DCONF_FILE=3D"prj.conf overlay-rcp.conf overlay-usb=
-nrf-br.conf" -DDTC_OVERLAY_FILE=3D"usb.overlay" -DCONFIG_OPENTHREAD_THRE=
AD_VERSION_1_2=3Dy"
=20
diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-periphe=
ral-esp.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-periphe=
ral-esp.bb
index 14655e5..0aac7f6 100644
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-peripheral-esp=
.bb
+++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-peripheral-esp=
.bb
@@ -1,3 +1,3 @@
include zephyr-sample.inc
=20
-ZEPHYR_SRC_DIR =3D "${S}/samples/bluetooth/peripheral_esp"
+ZEPHYR_SRC_DIR =3D "${ZEPHYR_BASE}/samples/bluetooth/peripheral_esp"
diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-periphe=
ral-hr.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-peripher=
al-hr.bb
index 53fc771..80e3505 100644
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-peripheral-hr.=
bb
+++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-peripheral-hr.=
bb
@@ -1,3 +1,3 @@
include zephyr-sample.inc
=20
-ZEPHYR_SRC_DIR =3D "${S}/samples/bluetooth/peripheral_hr"
+ZEPHYR_SRC_DIR =3D "${ZEPHYR_BASE}/samples/bluetooth/peripheral_hr"
diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-philoso=
phers.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-philosoph=
ers.bb
index 5a2ac70..2b4fca3 100644
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-philosophers.b=
b
+++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-philosophers.b=
b
@@ -5,4 +5,4 @@ operate correctly by printing a greeting to the console f=
rom two threads."
=20
include zephyr-sample.inc
=20
-ZEPHYR_SRC_DIR =3D "${S}/samples/philosophers"
+ZEPHYR_SRC_DIR =3D "${ZEPHYR_BASE}/samples/philosophers"
diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-synchro=
nization.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-synchr=
onization.bb
index 4cb207d..a55736b 100644
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-synchronizatio=
n.bb
+++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-synchronizatio=
n.bb
@@ -5,4 +5,4 @@ operate correctly by printing a greeting to the console f=
rom two threads."
=20
include zephyr-sample.inc
=20
-ZEPHYR_SRC_DIR =3D "${S}/samples/synchronization"
+ZEPHYR_SRC_DIR =3D "${ZEPHYR_BASE}/samples/synchronization"
diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-websock=
et-client.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-webso=
cket-client.bb
index c2c47d0..b92e986 100644
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-websocket-clie=
nt.bb
+++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-websocket-clie=
nt.bb
@@ -1,3 +1,3 @@
include zephyr-sample.inc
=20
-ZEPHYR_SRC_DIR =3D "${S}/samples/net/sockets/websocket_client"
+ZEPHYR_SRC_DIR =3D "${ZEPHYR_BASE}/samples/net/sockets/websocket_client"
--=20
2.25.1

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

I don't have a ready example, but you can start by reading
meta/classes/insane.class - I think all of the things defined in it
are extensible from a different class.

Alex

Fix error as the fowllowing:

resource-agents-4.5.0-r0 do_package_qa: QA Issue: lib32-resource-agents installs files in /var/volatile, but it is expected to be empty [empty-dirs]

Signed-off-by: Lei Maohui <leimaohui@...>
---
.../cluster-resource-agents/resource-agents_4.5.0.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents_4.5.0.bb b/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents_4.5.0.bb
index 9349ab9..1da020e 100644
--- a/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents_4.5.0.bb
+++ b/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents_4.5.0.bb
@@ -59,8 +59,8 @@ EXTRA_OECONF += "--disable-fatal-warnings \
--with-rsctmpdir=/var/run/heartbeat/rsctmp"

do_install:append() {
- rm -rf "${D}${localstatedir}/run"
- rmdir --ignore-fail-on-non-empty "${D}${localstatedir}"
+ rm -rf ${D}${localstatedir}/run
+ rm -rf ${D}${localstatedir}
}

# tickle_tcp is published under GPLv3, we just split it into ${PN}-extra,
--
2.25.1

PACKAGECONFIG is what you're after:

https://docs.yoctoproject.org/current/ref-manual/variables.html#term-PACKAGECONFIG


On Sat, Aug 6, 2022 at 10:28 AM Kuzemko Aleksandr
<kuzemkoyocto@...> wrote:

Thanks, now it works.

Another question. I have
DEPENDS = "espeak flite pulseaudio libdotconf glib-2.0 libtool gettext"
and
EXTRA_OECONF = " --with-espeak --with-flite --without-ibmtts --without-nas --with-alsa --with-pulse "
Is it possible define espeak flite as option? For example if I in local.conf define something speech-dispatcher[espeak] it will disable from DEPENDS flite depends and in EXTRA_OECONF it wil be as --withot-flite

--
Alex Kiernan

Thanks, now it works.

Another question. I have
DEPENDS = "espeak flite pulseaudio libdotconf glib-2.0 libtool gettext"
and
EXTRA_OECONF = " --with-espeak --with-flite --without-ibmtts --without-nas --with-alsa --with-pulse "
Is it possible define espeak flite as option? For example if I in local.conf define something speech-dispatcher[espeak] it will disable from DEPENDS flite depends and in EXTRA_OECONF it wil be as --withot-flite

Signed-off-by: Armin Kuster <akuster808@...>
---
recipes-core/packagegroup/packagegroup-core-security.bb | 1 +
1 file changed, 1 insertion(+)

diff --git a/recipes-core/packagegroup/packagegroup-core-security.bb b/recipes-core/packagegroup/packagegroup-core-security.bb
index 85f6916..ec603aa 100644
--- a/recipes-core/packagegroup/packagegroup-core-security.bb
+++ b/recipes-core/packagegroup/packagegroup-core-security.bb
@@ -28,6 +28,7 @@ SUMMARY:packagegroup-security-utils = "Security utilities"
RDEPENDS:packagegroup-security-utils = "\
bubblewrap \
checksec \
+ cryptmount \
ding-libs \
ecryptfs-utils \
fscryptctl \
--
2.25.1

Signed-off-by: Armin Kuster <akuster808@...>
---
.../cryptmount/cryptmount_5.3.3.bb | 25 +++++++++++++++++++
1 file changed, 25 insertions(+)
create mode 100644 recipes-security/cryptmount/cryptmount_5.3.3.bb

diff --git a/recipes-security/cryptmount/cryptmount_5.3.3.bb b/recipes-security/cryptmount/cryptmount_5.3.3.bb
new file mode 100644
index 0000000..6e653c8
--- /dev/null
+++ b/recipes-security/cryptmount/cryptmount_5.3.3.bb
@@ -0,0 +1,25 @@
+SUMMARY = "Linux encrypted filesystem management tool"
+HOMEPAGE = "http://cryptmount.sourceforge.net/"
+LIC_FILES_CHKSUM = "file://README;beginline=3;endline=4;md5=673a990de93a2c5531a0f13f1c40725a"
+LICENSE = "GPL-2.0-only"
+
+SRC_URI = "https://sourceforge.net/projects/cryptmount/files/${BPN}/${BPN}-5.3/${BPN}-${PV}.tar.gz"
+
+SRC_URI[sha256sum] = "682953ff5ba497d48d6b13e22ca726c98659abd781bb8596bb299640dd255d9b"
+
+inherit autotools-brokensep gettext pkgconfig systemd
+
+EXTRA_OECONF = " --enable-cswap --enable-fsck --enable-argv0switch"
+
+PACKAGECONFIG ?="intl luks gcrypt nls"
+PACKAGECONFIG:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
+
+PACKAGECONFIG[systemd] = "--with-systemd, --without-systemd, systemd"
+PACKAGECONFIG[intl] = "--with-libintl-prefix, --without-libintl-prefix"
+PACKAGECONFIG[gcrypt] = "--with-libgcrypt, --without-libgcrypt, libgcrypt"
+PACKAGECONFIG[luks] = "--enable-luks, --disable-luks, cryptsetup"
+PACKAGECONFIG[nls] = "--enable-nls, --disable-nls, "
+
+SYSTEMD_SERVICE:${PN} = "cryptmount.service"
+
+RDEPENDS:${PN} = "libdevmapper"
--
2.25.1

Is it possibile to run podman (3.0.1) from a do_install task?
I am trying to install a podman store of a container directly in the final image but I'm getting this error:

+ /usr/bin/podman --root /home/user/poky/build/tmp-glibc/work/cortexa57-os-linux/app/0.36.0-r0/container-storage pull REPO_URL

Error: cannot setup namespace using newuidmap: exit status 1

With podman 4.1 I'm getting this error:
cannot setresgid: Invalid argument

Any idea?

The runcmd() would print an "ERROR" when failed which caused confusions since
the failed is expected on old branches, so subprocess.getstatusoutput to fix
the problem.

Signed-off-by: Robert Yang <liezhi.yang@...>
---
layerindex/utils.py | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/layerindex/utils.py b/layerindex/utils.py
index efd18e4..6d73c9f 100644
--- a/layerindex/utils.py
+++ b/layerindex/utils.py
@@ -243,16 +243,18 @@ def is_commit_ancestor(repodir, commit, logger):
# check if commit is a sha1 hash
if re.match('[0-9a-f]{40}', commit):
# check if the commit is an ancestor
- contained = runcmd(['git', 'merge-base', '--is-ancestor', '%s' % commit, 'HEAD'], repodir, logger=logger)
- return True
- else:
- raise Exception('is_commit_ancestor: "commit" must be a SHA1 hash')
- except subprocess.CalledProcessError as e:
- if e.returncode == 1:
- # commit is not an ancestor
+ cmd = "GIT_DIR=%s/.git git merge-base --is-ancestor %s HEAD" % (repodir, commit)
+ logger.debug('Running "%s"' % cmd)
+ ret, output = subprocess.getstatusoutput(cmd)
+ if ret == 0:
+ return True
+ elif ret == 1:
+ logger.debug('output: %s' % output)
return False
else:
- raise e
+ raise Exception('Failed to run command: %s: ret: %s, output: %s' % (cmd, ret, output))
+ else:
+ raise Exception('is_commit_ancestor: "commit" must be a SHA1 hash')
except Exception as esc:
logger.warn(esc)

--
2.37.0

From: Alexandre Belloni <alexandre.belloni@...>

Signed-off-by: Alexandre Belloni <alexandre.belloni@...>
---
schedulers.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/schedulers.py b/schedulers.py
index 6d339693ff85..22a12bdf6dd8 100644
--- a/schedulers.py
+++ b/schedulers.py
@@ -61,8 +61,8 @@ branchdefaults = {
'branch_meta-intel': 'kirkstone',
'branch_meta-mingw': 'kirkstone',
'branch_meta-openembedded': 'kirkstone',
- 'branch_meta-ti': 'master',
- 'branch_meta-virtualization': 'master',
+ 'branch_meta-ti': 'kirkstone',
+ 'branch_meta-virtualization': 'kirkstone',
'branch_oecore': 'kirkstone',
},
'honister': {
--
2.37.1

Report of progress.
https://github.com/Kuzma30/meta-myconf/commit/25035fdb737aecfb765c963085e898d0f33ac0b9
Have errors

ERROR: speech-dispatcher-git-r0 do_package_qa: QA Issue: non -dev/-dbg/nativesdk- package libspeechd contains symlink .so '/usr/lib/libspeechd.so' [dev-so]
ERROR: speech-dispatcher-git-r0 do_package_qa: Fatal QA errors were found, failing task.
ERROR: Logfile of failure stored in: /home/qtembed/b2qt/build-raspberrypi4/tmp/work/cortexa7t2hf-neon-vfpv4-poky-linux-gnueabi/speech-dispatcher/git-r0/temp/log.do_package_qa.26981
ERROR: Task (/home/qtembed/b2qt/sources/meta-myconfig/recipes-multimedia/speech-dispatcher/speech-dispatcher_git.bb:do_package_qa) failed with exit code '1'

Signed-off-by: Armin Kuster <akuster808@...>
---
recipes-core/packagegroup/packagegroup-core-security.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-core/packagegroup/packagegroup-core-security.bb b/recipes-core/packagegroup/packagegroup-core-security.bb
index a12a4c2..85f6916 100644
--- a/recipes-core/packagegroup/packagegroup-core-security.bb
+++ b/recipes-core/packagegroup/packagegroup-core-security.bb
@@ -42,8 +42,8 @@ RDEPENDS:packagegroup-security-utils = "\
${@bb.utils.contains("DISTRO_FEATURES", "pax", "pax-utils packctl", "",d)} \
"

-RDEPENDS:packagegroup-security-utils:append:x86 = "chipsec"
-RDEPENDS:packagegroup-security-utils:append:x86-64 = "chipsec"
+RDEPENDS:packagegroup-security-utils:append:x86 = " chipsec"
+RDEPENDS:packagegroup-security-utils:append:x86-64 = " chipsec"
RDEPENDS:packagegroup-security-utils:remove:mipsarch = "firejail krill"
RDEPENDS:packagegroup-security-utils:remove:libc-musl = "krill"
RDEPENDS:packagegroup-security-utils:remove:riscv64 = "krill"
--
2.25.1

Hi Khem,

Von: Khem Raj <raj.khem@...>
Gesendet: Donnerstag, 4. August 2022 13:20

To install the missing library libnss-resolve.so.2, I've added
  IMAGE_INSTALL_append = " libnss-resolve"
to my image recipe, but I wonder, if this is the right place or necessary
at all.

My assumption was that having nss-resolve in PACKAGECONFIG will
also install the related library, which is obviously not the case.

Packageconfigs are about what you would like to build it’s still another step what you would like to bundle in your image which is what IMAGE_INSTALL does. At times this is already done because whatever the packagrconfig is enabling is already part of a output package that’s in your IMAGE_INSTALL dependencies and gets pulled in indirectly but that’s not the case here. Therefore you have to do it in both places

Furthermore, I had to write an append-file for base-files, such that
/etc/nsswitch.conf contains the following line
  hosts: resolve [!UNAVAIL=return] files dns myhostname

Ok, there's nothing to worry about.
Adding libnss-resolve to IMAGE_INSTALL and overwriting nsswitch.conf in
the append-file ist he correct procedure here.

Thanks for clarification.

Carsten