1. yocto@lists.yoctoproject.org
  2. Messages
   Date   
[meta-security][PATCH V2] meta-security: Add recipe for Glome

John Broadbent
 

From: John Edward Broadbent <jebr@...>

Generic Low Overhead Message Exchange (GLOME) is a protocol providing
secure authentication and authorization for low dependency environments.

Signed-off-by: John Edward Broadbent <jebr@...>
---
.../packagegroup-core-security.bb | 1 +
recipes-security/glome/glome_git.bb | 24 +++++++++++++++++++
2 files changed, 25 insertions(+)
create mode 100644 recipes-security/glome/glome_git.bb

diff --git a/recipes-core/packagegroup/packagegroup-core-security.bb b/recipes-core/packagegroup/packagegroup-core-security.bb
index a12a4c2..c028c3d 100644
--- a/recipes-core/packagegroup/packagegroup-core-security.bb
+++ b/recipes-core/packagegroup/packagegroup-core-security.bb
@@ -31,6 +31,7 @@ RDEPENDS:packagegroup-security-utils = "\
ding-libs \
ecryptfs-utils \
fscryptctl \
+ glome \
keyutils \
nmap \
pinentry \
diff --git a/recipes-security/glome/glome_git.bb b/recipes-security/glome/glome_git.bb
new file mode 100644
index 0000000..12d6d5f
--- /dev/null
+++ b/recipes-security/glome/glome_git.bb
@@ -0,0 +1,24 @@
+SUMMARY = "GLOME Login Client"
+HOME_PAGE = "https://github.com/google/glome"
+DESCRIPTION = "GLOME is used to authorize serial console access to Linux machines"
+PV = "0.1+git${SRCPV}"
+
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
+
+inherit meson pkgconfig
+
+DEPENDS += "openssl"
+
+S = "${WORKDIR}/git"
+SRC_URI = "git://github.com/google/glome.git;branch=master;protocol=https"
+SRCREV = "978ad9fb165f1e382c875f2ce08a1fc4f2ddcf1b"
+
+FILES:${PN} += "${libdir}/security"
+
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[glome-cli] = "-Dglome-cli=true,-Dglome-cli=false"
+PACKAGECONFIG[pam-glome] = "-Dpam-glome=true,-Dpam-glome=false,libpam"
+
+EXTRA_OEMESON = "-Dtests=false"
+
--
2.37.1.559.g78731f0fdb-goog
Re: [meta-security][PATCH] meta-security: Add recipe for Glome

Khem Raj
 

On Mon, Aug 8, 2022 at 11:06 AM John Broadbent via
lists.yoctoproject.org <jebr=google.com@...> wrote:

From: John Edward Broadbent <jebr@...>

Generic Low Overhead Message Exchange (GLOME) is a protocol providing
secure authentication and authorization for low dependency environments.

Signed-off-by: John Edward Broadbent <jebr@...>
---
.../packagegroup-core-security.bb | 1 +
recipes-security/glome/glome_git.bb | 25 +++++++++++++++++++
2 files changed, 26 insertions(+)
create mode 100644 recipes-security/glome/glome_git.bb

diff --git a/recipes-core/packagegroup/packagegroup-core-security.bb b/recipes-core/packagegroup/packagegroup-core-security.bb
index a12a4c2..c028c3d 100644
--- a/recipes-core/packagegroup/packagegroup-core-security.bb
+++ b/recipes-core/packagegroup/packagegroup-core-security.bb
@@ -31,6 +31,7 @@ RDEPENDS:packagegroup-security-utils = "\
ding-libs \
ecryptfs-utils \
fscryptctl \
+ glome \
keyutils \
nmap \
pinentry \
diff --git a/recipes-security/glome/glome_git.bb b/recipes-security/glome/glome_git.bb
new file mode 100644
index 0000000..5a2a114
--- /dev/null
+++ b/recipes-security/glome/glome_git.bb
@@ -0,0 +1,25 @@
+SUMMARY = "GLOME Login Client"
+HOME_PAGE = "https://github.com/google/glome"
+DESCRIPTION = "GLOME is used to authorize serial console access to Linux machines"
+PR = "r1"
We dont need setting PR manually anymore. So remove it.

