|
[meta-hardening][PATCH] meta-hardening: Fix override syntax
Akshay Bhat
Commit 352e6498a missed updating the override syntax for the
"harden" distro override. Fixes: 352e6498a ("meta-hardening: Convert to new override syntax") Signed-off-by: Akshay Bhat <akshay.bhat@...> --- .../recipes-connectivity/openssh/openssh_%.bbappend | 2 +- .../recipes-core/base-files/base-files_%.bbappend | 2 +- .../recipes-core/initscripts/initscripts_1.0.bbappend | 6 +++--- meta-hardening/recipes-extended/shadow/shadow_%.bbappend | 2 +- meta-hardening/recipes-extended/sudo/sudo_%.bbappend | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/meta-hardening/recipes-connectivity/openssh/openssh_%.bbappend b/meta-hardening/recipes-connectivity/openssh/openssh_%.bbappend index 17c06ed..e192d3d 100644 --- a/meta-hardening/recipes-connectivity/openssh/openssh_%.bbappend +++ b/meta-hardening/recipes-connectivity/openssh/openssh_%.bbappend @@ -1,4 +1,4 @@ -do_install:append_harden () { +do_install:append:harden () { # to hardend sed -i -e 's:#AllowTcpForwarding yes:AllowTcpForwarding no:' ${D}${sysconfdir}/ssh/sshd_config sed -i -e 's:ClientAliveCountMax 4:ClientAliveCountMax 2:' ${D}${sysconfdir}/ssh/sshd_config diff --git a/meta-hardening/recipes-core/base-files/base-files_%.bbappend b/meta-hardening/recipes-core/base-files/base-files_%.bbappend index 0f0384f..4710b49 100644 --- a/meta-hardening/recipes-core/base-files/base-files_%.bbappend +++ b/meta-hardening/recipes-core/base-files/base-files_%.bbappend @@ -1,4 +1,4 @@ -do_install:append_harden () { +do_install:append:harden () { sed -i 's/umask.*/umask 027/g' ${D}/${sysconfdir}/profile } diff --git a/meta-hardening/recipes-core/initscripts/initscripts_1.0.bbappend b/meta-hardening/recipes-core/initscripts/initscripts_1.0.bbappend index b27dee9..92e364c 100644 --- a/meta-hardening/recipes-core/initscripts/initscripts_1.0.bbappend +++ b/meta-hardening/recipes-core/initscripts/initscripts_1.0.bbappend @@ -1,8 +1,8 @@ -FILESEXTRAPATHS:prepend_harden := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend:harden := "${THISDIR}/files:" -SRC_URI:append_harden = " file://mountall.sh" +SRC_URI:append:harden = " file://mountall.sh" -do_install:append_harden() { +do_install:append:harden() { install -d ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/mountall.sh ${D}${sysconfdir}/init.d } diff --git a/meta-hardening/recipes-extended/shadow/shadow_%.bbappend b/meta-hardening/recipes-extended/shadow/shadow_%.bbappend index 3058b55..793a075 100644 --- a/meta-hardening/recipes-extended/shadow/shadow_%.bbappend +++ b/meta-hardening/recipes-extended/shadow/shadow_%.bbappend @@ -1,4 +1,4 @@ -do_install:append_harden () { +do_install:append:harden () { # to hardend sed -i -e 's:UMASK.*:UMASK 027:' ${D}${sysconfdir}/login.defs sed -i -e 's:PASS_MAX_DAYS.*:PASS_MAX_DAYS 365:' ${D}${sysconfdir}/login.defs diff --git a/meta-hardening/recipes-extended/sudo/sudo_%.bbappend b/meta-hardening/recipes-extended/sudo/sudo_%.bbappend index 97c5f49..2860e8a 100644 --- a/meta-hardening/recipes-extended/sudo/sudo_%.bbappend +++ b/meta-hardening/recipes-extended/sudo/sudo_%.bbappend @@ -1,6 +1,6 @@ -PACKAGECONFIG:append_harden = " pam-wheel" -do_install:append_harden () { +PACKAGECONFIG:append:harden = " pam-wheel" +do_install:append:harden () { if [ "${@bb.utils.contains('DISABLE_ROOT', 'True', 'yes', 'no', d)}" = "yes" ]; then sed -i -e 's:root ALL=(ALL) ALL:#root ALL=(ALL) ALL:' ${D}${sysconfdir}/sudoers fi -- 2.25.1 |
|
|
|
[meta-tensorflow][PATCH] Update SRC_URI git default protocol
Changqing Li
From: Changqing Li <changqing.li@...>
Signed-off-by: Changqing Li <changqing.li@...> --- recipes-framework/tensorflow/keras_2.6.0.bb | 2 +- recipes-framework/tensorflow/tensorflow-estimator_2.6.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-framework/tensorflow/keras_2.6.0.bb b/recipes-framework/tensorflow/keras_2.6.0.bb index dc1a98d..ebb668d 100644 --- a/recipes-framework/tensorflow/keras_2.6.0.bb +++ b/recipes-framework/tensorflow/keras_2.6.0.bb @@ -3,7 +3,7 @@ DESCRIPTION = "TensorFlow Keras is an implementation of the Keras API that\ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=c573baaa40a28002a2d03d3e7e9bc583" -SRC_URI = "git://github.com/keras-team/keras.git;branch=r2.6 \ +SRC_URI = "git://github.com/keras-team/keras.git;branch=r2.6;protocol=https \ file://0001-customize-for-yocto.patch \ " diff --git a/recipes-framework/tensorflow/tensorflow-estimator_2.6.bb b/recipes-framework/tensorflow/tensorflow-estimator_2.6.bb index 910ca4d..83804af 100644 --- a/recipes-framework/tensorflow/tensorflow-estimator_2.6.bb +++ b/recipes-framework/tensorflow/tensorflow-estimator_2.6.bb @@ -3,7 +3,7 @@ learning programming." LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=01e86893010a1b87e69a213faa753ebd" -SRC_URI = "git://github.com/tensorflow/estimator.git;branch=r2.6 \ +SRC_URI = "git://github.com/tensorflow/estimator.git;branch=r2.6;protocol=https \ file://0001-customize-for-yocto.patch \ " SRCREV = "9a6c1260bbb468a013e39cf7d6f5af369cf2db2b" -- 2.17.1 |
|
|
|
[meta-anaconda][PATCH] Update SRC_URI git default branch
Changqing Li
From: Changqing Li <changqing.li@...>
Signed-off-by: Changqing Li <changqing.li@...> --- recipes-installer/python3-dasbus/python3-dasbus_1.6.bb | 2 +- recipes-installer/python3-productmd/python3-productmd_1.21.bb | 2 +- recipes-installer/python3-simpleline/python3-simpleline_1.3.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-installer/python3-dasbus/python3-dasbus_1.6.bb b/recipes-installer/python3-dasbus/python3-dasbus_1.6.bb index c42ab52..5b87391 100644 --- a/recipes-installer/python3-dasbus/python3-dasbus_1.6.bb +++ b/recipes-installer/python3-dasbus/python3-dasbus_1.6.bb @@ -4,7 +4,7 @@ SECTION = "devel" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://LICENSE;md5=1803fa9c2c3ce8cb06b4861d75310742" -SRC_URI = "git://github.com/rhinstaller/dasbus.git;protocol=https;" +SRC_URI = "git://github.com/rhinstaller/dasbus.git;protocol=https;branch=master" SRCREV = "63b22fe4a7b2f98739279b2a4c6107eebd8d5a58" S = "${WORKDIR}/git" diff --git a/recipes-installer/python3-productmd/python3-productmd_1.21.bb b/recipes-installer/python3-productmd/python3-productmd_1.21.bb index 98fd0de..8dcd434 100644 --- a/recipes-installer/python3-productmd/python3-productmd_1.21.bb +++ b/recipes-installer/python3-productmd/python3-productmd_1.21.bb @@ -6,7 +6,7 @@ SECTION = "devel" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://LICENSE;md5=768997ba510a952bef1775c50bc22b00" -SRC_URI = "git://github.com/release-engineering/productmd;protocol=https; \ +SRC_URI = "git://github.com/release-engineering/productmd;protocol=https;branch=master \ file://add-wrlinux-version-pattern.patch \ " SRCREV = "a8268944c8a6064697ccb4d24e52dc666ab03ed4" diff --git a/recipes-installer/python3-simpleline/python3-simpleline_1.3.bb b/recipes-installer/python3-simpleline/python3-simpleline_1.3.bb index dcf7e1d..651b9d0 100644 --- a/recipes-installer/python3-simpleline/python3-simpleline_1.3.bb +++ b/recipes-installer/python3-simpleline/python3-simpleline_1.3.bb @@ -6,7 +6,7 @@ SECTION = "devel" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=5f4f48e95324081879552f19cd16c54a" -SRC_URI = "git://github.com/rhinstaller/python-simpleline;protocol=https;" +SRC_URI = "git://github.com/rhinstaller/python-simpleline;protocol=https;branch=master" SRCREV = "1c21ffdeda9eed27e5ad8ec16aee467f8daecd50" S = "${WORKDIR}/git" inherit setuptools3 -- 2.17.1 |
|
|
|
Re: Building embedded app for host machine
On 2022-01-20 10:24, Mauro Ziliani via lists.yoctoproject.org wrote:
Hi all.Hi, Yes. Likely you just need to do: $ MACHINE=qemux86-64 bitbake your-image with the right configuration and then run it in docker. See below. There are at least three options depending on what your goal is. 1. use qemux86-64 with kvm support 2. maybe use oe-run-native? 3. as above, build for an intel MACHINE using the linux-dummy kernel. 1. use runqemu -- you might know about this already. This is how most testing for userspace in Yocto happens. The default target is qemux86-64 and you boot up a fill VM that can run graphics as well of course. See the docs or just run: $ runqemu help $ runqemu kvm graphics <other options> but you don't want the kernel overhead. 2. oe-run-native Let's deal with the idea of building the -native recipe even though I suspect it isn't the approach you should take. See: https://wiki.yoctoproject.org/wiki/Technical_FAQ#What_does_.22native.22_mean.3F and examples in oe-core such as: so for any recipe that inherits 'native', you can run: $ bitbake app-native Sometimes there problems with this aside from needing the full dependency tree to also support -native. There are lots of examples in oe-core of -native recipes: $ find meta -name "*native*bb" | wc -l 29 Consider quilt: $ bitbake m4-native ... $ bitbake quilt-native -c addto_recipe_sysroot $ oe-run-native quilt-native quilt Running bitbake -e quilt-native /usr/lib/python3.6/importlib/_bootstrap.py:219: ImportWarning: can't resolve package from __spec__ or __package__, falling back on __name__ and __path__ return f(*args, **kwds) Usage: quilt [--trace[=verbose]] [--quiltrc=XX] command [-h] ... quilt --version Commands are: add files import previous series annotate fold mail push setup ... And for 'fun' I checked that vim works too: $ oe-run-native vim-native vim.vim Anyway, that's just an example and it's really mainly suitable for simple command line apps in my opinion. I doubt, but haven't checked if any of the recipes in the meta-qt5 layer support being built as -native. 3. docker The option that makes sense to me is to specify your host system as the target MACHINE or just use qemux86-64 and build a container image as explained here: https://pretalx.com/media/oe-workshop-2020/submissions/AN87VC/resources/Building_Containers_with_OpenEmbedded__Cur_WqbQgmv.pdf Reading the pdf, it seems one can just set this in conf/local.conf: MACHINE = "qemux86-64" IMAGE_FSTYPES = "container" PREFERRED_PROVIDER_virtual/kernel = "linux-dummy" IMAGE_LINGUAS:append = " en-us" $ bitbake core-image-minimal copy the tarball to the system where you have docker working: laptop$ scp mybuilder:/path/to/build/tmp/deploy/images/qemux86-64/core-image-minimal-qemux86-64.tar.bz2 /tmp laptop$ docker import /tmp/core-image-minimal-qemux86-64.tar.bz2 core-image-minimal laptop$ docker run -it core-image-minimal /bin/sh sh-5.1# cat /etc/os-release ID=wrlinux NAME="Wind River Linux development" VERSION="10.22.03.0" VERSION_ID=10.22.03.0 PRETTY_NAME="Wind River Linux development 22.03" Note that I've done this in our WR Linux dev environment but it should just work for any recent Yocto distro. You can run just one X11 app using: laptop$ xhost + <-- lets anyone connect to your display so careful. laptop: docker run -it --rm --privileged --net=host \ --env="DISPLAY" \ --volume="$HOME/.Xauthority:/root/.Xauthority:rw" \ wrlinux-image-std-xfce \ /usr/bin/xfce4-terminal Careful that you don't inadvertently start a second display manager. That could really mess up your system input and force you to have to: $ docker ps $ docker kill <container-id> ;-) ../Randy Marketing: WR Linux uses this to make app containers easy: https://docs.windriver.com/bundle/Wind_River_Linux_Open_Virtualization_Features_Guide_LTS_21/page/xvn1630019013539.html Now i make this, building the same qt version for host machine, but outside yocto ring -- # Randy MacLeod # Wind River Linux |
|
|
|
Re: Alsa configuration error
Michael Opdenacker
Hi Mihir
On 1/20/22 11:28 AM, mihirdave36@... wrote: Hi Peter, I could reproduce your issue. I believe I built the system in the same way you did. An issue is that the kernel is built with CONFIG_SOUND=m CONFIG_SND=m ...plus other sound modules, but there are no such modules in the root filesystem (under /lib/modules/`uname -r`/kernel/). Something else probably needs to be tweaked. Another issue is that passing "audio" to runqemu fails: runqemu - ERROR - Failed to run qemu: qemu-system-x86_64: warning: '-soundhw ac97' is deprecated, please use '-device AC97' instead audio: warning: Using timer based audio emulation I've just proposed a patch for this one: https://lore.kernel.org/openembedded-core/20220120174222.1918081-1-michael.opdenacker@bootlin.com/T/#u Don't hesitate to use it! Cheers Michael. -- Michael Opdenacker, Bootlin Embedded Linux and Kernel engineering https://bootlin.com |
|
|
|
Minutes: Yocto Project Weekly Triage Meeting 1/20/2022
Trevor Gamblin
Wiki: https://wiki.yoctoproject.org/wiki/Bug_Triage Attendees: Bruce, Diane, Jate, Joshua, Márton, Michael,
Randy, Richard, Saul, Stephen, Steve, Tim, Trevor ARs: - Randy/Stephen to move Medium+ 3.5 unassigned bugs to M3 - Stephen to make a note about prelink for next week's status Notes:
- ~50% of AB workers have been switched to SSDs. Still too early to determine what effect they are having on failure rates Medium+ 3.5 Unassigned Enhancements/Bugs: 80 (Last week
78) AB Bugs: 76
(Last week 74)
|
|
|
|
Re: bbappend conditional check for advanced metadata (yocto-kernel-cache)?
Bruce Ashfield
On Thu, Jan 20, 2022 at 6:20 AM Matthias Klein
<matthias.klein@...> wrote: Presumably, the kernel recipe you are using inherits kernel-yocto, and that whatever recipe is using a defconfig isn't also putting the kernel-cache into the SRC_URI ? (or that kernel_features append wouldn't be an actual error). So we can run with that assumption. One option is to allow dangling kernel features, and you'll get a warning from a the missing feature (KERNEL_DANGLING_FEATURES_WARN_ONLY). But of course, you'll get a warning .. which may or may not be a bad thing :) Another is to make that append conditional based on something you can test. i.e. test for kernel-cache in the SRC_URI, and if present, do the append. Or you could test for the defconfig in the SRC_URI and don't do the append. There may be other options for this, but without all the details of the recipes, I can't say for sure. I have a few variations of that theme in meta-virtualization, since there's a broad range of kernel types supported (https://git.yoctoproject.org/meta-virtualization/tree/recipes-kernel/linux/linux-yocto_virtualization.inc). Cheers, Bruce
-- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II |
|
|
|
Building embedded app for host machine
Mauro Ziliani
Hi all.
I have this doubt. Is it possible the make a toolchain which can produce the same app for host machine? I try to explain my think. I produced an app for imx6dlsabresd with qt-5.6.2 using x86_64 as SDKMACHINE Can I make the same app with the same qt-5.6.2 but running directly on x86_64? Now i make this, building the same qt version for host machine, but outside yocto ring [I hope to be clear, mu english is terrible] Best regards, MZ |
|
|
|
Re: Installing only python .pyc files onto the image
#yocto
Mike Looijmans
Met vriendelijke groet / kind regards,
Mike Looijmans System Expert TOPIC Embedded Products B.V. Materiaalweg 4, 5681 RJ Best The Netherlands T: +31 (0) 499 33 69 69 E: mike.looijmans@... W: www.topic.nl Please consider the environment before printing this e-mail On 18-01-2022 06:29, Sam via lists.yoctoproject.org wrote: Was wondering if there was a way to edit the distitils3.bbclass or a similar file to only install the python .pyc files onto a yocto image?What works well in many recipes is to just move the source files into their own packages, e.g. PACKAGES =+ "${PN}-src" FILES_${PN}-src = "${mypythondir}/*.py" That removes the py files from the package, but still allows you to install the sources to target if you need them... If you don't want a "src" package, adding them to the "dbg" package also works okay. |
|
|
|
bbappend conditional check for advanced metadata (yocto-kernel-cache)?
Matthias Klein
Hello,
I would like to create a linux-%.bbappend file and add the following to it, for example:
KERNEL_FEATURES:append = " features/overlayfs/overlayfs.scc".
Works also for all kernels which use the advanced metadata. Unfortunately it leads to an error with a kernel which uses a defconfig. I would only enable the above line if the kernel uses the advanced metadata. Is this possible?
Many greetings, Matthias |
|
|
|
Re: Alsa configuration error
mihirdave36@...
Hi Peter,
After entering "aplay -l" I got message "aplay: device_list:274 : no soundcards found...". I am using virtual machine: VMware workstation with ubuntu 20.4.3 as a Linux host machine. Running Image: core-image-minimal using runqemu qemux86-64 nographic Thanks Mihir |
|
|
|
Re: Alsa configuration error
Peter Bergin
On 2022-01-20 07:05,
mihirdave36@... wrote:
recently tried to add ALSA support to core-image-minimal . by adding following lines into local.conf: MACHINE_FEATURES+="alsa" DISTRO_FEATURES+="alsa" CORE_IMAGE_EXTRA_INSTALL+="alsa-utils" but got error of which I have attached image. Check available sound cards in your system. 'aplay -L' It seems you have no suitable default one for speaker-test to use. If you have sound cards in your machine and want to point out another one that speaker-test shall use you can pass that as an argument. https://linux.die.net/man/1/speaker-test /Peter |
|
|
|
Alsa configuration error
mihirdave36@...
recently tried to add ALSA support to core-image-minimal . by adding following lines into local.conf: MACHINE_FEATURES+="alsa" DISTRO_FEATURES+="alsa" CORE_IMAGE_EXTRA_INSTALL+="alsa-utils" but got error of which I have attached image.
please guide me what should I do to solve it. 
|
|
|
|
Packages Missing from Deploy
Robert Joslyn
I’m testing migrating one of my dunfell builds to master in anticipation of the upcoming LTS, and there is a difference in how packages are populated into deploy that is causing me problems. My builds use a package feed, and the way I’ve been generating my package feed is to create a packagegroup recipe that RDEPENDS on all of the top level packages I want pulled into my feed. Then I’ll generate the packagefeed index and copy the content of tmp/deploy/ipk to the web server.
On dunfell, if I build a recipe like my packagegroup, the packages from that recipe and all recursive dependencies are populated into tmp/deploy/ipk. On master, only the packages from the specific recipe I built are populated into tmp/deploy/ipk, but none of the RDEPENDS. I’m using ipk, but the same behavior holds for rpm and deb. This can easily be seen with a simple poky checkout and build, for example on dunfell: $ bitbake curl $ find tmp/deploy/ipk -type f | wc -l 4691 And on master: $ bitbake curl $ find tmp/deploy/ipk -type f | wc -l 10 In this example of building curl, the only packages I get are from curl and ca-certificates. Is this expected behavior? Is there something I need to configure to get the same package generation as dunfell? Thanks, Robert |
|
|
|
Re: Honister broken WiFi communication
Hi JH,
On 1/18/22 5:45 PM, Jupiter wrote: Hi Rudolf,This would typically mean that you are actually connected to a wifi network but the interface did not receive a DHCP lease for the IP address. the 169.254. is local IPv4 IP address which the interface would typically get if the DHCP client times out. I could see WiFi information well, it is not a major problem, but theI don't think that this is a wpa_supplicant issue. However, you can use connmanctl to manually connect to a wifi network: $ connmanctl connmanctl> enable wifi connmanctl> scan wifi San completed for wifi connmanctl> services [service list follows] connmanctl> agent on Agent registered connmanctl> connect wifi_xxxxxx Agent RequestInput wifi_xxxxx Passphrase = [ Type=psk, Requirement=mandatory ] Passphrase? ******** Connected wifi_xxxxxx conmanctl> quit If that works the wifi authentication is OK. Only a wag on my side. Should be ok since the wifi driver is working.Did you install the regulatory database?Did you mean to enable CONFIG_CFG80211_INTERNAL_REGDB? No, I did not Well, ok then it looks like a dhcp issue. Did you attempt to set a static IP to test connectivity?What error messages are you seeing when attempting to connect to a WiFiNo error in connman, I don't think it is connman or wpa_supplicant Eventually it could be a router issue. Maybe the router blocks unknown devices? Are there anyone in oe-core and bitbake tested connman, wpa_supplicantHonestly, I don't think the issue is related to connman or wpa_supplicant at all but on the dhcp level. Thank you.-- Rudolf J Streif CEO/CTO ibeeto +1.855.442.3386 x700 |
|
|
|
Re: Red alert but apparently harmless setscene errors
Jose Quaresma
Hi, There are no problems with the concurrent connections. I'm more sure that the root cause is some bandwidth/connection limitation on the http YP mirror. Jose Michael Opdenacker <michael.opdenacker@...> escreveu no dia sexta, 14/01/2022 à(s) 19:16:
--
Best regards, José Quaresma |
|
|
|
Re: Minutes: Yocto Project Weekly Triage Meeting 1/6/2022
Joshua Watt
On Thu, Jan 6, 2022 at 10:22 AM Trevor Gamblin
<trevor.gamblin@...> wrote: Merged as 52d5f76f54eac384f9480dffe96df089d9ee8f33 in OE-core
|
|
|
|
Re: Invalid checksums for SRC_URI ignored?
Richard Purdie
On Wed, 2022-01-19 at 14:59 +0100, Michael Opdenacker wrote:
Peter, RossPersonally, I think where the checksums are present, we should check them regardless of url type though. I think I have an open bug related to this and the uninative fetching. Cheers, Richard |
|
|
|
[meta-zephyr][PATCH v4] README.txt: Document generate-zephyr-machine use
Eilís Ní Fhlannagáin
From: Eilís Ní Fhlannagáin <elizabeth.flanagan@...>
This commit just adds some documentation on how to use the machine generation recipe. Signed-off-by: Eilís Ní Fhlannagáin <elizabeth.flanagan@...> --- README.txt | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/README.txt b/README.txt index f3dda51..ec860fd 100644 --- a/README.txt +++ b/README.txt @@ -105,6 +105,22 @@ or $ MACHINE=qemu-nios2 bitbake zephyr-kernel-test-all -c testimage +Generating OE Machines based on Zephyr board definitions +======================================================== +We currently have a recipe called generate-zephry-machines which will go through +and attempt to create an OE machine conf file for every board in Zephyr. + +This is run via: + +MACHINE=qemu-x86 bitbake generate-zephyr-machines + +The output is then put in the normal deploy dir. This recipe is really only +useful for maintainers. There is currently no way to use the Zephyr board +definition in a single step build. So if you wish to regenerate those machines, +you will need to run the above, copy the conf files from the deploy dir to the +machine conf directory and then run your build. This shouldn't need to happen +often. + Contributing ============ -- 2.25.1 |
|
|
|
[meta-zephyr][PATCH v4] zephyr-kernel: Modify recipes to work with new -DZEPHYR_MODULES
Eilís Ní Fhlannagáin
From: Eilís Ní Fhlannagáin <elizabeth.flanagan@...>
Some of these recipes ended up overriding the ZEPHYR_MODULES we set elsewhere. As well, zephyr-lvgl tries to apply a patch we already apply. Signed-off-by: Eilís Ní Fhlannagáin <elizabeth.flanagan@...> --- .../zephyr-kernel/zephyr-coap-client.bb | 2 -- .../zephyr-kernel/zephyr-coap-server.bb | 2 -- .../zephyr-kernel/zephyr-echo-client.bb | 2 -- .../zephyr-kernel/zephyr-http-client.bb | 1 - .../recipes-kernel/zephyr-kernel/zephyr-lvgl.bb | 12 +----------- .../zephyr-kernel/zephyr-mqtt-publisher.bb | 2 -- .../zephyr-kernel/zephyr-openthread-echo-client.bb | 3 --- .../zephyr-kernel/zephyr-peripheral-esp.bb | 2 -- .../zephyr-kernel/zephyr-peripheral-hr.bb | 2 -- .../zephyr-kernel/zephyr-websocket-client.bb | 2 -- 10 files changed, 1 insertion(+), 29 deletions(-) diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-coap-client.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-coap-client.bb index 1c79dbe..d7ea837 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,5 +1,3 @@ include zephyr-sample.inc ZEPHYR_SRC_DIR = "${S}/samples/net/sockets/coap_client" - -ZEPHYR_MODULES:append = "\;${S}/modules/lib/mbedtls" diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-coap-server.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-coap-server.bb index 7100f96..dece67d 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,5 +1,3 @@ include zephyr-sample.inc ZEPHYR_SRC_DIR = "${S}/samples/net/sockets/coap_server" - -ZEPHYR_MODULES:append = "\;${S}/modules/lib/mbedtls" diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-echo-client.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-echo-client.bb index e7fcaab..53d1ef3 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,5 +1,3 @@ include zephyr-sample.inc ZEPHYR_SRC_DIR = "${S}/samples/net/sockets/echo_client" - -ZEPHYR_MODULES:append = "\;${S}/modules/lib/mbedtls" diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-http-client.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-http-client.bb index d06ad37..bf99bbd 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 @@ -2,4 +2,3 @@ include zephyr-sample.inc ZEPHYR_SRC_DIR = "${S}/samples/net/sockets/http_client" -ZEPHYR_MODULES:append = "\;${S}/modules/lib/mbedtls" 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 4f08fc7..efe2154 100644 --- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-lvgl.bb +++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-lvgl.bb @@ -1,18 +1,8 @@ include zephyr-sample.inc ZEPHYR_SRC_DIR = "${S}/samples/subsys/display/lvgl" -ZEPHYR_MODULES:append = "\;${S}/modules/lib/gui/lvgl\;${S}/modules/debug/segger" # TODO Once more machines and displays are supported, add a PACKAGECONFIG. EXTRA_OECMAKE:append =" -DSHIELD=adafruit_2_8_tft_touch_v2" -SRC_URI:append = " \ - file://0001-cmake-added-missing-file-ext-to.patch;patchdir=modules/lib/gui/lvgl \ - git://github.com/zephyrproject-rtos/segger.git;protocol=https;nobranch=1;destsuffix=git/modules/debug/segger;name=segger \ - git://github.com/zephyrproject-rtos/TraceRecorderSource.git;branch=zephyr;protocol=https;destsuffix=git/modules/debug/TraceRecorder;name=TraceRecorderSource \ -" - -SRCREV_segger = "3a52ab222133193802d3c3b4d21730b9b1f1d2f6" -SRCREV_TraceRecorderSource = "36c577727642457b0db7274298a4b96558374832" - -COMATIBLE_MACHINE = "(nrf52840dk-nrf52840)" +COMPATIBLE_MACHINE = "(nrf52840dk-nrf52840)" diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-mqtt-publisher.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-mqtt-publisher.bb index 02b3c16..c679798 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,5 +1,3 @@ include zephyr-sample.inc ZEPHYR_SRC_DIR = "${S}/samples/net/mqtt_publisher" - -ZEPHYR_MODULES:append = "\;${S}/modules/lib/mbedtls" diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-openthread-echo-client.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-openthread-echo-client.bb index 88922b8..b83c6b3 100644 --- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-openthread-echo-client.bb +++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-openthread-echo-client.bb @@ -2,9 +2,6 @@ include zephyr-sample.inc ZEPHYR_SRC_DIR = "${S}/samples/net/sockets/echo_client" -ZEPHYR_MODULES:append = "\;${S}/modules/lib/mbedtls" -ZEPHYR_MODULES:append = "\;${S}/modules/lib/openthread" - EXTRA_OECMAKE += "-DOVERLAY_CONFIG=overlay-ot.conf" # The overlay config and OpenThread itself imposes some specific requirements diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-peripheral-esp.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-peripheral-esp.bb index 045ea36..14655e5 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,5 +1,3 @@ include zephyr-sample.inc ZEPHYR_SRC_DIR = "${S}/samples/bluetooth/peripheral_esp" - -ZEPHYR_MODULES:append = "\;${S}/modules/crypto/tinycrypt" diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-peripheral-hr.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-peripheral-hr.bb index 64fd0ec..53fc771 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,5 +1,3 @@ include zephyr-sample.inc ZEPHYR_SRC_DIR = "${S}/samples/bluetooth/peripheral_hr" - -ZEPHYR_MODULES:append = "\;${S}/modules/crypto/tinycrypt" diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-websocket-client.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-websocket-client.bb index 85f2cda..c2c47d0 100644 --- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-websocket-client.bb +++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-websocket-client.bb @@ -1,5 +1,3 @@ include zephyr-sample.inc ZEPHYR_SRC_DIR = "${S}/samples/net/sockets/websocket_client" - -ZEPHYR_MODULES:append = "\;${S}/modules/lib/mbedtls" -- 2.25.1 |
|
|