+PV = "0.1+git${SRCPV}"
+
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
+
+inherit meson pkgconfig
+
+DEPENDS += "openssl"
+
+S = "${WORKDIR}/git"
+SRC_URI = "git://github.com/google/glome.git;branch=master;protocol=https"
+SRCREV = "978ad9fb165f1e382c875f2ce08a1fc4f2ddcf1b"
+
+FILES_${PN} += "${libdir}/security"
+
This should be FILES:${PN} as per new syntax.

+PACKAGECONFIG ??= ""
+PACKAGECONFIG[glome-cli] = "-Dglome-cli=true,-Dglome-cli=false"
+PACKAGECONFIG[pam-glome] = "-Dpam-glome=true,-Dpam-glome=false,libpam"
+
+EXTRA_OEMESON = "-Dtests=false"
+
--
2.37.1.559.g78731f0fdb-goog
[meta-security][PATCH] meta-security: Add recipe for Glome

John Broadbent
 

From: John Edward Broadbent <jebr@...>

Generic Low Overhead Message Exchange (GLOME) is a protocol providing
secure authentication and authorization for low dependency environments.

Signed-off-by: John Edward Broadbent <jebr@...>
---
.../packagegroup-core-security.bb | 1 +
recipes-security/glome/glome_git.bb | 25 +++++++++++++++++++
2 files changed, 26 insertions(+)
create mode 100644 recipes-security/glome/glome_git.bb

diff --git a/recipes-core/packagegroup/packagegroup-core-security.bb b/recipes-core/packagegroup/packagegroup-core-security.bb
index a12a4c2..c028c3d 100644
--- a/recipes-core/packagegroup/packagegroup-core-security.bb
+++ b/recipes-core/packagegroup/packagegroup-core-security.bb
@@ -31,6 +31,7 @@ RDEPENDS:packagegroup-security-utils = "\
ding-libs \
ecryptfs-utils \
fscryptctl \
+ glome \
keyutils \
nmap \
pinentry \
diff --git a/recipes-security/glome/glome_git.bb b/recipes-security/glome/glome_git.bb
new file mode 100644
index 0000000..5a2a114
--- /dev/null
+++ b/recipes-security/glome/glome_git.bb
@@ -0,0 +1,25 @@
+SUMMARY = "GLOME Login Client"
+HOME_PAGE = "https://github.com/google/glome"
+DESCRIPTION = "GLOME is used to authorize serial console access to Linux machines"
+PR = "r1"
+PV = "0.1+git${SRCPV}"
+
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
+
+inherit meson pkgconfig
+
+DEPENDS += "openssl"
+
+S = "${WORKDIR}/git"
+SRC_URI = "git://github.com/google/glome.git;branch=master;protocol=https"
+SRCREV = "978ad9fb165f1e382c875f2ce08a1fc4f2ddcf1b"
+
+FILES_${PN} += "${libdir}/security"
+
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[glome-cli] = "-Dglome-cli=true,-Dglome-cli=false"
+PACKAGECONFIG[pam-glome] = "-Dpam-glome=true,-Dpam-glome=false,libpam"
+
+EXTRA_OEMESON = "-Dtests=false"
+
--
2.37.1.559.g78731f0fdb-goog
Re: How to add INCOMPATIBLE_LICENSE only for one image? #bitbake #dunfell

Khem Raj
 

On 8/8/22 9:06 AM, Priyanshu Sharma wrote:
Hi,
I've two image recipes (foo.bb <http://foo.bb/> & bar.bb <http://bar.bb/>). I want to add INCOMPATIBLE_LICENSE="GPLv3" only in foo.bb <http://foo.bb/> & not bar.bb <http://bar.bb/>
Adding INCOMPATIBLE_LICENSE="GPLv3" in local.conf is applying it on both the images. So I tried this instead,
INCOMPATIBLE_LICENSE_pn-foo="GPLv3"
But this also isn't working. Is there any other way for this?
NOTE : The recipes are image recipes, not packages
Can you try something like this

INCOMPATIBLE_LICENSE:pn-foo = "GPL-3.0* LGPL-3.0*"

Cheers,
Priyanshu Sharma
Re: binutils not compiling in my system (Ubuntu 18.04) #dunfell

Khem Raj
 

On 8/3/22 11:47 PM, Sethu Madhav wrote:
Hi
I am working on a custom board , which i develop bsp based on a poky(dunfell). Iam unable to build the basic core-image-minimal(with out adding any of our custom layers and beaglebone-yocto as MACHINE) and also our custom image(By Adding custom layers). Iam getting error during the do_compile stage of binutils.
Iam building this project on a Ubuntu 18.04 based machine . And one more thing is the same project is running on another machine with same OS. What iam missing in my machine . Any helps are appreciated  . Iam attaching both the error logs which built by adding our custom layers(iec61850ErrorLog_yocto ) and logs during the built of basic core-image-minimal(PokyErrorLog )
it seems to be emitting errors due to build system configuration, and I guess you are running in a VM, so can you check if you have enough RAM assigned to VM preferably ( 16G or more )
[layerindex-web][PATCH] admin.py: Remove has_delete_permission()

Robert Yang
 

The following commit has added on_delete=models.CASCADE to the ForeignKey:

===
commit 2d526f9b0d363f3e442abc97ef9bd9fab37ee5e4
Author: Amber Elliot <amber.n.elliot@...>
Date: Thu Jun 25 15:57:34 2020 -0700

Updating models and imports for Django 2.2 upgrade.
===

The on_delete=models.CASCADE will remove the objects which references the
removing objects, so there will be errors when removing a LayerBranch
with admin permissions:

===
Cannot delete layer branch
Deleting the selected layer branch would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:

Append
distro
===

This is because has_delete_permission() always return False, remove it to use
Django's implementation to fix the problem.

Signed-off-by: Robert Yang <liezhi.yang@...>
---
layerindex/admin.py | 17 -----------------
1 file changed, 17 deletions(-)

diff --git a/layerindex/admin.py b/layerindex/admin.py
index 9ed6102..f8b2f6e 100644
--- a/layerindex/admin.py
+++ b/layerindex/admin.py
@@ -102,8 +102,6 @@ class RecipeAdmin(admin.ModelAdmin):
return rofields
def has_add_permission(self, request, obj=None):
return False
- def has_delete_permission(self, request, obj=None):
- return False

class PackageConfigAdmin(admin.ModelAdmin):
search_fields = ['feature', 'recipe__pn']
@@ -132,8 +130,6 @@ class ClassicRecipeAdmin(admin.ModelAdmin):
return rofields
def has_add_permission(self, request, obj=None):
return False
- def has_delete_permission(self, request, obj=None):
- return False

class MachineAdmin(admin.ModelAdmin):
search_fields = ['name']
@@ -141,8 +137,6 @@ class MachineAdmin(admin.ModelAdmin):
readonly_fields = [f.name for f in Machine._meta.get_fields()]
def has_add_permission(self, request, obj=None):
return False
- def has_delete_permission(self, request, obj=None):
- return False

class DistroAdmin(admin.ModelAdmin):
search_fields = ['name']
@@ -150,9 +144,6 @@ class DistroAdmin(admin.ModelAdmin):
readonly_fields = [f.name for f in Distro._meta.get_fields()]
def has_add_permission(self, request, obj=None):
return False
- def has_delete_permission(self, request, obj=None):
- return False
-

class BBAppendAdmin(admin.ModelAdmin):
search_fields = ['filename']
@@ -160,8 +151,6 @@ class BBAppendAdmin(admin.ModelAdmin):
readonly_fields = [f.name for f in BBAppend._meta.get_fields()]
def has_add_permission(self, request, obj=None):
return False
- def has_delete_permission(self, request, obj=None):
- return False

class BBClassAdmin(admin.ModelAdmin):
search_fields = ['name']
@@ -169,8 +158,6 @@ class BBClassAdmin(admin.ModelAdmin):
readonly_fields = [f.name for f in BBClass._meta.get_fields()]
def has_add_permission(self, request, obj=None):
return False
- def has_delete_permission(self, request, obj=None):
- return False

class PatchAdmin(admin.ModelAdmin):
search_fields = ['path']
@@ -178,8 +165,6 @@ class PatchAdmin(admin.ModelAdmin):
readonly_fields = [f.name for f in Patch._meta.get_fields()]
def has_add_permission(self, request, obj=None):
return False
- def has_delete_permission(self, request, obj=None):
- return False

class PatchDispositionAdmin(admin.ModelAdmin):
fields = ['patch', 'user', 'disposition', 'comment']
@@ -199,8 +184,6 @@ class IncFileAdmin(admin.ModelAdmin):
readonly_fields = [f.name for f in IncFile._meta.get_fields()]
def has_add_permission(self, request, obj=None):
return False
- def has_delete_permission(self, request, obj=None):
- return False

class RecipeChangeInline(admin.StackedInline):
model = RecipeChange
--
2.37.1
How to add INCOMPATIBLE_LICENSE only for one image? #bitbake #dunfell

Priyanshu Sharma
 

Hi,
 
I've two image recipes (foo.bb & bar.bb). I want to add INCOMPATIBLE_LICENSE="GPLv3" only in foo.bb & not bar.bb

Adding INCOMPATIBLE_LICENSE="GPLv3" in local.conf is applying it on both the images. So I tried this instead,

INCOMPATIBLE_LICENSE_pn-foo="GPLv3"
 
But this also isn't working. Is there any other way for this?
NOTE : The recipes are image recipes, not packages
 
Cheers,
Priyanshu Sharma
Binutils Error during compiling

sethu.m@...
 

Hi 

I am working on a custom board , which i develop bsp based on a poky(dunfell). Iam unable to build the basic core-image-minimal(with out adding any of our custom layers and beaglebone-yocto as MACHINE) and also our custom image(By Adding custom layers). Iam getting error during the do_compile stage of binutils. 
Iam building this project on a Ubuntu 18.04 based machine . And one more thing is the same project is running on another machine with same OS. What iam missing in my machine . Any helps are appreciated  . Iam attaching both the error logs which built by adding our custom layers(iec61850ErrorLog_yocto ) and logs during the built of basic core-image-minimal(PokyErrorLog )

?
PokyErrorLog
?
iec61850ErrorLog_yocto

binutils not compiling in my system (Ubuntu 18.04) #dunfell

sethu.m@...
 

Hi 

I am working on a custom board , which i develop bsp based on a poky(dunfell). Iam unable to build the basic core-image-minimal(with out adding any of our custom layers and beaglebone-yocto as MACHINE) and also our custom image(By Adding custom layers). Iam getting error during the do_compile stage of binutils. 
Iam building this project on a Ubuntu 18.04 based machine . And one more thing is the same project is running on another machine with same OS. What iam missing in my machine . Any helps are appreciated  . Iam attaching both the error logs which built by adding our custom layers(iec61850ErrorLog_yocto ) and logs during the built of basic core-image-minimal(PokyErrorLog )

?
iec61850ErrorLog_yocto
?
PokyErrorLog

error: package target-sdk-provides-dummy-1.0-r0.sdk_provides_dummy_target is intended for a different architecture

Ramon Fried <rfried.dev@...>
 

Hi.
I'm trying to add python3-pyelftools to SDK,
I added "nativesdk" to BBCLASSEXTEND and added "nativesdk-python3-pyelftools" to TOOLCHAIN_HOST_TASK.
When running bitbake -c populate_sdk results in the error: package target-sdk-provides-dummy-1.0-r0.sdk_provides_dummy_target is intended for a different architecture.
 
I used the same procedure to add different python dependency I need for the SDK and it worked, but for this specific Python package I get the error.
Anyone knows what it means ?
Thanks,
Ramon
Re: Getting Error while trying to run graphical yocto build image #yocto #linux #dunfell #qemu

Alexander Kanavin
 

You need to run runqemu inside a graphical X11 session (we do not
support pure wayland yet). Alternatively, use 'publicvnc' parameter,
and connect with a vnc client (e.g. tigervnc) to port 5900 on the
machine where runqemu runs.

Alex

On Mon, 8 Aug 2022 at 11:36, Nikita Gupta <nikitagupta2509@...> wrote:

Hello Everyone here,
I want to run the graphic image of qemux86-64 which I have built with yocto. When I am running command "runqemu qemux86-64" or "runqemu" or "runqemu core-image-minimal" I am getting the following error.

nikita@ubuntu:~/yocto/poky/build$ runqemu qemux86-64
runqemu - INFO - Running MACHINE=qemux86-64 bitbake -e ...
runqemu - INFO - Continuing with the following parameters:
KERNEL: [/home/nikita/yocto/poky/build/tmp/deploy/images/qemux86-64/bzImage--5.4.205+gitAUTOINC+aaaf9f090d_8a59dfded8-r0-qemux86-64-20220803111012.bin]
MACHINE: [qemux86-64]
FSTYPE: [ext4]
ROOTFS: [/home/nikita/yocto/poky/build/tmp/deploy/images/qemux86-64/core-image-minimal-qemux86-64-20220803111012.rootfs.ext4]
CONFFILE: [/home/nikita/yocto/poky/build/tmp/deploy/images/qemux86-64/core-image-minimal-qemux86-64-20220803111012.qemuboot.conf]

runqemu - INFO - Setting up tap interface under sudo
[sudo] password for nikita:
runqemu - INFO - Network configuration: ip=192.168.7.2::192.168.7.1:255.255.255.0
runqemu - INFO - Running /home/nikita/yocto/poky/build/tmp/work/x86_64-linux/qemu-helper-native/1.0-r1/recipe-sysroot-native/usr/bin/qemu-system-x86_64 -device virtio-net-pci,netdev=net0,mac=52:54:00:12:34:02 -netdev tap,id=net0,ifname=tap0,script=no,downscript=no -drive file=/home/nikita/yocto/poky/build/tmp/deploy/images/qemux86-64/core-image-minimal-qemux86-64-20220803111012.rootfs.ext4,if=virtio,format=raw -show-cursor -usb -device usb-tablet -object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0 -cpu core2duo -m 256 -serial mon:vc -serial null -kernel /home/nikita/yocto/poky/build/tmp/deploy/images/qemux86-64/bzImage--5.4.205+gitAUTOINC+aaaf9f090d_8a59dfded8-r0-qemux86-64-20220803111012.bin -append 'root=/dev/vda rw mem=256M ip=192.168.7.2::192.168.7.1:255.255.255.0 oprofile.timer=1 '

runqemu - ERROR - Failed to run qemu: Could not initialize SDL(x11 not available) - exiting

runqemu - INFO - Cleaning up
Set 'tap0' nonpersistent

Only solution I found on internet that i should run nographic image for this which has worked fine for me but my requirement is graphic image for this. Help me to find the solution to run graphic image for this. Your replies would be appreciated .
Getting Error while trying to run graphical yocto build image #yocto #linux #dunfell #qemu

Nikita Gupta
 

Hello Everyone here, 
I want to run the graphic image of qemux86-64 which I have built with yocto. When I am running command "runqemu qemux86-64" or "runqemu" or "runqemu core-image-minimal" I am getting the following error.

 
nikita@ubuntu:~/yocto/poky/build$ runqemu qemux86-64
runqemu - INFO - Running MACHINE=qemux86-64 bitbake -e ...
runqemu - INFO - Continuing with the following parameters:
KERNEL: [/home/nikita/yocto/poky/build/tmp/deploy/images/qemux86-64/bzImage--5.4.205+gitAUTOINC+aaaf9f090d_8a59dfded8-r0-qemux86-64-20220803111012.bin]
MACHINE: [qemux86-64]
FSTYPE: [ext4]
ROOTFS: [/home/nikita/yocto/poky/build/tmp/deploy/images/qemux86-64/core-image-minimal-qemux86-64-20220803111012.rootfs.ext4]
CONFFILE: [/home/nikita/yocto/poky/build/tmp/deploy/images/qemux86-64/core-image-minimal-qemux86-64-20220803111012.qemuboot.conf]

runqemu - INFO - Setting up tap interface under sudo
[sudo] password for nikita: 
runqemu - INFO - Network configuration: ip=192.168.7.2::192.168.7.1:255.255.255.0
runqemu - INFO - Running /home/nikita/yocto/poky/build/tmp/work/x86_64-linux/qemu-helper-native/1.0-r1/recipe-sysroot-native/usr/bin/qemu-system-x86_64 -device virtio-net-pci,netdev=net0,mac=52:54:00:12:34:02 -netdev tap,id=net0,ifname=tap0,script=no,downscript=no -drive file=/home/nikita/yocto/poky/build/tmp/deploy/images/qemux86-64/core-image-minimal-qemux86-64-20220803111012.rootfs.ext4,if=virtio,format=raw -show-cursor -usb -device usb-tablet -object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0   -cpu core2duo -m 256 -serial mon:vc -serial null -kernel /home/nikita/yocto/poky/build/tmp/deploy/images/qemux86-64/bzImage--5.4.205+gitAUTOINC+aaaf9f090d_8a59dfded8-r0-qemux86-64-20220803111012.bin -append 'root=/dev/vda rw  mem=256M ip=192.168.7.2::192.168.7.1:255.255.255.0 oprofile.timer=1 '

runqemu - ERROR - Failed to run qemu: Could not initialize SDL(x11 not available) - exiting

runqemu - INFO - Cleaning up
Set 'tap0' nonpersistent

Only solution I found on internet that i should run nographic image for this which has worked fine for me but my requirement is graphic image for this. Help me to find the solution to run graphic image for this. Your replies would be appreciated .
[meta-zephyr][PATCH 3/3] zephyr-kernel: Checkout zephyr in subdir to match West usage

Peter Hoyes
 

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
[meta-zephyr][PATCH 2/3] zephyr-kernel: Use ZEPHYR_BASE in all application recipes

Peter Hoyes
 

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
[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
Re: Custom QA Checks

Alexander Kanavin
 

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

On Sun, 7 Aug 2022 at 21:21, Paul Wicks <pwicks86@...> wrote:

Is it possible to create additional QA checks such that they apply to all recipes automatically? Or even just to all recipes in a given layer?

-Paul Wicks
[meta-cgl][PATCH] resource-agents: Bug fix.

leimaohui
 

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
Custom QA Checks

Paul Wicks
 

Is it possible to create additional QA checks such that they apply to all recipes automatically? Or even just to all recipes in a given layer?

-Paul Wicks
Re: [Need help] How to add one package to build directory of another package

Alex Kiernan
 

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
Re: [Need help] How to add one package to build directory of another package

Kuzemko Aleksandr
 

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
1281 - 1300 of 59038