Date   

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.
please guide me what should I do to solve it.

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

Rudolf J Streif
 

Hi JH,

On 1/18/22 5:45 PM, Jupiter wrote:
Hi Rudolf,

Thanks for your response and comments.

If you run ifconfig -a does your WiFi interface show up? If not there is an
issue with the driver. Use dmesg and filter for the driver. Often a driver
cannot load the firmware. What is your WiFi hardware?
Not that bad, the WiFi interfaces was fine, but it could not get dhcp
response and IP address so an automatic private IP address 169.254 was
assigned

mlan0 Link encap:Ethernet HWaddr D4:CA:6E:A4:E8:B4
inet addr:169.254.193.101 Bcast:169.254.255.255 Mask:255.255.0.0
UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1
RX packets:2 errors:0 dropped:0 overruns:0 frame:0
TX packets:56 errors:0 dropped:0 overruns:0 carrier:0
collisions:0 txqueuelen:1000
RX bytes:330 (330.0 B) TX bytes:16392 (16.0 KiB)
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 the
subtle issues are connman and wpa_supplicant did not set up the WiFi
driver correctly.

Connected to 34:08:04:12:b1:a2 (on mlan0)
SSID: JupiterIoT
freq: 2437
RX: 660 bytes (4 packets)
TX: 46622 bytes (129 packets)
signal: -57 dBm
rx bitrate: 1.0 MBit/s
tx bitrate: 72.2 MBit/s MCS 7 short GI

bss flags: short-slot-time
dtim period: 1
beacon int: 100
I 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.

Did you install the regulatory database?
Did you mean to enable CONFIG_CFG80211_INTERNAL_REGDB? No, I did not
install it in the Zeus version either so I don't see that could be an
issue.
Only a wag on my side. Should be ok since the wifi driver is working.
What error messages are you seeing when attempting to connect to a WiFi
network? Did you look at the connman logs?
No error in connman, I don't think it is connman or wpa_supplicant
issue, my suspicion is something missing in Honister built image to
prevent connman and wpa_supplicant to set up the WiFi driver
correctly.

It is not the first time I have the WiFi setup trouble to get WiFi
169.254 address, when I upgraded from Thud to Zeus, I got the exactly
the same problem that WiFi was assigned by a 169.254 address, no dhcp
response, at time, I was totally convinced it was connman issue, I
spend several months to debug connman and wpa_supplicant without any
results, then after waiting several months to pull updated Zeus again,
that problem was disappeared miraculous, that is why I suspect the
same problem in oe-core and bitbake in Honister as well.
Well, ok then it looks like a dhcp issue. Did you attempt to set a static IP to test connectivity?

Eventually it could be a router issue. Maybe the router blocks unknown devices?

Are there anyone in oe-core and bitbake tested connman, wpa_supplicant
for the current Honister branch? I can help to test and to debug it if
more advanced people in oe-core, bitbake, kernel, WiFi driver mwifiex
can provide me more information.
Honestly, I don't think the issue is related to connman or wpa_supplicant at all but on the dhcp level.
Thank you.

Kind regards,

- jupiter
--
Rudolf J Streif
CEO/CTO ibeeto
+1.855.442.3386 x700


Re: Red alert but apparently harmless setscene errors

Jose Quaresma
 

Hi,

I have tested the state mirror locally with my own http mirror and it works perfectly.
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:


On 1/13/22 10:53 PM, Richard Purdie wrote:
> On Thu, 2022-01-13 at 19:37 +0100, Michael Opdenacker wrote:
>> Hi Jose,
>>
>> Thanks for your advice!
>>
>> On 1/13/22 6:37 PM, Jose Quaresma wrote:
>>> Hi,
>>>
>>> I've seen the same for some time now when building core-image-minimal
>>> with yocto state mirror and hashequiv servers.
>>>
>>> After some investigation I think the root cause is some
>>> bandwidth/connection limitation on the http yocto mirror.
>>>
>>> Reducing the BB_NUMBER_THREADS="1" to a single core solves many of the
>>> fetch issues for me,
>>> my config is the default one with:
>>>
>>>   BB_NUMBER_THREADS="1"
>>>   SSTATE_MIRRORS = "file://.*
>>> http://sstate.yoctoproject.org/dev/PATH;downloadfilename=PATH
>>> <http://sstate.yoctoproject.org/dev/PATH;downloadfilename=PATH>"
>>>   BB_HASHSERVE_UPSTREAM = "typhoon.yocto.io:8687
>>> <http://typhoon.yocto.io:8687>"
>>
>> Oops, it seems you're right. I have the same SSTATE_MIRRORS and
>> BB_HASHSERVE_UPSTREAM settings as you do, and adding
>> BB_NUMBER_THREADS="1" makes the errors disappear.
>>
>> It seems I should file a bug about that. The error messages just mention
>> local paths, not remote ones, so it sounds like a local issue while it's
>> apparently not.
> That is useful to debug it but suggests there is an issue with concurrent
> connections to the YP server.
>
> I think we should have an open bug and get Michael Halstead's input on this.


Done: https://bugzilla.yoctoproject.org/show_bug.cgi?id=14690
Thanks for your advice.
Cheers
Michael.

--
Michael Opdenacker, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com



--
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@windriver.com> wrote:

Wiki: https://wiki.yoctoproject.org/wiki/Bug_Triage

Attendees: Alexandre, Joshua, Michael, Randy, Richard, Saul, Stephen, Steve, Tim, Trevor

ARs:

- Joshua to send a patch limiting the size of diffoscope output for reproducibility
Merged as 52d5f76f54eac384f9480dffe96df089d9ee8f33 in OE-core


Notes:

N/A

Medium+ 3.5 Unassigned Enhancements/Bugs: 75 (Last week 75)

Medium+ 3.99 Unassigned Enhancements/Bugs: 38 (Last week 38)

AB Bugs: 66 (Last week 70)


Re: Invalid checksums for SRC_URI ignored?

Richard Purdie
 

On Wed, 2022-01-19 at 14:59 +0100, Michael Opdenacker wrote:
Peter, Ross

On 1/19/22 1:56 PM, Peter Bergin wrote:
Hi,

On 2022-01-19 13:16, Michael Opdenacker wrote:
Greetings,

I reused a simple "hello" recipe and added a non-matching checksum to
it:

...
SRC_URI = "file://helloworld.c"
SRC_URI[md5sum] = "34f0efd76b4f18888888888833cdd129"
...

The rest of the recipe comes from
https://git.openembedded.org/openembedded-core/tree/meta-skeleton/recipes-skeleton/hello-single.


Why doesn't Bitbake stop, reporting that the checksum doesn't match the
source file?
Anyway, why does the recipe build without a checksum? Shouldn't
checksums be mandatory?
No they are not mandatory for all fetchers. They are only used for
content downloaded from non-local archives.
https://docs.yoctoproject.org/bitbake/bitbake-user-manual/bitbake-user-manual-fetching.html#the-download-fetch


https://github.com/openembedded/bitbake/blob/32180d5057c818a69987aada482e82acf3c72ef2/lib/bb/fetch2/__init__.py#L1268


^^ here you can see the selection of URI's that automatically needs a
checksum.

Thanks for your replies. This all makes perfect sense then.
Personally, 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@huawei.com>

This commit just adds some documentation on how to use the machine
generation recipe.

Signed-off-by: Eilís Ní Fhlannagáin <elizabeth.flanagan@huawei.com>
---
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@huawei.com>

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@huawei.com>
---
.../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


[meta-zephyr][PATCH v4] recipes-meta: Abuse CMake to create OE machine definitions

Eilís Ní Fhlannagáin
 

From: Eilís Ní Fhlannagáin <elizabeth.flanagan@huawei.com>

Trying to handwrite all the machine defintions in zephyr would be an
enormous task. This commit creates a patch to zephy which abuses cmake
to output machine definitions for OE.

Not all machines can be generated this way and meta will need to be in
COREBASE/meta. It's mainly a prototype tool at this point to be able to
add all the machines this patch can figure out to meta-zephyr-bsp.

The hope is at a future date we can use it to autogenerate all the
machines we can from zephyr and use them in meta-zephyr-bsp.

Signed-off-by: Eilís Ní Fhlannagáin <elizabeth.flanagan@huawei.com>
---
...xport-an-OpenEmbedded-machine-config.patch | 184 ++++++++++++++++++
.../meta/generate-zephyr-machines.bb | 45 +++++
2 files changed, 229 insertions(+)
create mode 100644 meta-zephyr-bsp/recipes-meta/meta/files/0001-zephyr-Export-an-OpenEmbedded-machine-config.patch
create mode 100644 meta-zephyr-bsp/recipes-meta/meta/generate-zephyr-machines.bb

diff --git a/meta-zephyr-bsp/recipes-meta/meta/files/0001-zephyr-Export-an-OpenEmbedded-machine-config.patch b/meta-zephyr-bsp/recipes-meta/meta/files/0001-zephyr-Export-an-OpenEmbedded-machine-config.patch
new file mode 100644
index 0000000..961fd8e
--- /dev/null
+++ b/meta-zephyr-bsp/recipes-meta/meta/files/0001-zephyr-Export-an-OpenEmbedded-machine-config.patch
@@ -0,0 +1,184 @@
+From 8f16c15ad4e791638928beaeace86feb44623569 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Eil=C3=ADs=20N=C3=AD=20Fhlannag=C3=A1in?=
+ <elizabeth.flanagan@huawei.com>
+Date: Mon, 18 Oct 2021 13:17:38 +0100
+Subject: [PATCH] zephyr: Export an OpenEmbedded machine config
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This commit abuses cmake to attempt to figure out the OE tune file
+required and automatically generates an OpenEmbedded machine definition.
+
+We're basically abusing the same mechanism zephyr uses to export
+Makefile build information. When using this, you will need to point
+to a layer with a conf/machine in it (most likely oe-core).
+
+For testing purposes, I generate the machine confs like so:
+
+rm -rf build/*;
+for x in `west boards`;
+do
+west build -d build/$x --cmake-only -b $x samples/hello_world -- \
+ -DCONFIG_OEMACHINE_EXPORTS=y \
+ -DMETA_OE_BASE:STRING="/home/pidge/poky/meta/";
+done
+
+Not upstreaming this as it's only really appropriate for our needs.
+
+Upstream-Status: Inappropriate [other]
+
+Signed-off-by: Eilís Ní Fhlannagáin <elizabeth.flanagan@huawei.com>
+---
+ CMakeLists.txt | 6 ++
+ Kconfig.zephyr | 5 ++
+ cmake/oemachine_exports/CMakeLists.txt | 107 +++++++++++++++++++++++++
+ 3 files changed, 118 insertions(+)
+ create mode 100644 cmake/oemachine_exports/CMakeLists.txt
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 242e30cd2e..b19a908f03 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1647,3 +1647,9 @@ add_subdirectory_ifdef(
+ CONFIG_MAKEFILE_EXPORTS
+ cmake/makefile_exports
+ )
++
++# Finally export all build flags from Zephyr
++add_subdirectory_ifdef(
++ CONFIG_OEMACHINE_EXPORTS
++ cmake/oemachine_exports
++ )
+diff --git a/Kconfig.zephyr b/Kconfig.zephyr
+index 42d2d163cf..16eacb4382 100644
+--- a/Kconfig.zephyr
++++ b/Kconfig.zephyr
+@@ -455,6 +455,11 @@ config MAKEFILE_EXPORTS
+ Generates a file with build information that can be read by
+ third party Makefile-based build systems.
+
++config OEMACHINE_EXPORTS
++ bool "Generate machine configs to be used by OpenEmbedded and the Yocto Project"
++ help
++ Generates a machine configureation for OpenEmbedded and the Yocto Project.
++
+ endmenu
+ endmenu
+
+diff --git a/cmake/oemachine_exports/CMakeLists.txt b/cmake/oemachine_exports/CMakeLists.txt
+new file mode 100644
+index 0000000000..8326f2271f
+--- /dev/null
++++ b/cmake/oemachine_exports/CMakeLists.txt
+@@ -0,0 +1,107 @@
++# Copyright (c) 2021 Huawei Inc.
++# SPDX-License-Identifier: Apache-2.0
++
++string(REPLACE _ - OE_BOARD ${BOARD})
++
++if("${ARCH}" STREQUAL "arm")
++ if(CONFIG_CPU_CORTEX_M0)
++ set(OE_TUNE tune-cortexm0)
++ elseif(CONFIG_CPU_CORTEX_M0PLUS)
++ set(OE_TUNE tune-cortexm0plus)
++ elseif(CONFIG_CPU_CORTEX_M1)
++ set(OE_TUNE tune-cortexm1)
++ elseif(CONFIG_CPU_CORTEX_M3)
++ set(OE_TUNE tune-cortexm3)
++ elseif(CONFIG_CPU_CORTEX_M4)
++ set(OE_TUNE tune-cortexm4)
++ elseif(CONFIG_CPU_CORTEX_M7)
++ set(OE_TUNE tune-cortexm7)
++ elseif(CONFIG_CPU_CORTEX_M23)
++ set(OE_TUNE tune-cortexm23)
++ elseif(CONFIG_CPU_CORTEX_M33)
++ if (CONFIG_ARMV8_M_DSP)
++ set(OE_TUNE tune-cortexm33)
++ else()
++ set(OE_TUNE tune-cortexm33plusnodsp)
++ endif()
++ elseif(CONFIG_CPU_CORTEX_M55)
++ if (CONFIG_ARMV8_M_DSP)
++ set(OE_TUNE tune-cortexm55)
++ else()
++ set(OE_TUNE tune-cortexm55plusnodsp)
++ endif()
++ elseif(CONFIG_CPU_CORTEX_R4)
++ set(OE_TUNE tune-cortexr4)
++ elseif(CONFIG_CPU_CORTEX_R5)
++ set(OE_TUNE tune-cortexr5)
++ elseif(CONFIG_CPU_CORTEX_R7)
++ set(OE_TUNE tune-cortexr7)
++ else()
++ message(FATAL_ERRORO "We currently do not support outputting build configuration for machines without GCC_M_CPU" )
++ endif()
++elseif("${ARCH}" STREQUAL "arm64")
++ if(CONFIG_CPU_CORTEX_A53)
++ set(OE_TUNE tune-cortexa53)
++ elseif(CONFIG_CPU_CORTEX_A72)
++ set(OE_TUNE tune-cortexa72)
++ elseif(CONFIG_CPU_CORTEX_R82)
++ set(OE_TUNE arch-armv8a)
++ endif()
++elseif("${ARCH}" STREQUAL "arc")
++ set(OE_TUNE tune-arc)
++elseif("${ARCH}" STREQUAL "x86")
++ if(CONFIG_X86_64)
++ set(OE_TUNE tune-core2)
++ set(DEFAULT_TUNE core2-64)
++ else()
++ set(OE_TUNE tune-corei7)
++ set(DEFAULT_TUNE core2-32)
++ endif()
++elseif("${ARCH}" STREQUAL "nios2")
++ set(OE_TUNE tune-nios2)
++else()
++ message(FATAL_ERRORO "We currently do not support outputting build configuration for ${ARCH}" )
++endif()
++
++if("${ARCH}" STREQUAL "arm")
++ if (NOT DEFAULT_TUNE)
++ string(REPLACE "tune-" "" DEFAULT_TUNE ${OE_TUNE})
++ endif()
++endif()
++
++string (REPLACE ";" "\n" MACHINE_OVERRIDES "${MACHINE_OVERRIDES}")
++
++execute_process(
++ COMMAND bash "-c" "cd ${META_OE_BASE}; find . -name ${OE_TUNE}.inc"
++ OUTPUT_VARIABLE OE_REQUIRES
++ OUTPUT_STRIP_TRAILING_WHITESPACE)
++
++if(OE_REQUIRES)
++ string(REPLACE "./" "require conf/machine/" OE_REQUIRES ${OE_REQUIRES})
++else()
++ message(FATAL_ERRORO "We were unable to find a tuning for this board. # GCC_M_CPU: ${GCC_M_CPU}\n# ARCH: ${ARCH}\n# BOARD: ${BOARD}\n" )
++endif()
++
++if(DEFAULT_TUNE)
++ set(DEFAULT_TUNE_STR "DEFAULTUNE ?= \"${DEFAULT_TUNE}\"")
++endif()
++
++set(exports
++"#@TYPE: Machine
++#@NAME: ${OE_BOARD}
++#@DESCRIPTION: Machine configuration for ${OE_BOARD} ${BUILD_VERSION_STR}
++#
++# This file is autogenerated.
++
++${OE_REQUIRES}
++
++ARCH:${OE_BOARD} = \"${ARCH}\"
++
++${DEFAULT_TUNE_STR}
++"
++ )
++
++file(GENERATE
++ OUTPUT ${CMAKE_BINARY_DIR}/${OE_BOARD}.conf
++ CONTENT "${exports}"
++)
+--
+2.25.1
+
diff --git a/meta-zephyr-bsp/recipes-meta/meta/generate-zephyr-machines.bb b/meta-zephyr-bsp/recipes-meta/meta/generate-zephyr-machines.bb
new file mode 100644
index 0000000..b93aa92
--- /dev/null
+++ b/meta-zephyr-bsp/recipes-meta/meta/generate-zephyr-machines.bb
@@ -0,0 +1,45 @@
+# SPDX-FileCopyrightText: Huawei Inc.
+# SPDX-License-Identifier: Apache-2.0
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
+
+ZEPHYR_INHERIT_CLASSES += "zephyr cmake"
+
+inherit ${ZEPHYR_INHERIT_CLASSES}
+
+require recipes-kernel/zephyr-kernel/zephyr-sample.inc
+
+SRC_URI:append = "file://0001-zephyr-Export-an-OpenEmbedded-machine-config.patch"
+
+ZEPHYR_SRC_DIR = "${S}/samples/hello_world"
+
+OECMAKE_SOURCEPATH = "${ZEPHYR_SRC_DIR}"
+
+OECMAKE_GENERATOR_ARGS += "-c"
+
+# This is a bad assumption, but for now, it's what we have to find the meta-oe directory
+MACHINE_TUNINGS ?= "${COREBASE}/meta/conf/machine"
+
+EXTRA_WEST += "-DCONFIG_OEMACHINE_EXPORTS=y -DMETA_OE_BASE:STRING='${MACHINE_TUNINGS}'"
+
+DEPENDS += "west-native"
+
+do_compile() {
+ cd ${S}
+ for machine in $(west boards);
+ do
+ bbnote "Generating $machine"
+ rm -rf {B}/$machine
+ west build -d ${B}/$machine --cmake-only -b $machine samples/hello_world -- \
+ ${EXTRA_WEST}|| bbwarn "$machine machine def failed";
+ done
+}
+
+do_deploy () {
+ cd ${S}
+ for machine in $(west boards);
+ do
+ oe_board_name=$(echo $machine|sed 's/_/-/g')
+ bbnote "Copying ${machine} to ${DEPLOY_DIR}"
+ install -D ${B}/$machine/$oe_board_name.conf ${DEPLOYDIR}/$oe_board_name.conf || bbwarn "No $oe_board_name.conf found. Skipping.";
+ done
+}
--
2.25.1


[meta-zephyr][PATCH v4] zephyr-kernel-src-2.6.1: Add dtc patch.

Eilís Ní Fhlannagáin
 

From: Eilís Ní Fhlannagáin <elizabeth.flanagan@huawei.com>

fd8bf397792d58280928d23686313a8da810485a should have also applied the
dtc.patch to the 2.6.1 kernel. This commits applies it, so both 2.7.1
and 2.6.1 work.

Signed-off-by: Eilís Ní Fhlannagáin <elizabeth.flanagan@huawei.com>
---
.../recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.6.1.inc | 1 +
1 file changed, 1 insertion(+)

diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.6.1.inc b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.6.1.inc
index e86a8d9..5306196 100644
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.6.1.inc
+++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.6.1.inc
@@ -50,4 +50,5 @@ SRC_URI:append = " \
file://0001-cmake-add-yocto-toolchain.patch \
file://0001-x86-fix-efi-binary-generation-issue-in-cross-compila.patch \
file://arduino-nano-33-ble-storage-partition.patch \
+ file://dtc.patch \
"
--
2.25.1


[meta-zephyr][PATCH v4] zephyr-kernel-src: Add complete zephyr source

Eilís Ní Fhlannagáin
 

From: Eilís Ní Fhlannagáin <elizabeth.flanagan@huawei.com>

Currently meta-zephyr only checks out a subset of the kernel source.
With the addition of being able to generate machine configs from
zephyr source, we need to be able to have the complete source if we
don't want things to break badly.

Signed-off-by: Eilís Ní Fhlannagáin <elizabeth.flanagan@huawei.com>
---
.../zephyr-kernel/zephyr-kernel-src-2.6.1.inc | 39 ++++++++++++-
.../zephyr-kernel/zephyr-kernel-src-2.7.1.inc | 57 +++++++++++++++++--
.../zephyr-kernel/zephyr-kernel-src.inc | 41 +++++++++++--
3 files changed, 125 insertions(+), 12 deletions(-)

diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.6.1.inc b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.6.1.inc
index ce5e067..e86a8d9 100644
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.6.1.inc
+++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.6.1.inc
@@ -1,14 +1,47 @@
SRCREV_FORMAT = "default_cmsis"
+SRCREV_default = "c8755e0b46bd9e171fae38adc1c614197b8ac2cd"
SRCREV_cmsis = "c3bd2094f92d574377f7af2aec147ae181aa5f8e"
-SRCREV_default = "2d6322d74aaac838ead46bfcba0db619cff4b534"
+SRCREV_atmel = "d17b7dd92d209b20bc1e15431d068edc29bf438d"
+SRCREV_altera = "23c1c1dd7a0c1cc9a399509d1819375847c95b97"
+SRCREV_canopennode = "468d350028a975b96563e58344de48281a0ab371"
+SRCREV_civetweb = "e6903b80c09d17cd1a8bb32e40080005558aad29"
+SRCREV_espressif = "22e757632677e3579e6f20bb9955fffb2e1b3e1c"
+SRCREV_fatfs = "1d1fcc725aa1cb3c32f366e0c53d7490d0fe1109"
+SRCREV_cypress = "81a059f21435bc7e315bccd720da5a9b615bbb50"
+SRCREV_infineon = "f1fa8241f8786198ba41155413243de36ed878a5"
+SRCREV_nordic = "574493fe29c79140df4827ab5d4a23df79d03681"
+SRCREV_openisa = "40d049f69c50b58ea20473bee14cf93f518bf262"
+SRCREV_nuvoton = "b4d31f33238713a568e23618845702fadd67386f"
+SRCREV_microchip = "b280eec5d3b1296b231117c1999bcd0269b6ecc4"
+SRCREV_silabs = "be39d4eebeddac6e18e9c0c3ba1b31ad1e82eaed"
+SRCREV_st = "b52fdbf4b62439be9fab9bb4bae9690a42d2fb14"
+SRCREV_stm32 = "f8ff8d25aa0a9e65948040c7b47ec67f3fa300df"
+SRCREV_ti = "3da6fae25fc44ec830fac4a92787b585ff55435e"
SRCREV_libmetal = "39d049d4ae68e6f6d595fce7de1dcfc1024fb4eb"
+SRCREV_quicklogic = "b3a66fe6d04d87fd1533a5c8de51d0599fcd08d0"
SRCREV_lvgl = "31acbaa36e9e74ab88ac81e3d21e7f1d00a71136"
SRCREV_mbedtls = "5765cb7f75a9973ae9232d438e361a9d7bbc49e7"
-SRCREV_nordic = "574493fe29c79140df4827ab5d4a23df79d03681"
+SRCREV_mcuboot = "2fce9769b191411d580bbc65b043956c2ae9307e"
+SRCREV_mcumgr = "5c5055f5a7565f8152d75fcecf07262928b4d56e"
+SRCREV_net-tools = "f49bd1354616fae4093bf36e5eaee43c51a55127"
+SRCREV_nxp = "0d11138724959e1162777d9206f841ccdf64348e"
SRCREV_open-amp = "6010f0523cbc75f551d9256cf782f173177acdef"
+SRCREV_loramac-node = "2cee5f7295ff0ff804bf06fea5de006bc7cd121e"
SRCREV_openthread = "385e19da1ae15f27872c2543b97276a42f102ead"
-SRCREV_stm32 = "f8ff8d25aa0a9e65948040c7b47ec67f3fa300df"
+SRCREV_segger = "3a52ab222133193802d3c3b4d21730b9b1f1d2f6"
+SRCREV_sof = "779f28ed465c03899c8a7d4aaf399856f4e51158"
+SRCREV_tinycbor = "40daca97b478989884bffb5226e9ab73ca54b8c4"
SRCREV_tinycrypt = "3e9a49d2672ec01435ffbf0d788db6d95ef28de0"
+SRCREV_littlefs = "9e4498d1c73009acd84bb36036ee5e2869112a6c"
+SRCREV_mipi-sys-t = "75e671550ac1acb502f315fe4952514dc73f7bfb"
+SRCREV_nrf_hw_models = "a47e326ca772ddd14cc3b9d4ca30a9ab44ecca16"
+SRCREV_TraceRecorder = "5b5f8d7adbf0e93a09087e8f5708f0eebb8b25bf"
+SRCREV_xtensa = "2f04b615cd5ad3a1b8abef33f9bdd10cc1990ed6"
+SRCREV_edtt = "7dd56fc100d79cc45c33d43e7401d1803e26f6e7"
+SRCREV_tfm = "e18b7a9b040b5b5324520388047c9e7d678447e6"
+SRCREV_tfm-mcuboot = "4aa516e7281fc6f9a2dce0b0efda9acc580fa254"
+SRCREV_nanopb = "d148bd26718e4c10414f07a7eb1bd24c62e56c5d"
+SRCREV_tensorflow = "dc70a45a7cc12c25726a32cd91b28be59e7bc596"

ZEPHYR_BRANCH = "v2.6-branch"
PV = "2.6.1+git${SRCPV}"
diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.7.1.inc b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.7.1.inc
index 9d31c69..e090234 100644
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.7.1.inc
+++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.7.1.inc
@@ -1,14 +1,63 @@
SRCREV_FORMAT = "default_cmsis"
-SRCREV_cmsis = "b0612c97c1401feeb4160add6462c3627fe90fc7"
+
+# These repositories are specific to post-2.6 branches
+
+SRC_URI += "\
+ git://github.com/zephyrproject-rtos/hal_telink.git;protocol=https;nobranch=1;destsuffix=git/modules/hal/telink;name=telink \
+ git://github.com/zephyrproject-rtos/lz4.git;protocol=https;nobranch=1;destsuffix=git/modules/lib/lz4;name=lz4 \
+ git://github.com/zephyrproject-rtos/tflite-micro.git;protocol=https;nobranch=1;destsuffix=git/modules/lib/tflite-micro;name=tflite-micro \
+ "
+
+#
+# Generated from:
+# west forall -c 'x=$(filename `pwd`); rev=$(git rev-parse HEAD); \
+# echo SRCREV_$x = \"$rev\"'
+#
+
SRCREV_default = "e4da3e528088a34a9989f5a50e7ed3149d57de92"
+SRCREV_canopennode = "f167efe85c8c7de886f1bc47f9173cfb8a346bb5"
+SRCREV_civetweb = "094aeb41bb93e9199d24d665ee43e9e05d6d7b1c"
+SRCREV_cmsis = "b0612c97c1401feeb4160add6462c3627fe90fc7"
+SRCREV_edtt = "31badfbbd04f2948e3df6ebf329f930317550961"
+SRCREV_fatfs = "94fcd6bfb3801ac0a5e12ea2f52187e0a688b90e"
+SRCREV_altera = "23c1c1dd7a0c1cc9a399509d1819375847c95b97"
+SRCREV_atmel = "9f78f520f6cbb997e5b44fe8ab17dd5bf2448095"
+SRCREV_cypress = "81a059f21435bc7e315bccd720da5a9b615bbb50"
+SRCREV_espressif = "3400257534944d3a6a4194d1dbf8f0cd1670d64e"
+SRCREV_infineon = "f1fa8241f8786198ba41155413243de36ed878a5"
+SRCREV_microchip = "870d05e6a64ea9548da6b907058b03c8c9420826"
+SRCREV_nordic = "a6e5299041f152da5ae0ab17b2e44e088bb96d6d"
+SRCREV_nuvoton = "b4d31f33238713a568e23618845702fadd67386f"
+SRCREV_nxp = "78efc4ba7c1057c1cf2bf06e3e27ed7cc33e1da7"
+SRCREV_openisa = "40d049f69c50b58ea20473bee14cf93f518bf262"
+SRCREV_quicklogic = "b3a66fe6d04d87fd1533a5c8de51d0599fcd08d0"
+SRCREV_silabs = "be39d4eebeddac6e18e9c0c3ba1b31ad1e82eaed"
+SRCREV_st = "575de9d461aa6f430cf62c58a053675377e700f3"
+SRCREV_stm32 = "5c8275071ec1cf160bfe8c18bbd9330a7d714dc8"
+SRCREV_telink = "ffcfd6282aa213f1dc0848dbca6279b098f6b143"
+SRCREV_ti = "1992a4c536554c4f409c36896eda6abdc414d277"
+SRCREV_xtensa = "6e1cf3c483e87df4888e87c5396b4534570f01af"
SRCREV_libmetal = "39d049d4ae68e6f6d595fce7de1dcfc1024fb4eb"
-SRCREV_lvgl = "31acbaa36e9e74ab88ac81e3d21e7f1d00a71136"
+SRCREV_littlefs = "9e4498d1c73009acd84bb36036ee5e2869112a6c"
+SRCREV_loramac-node = "12019623bbad9eb54fe51066847a7cbd4b4eac57"
+SRCREV_lvgl = "783c1f78c8e39751fe89d0883c8bce7336f55e94"
+SRCREV_lz4 = "8e303c264fc21c2116dc612658003a22e933124d"
SRCREV_mbedtls = "5765cb7f75a9973ae9232d438e361a9d7bbc49e7"
-SRCREV_nordic = "a6e5299041f152da5ae0ab17b2e44e088bb96d6d"
+SRCREV_mcuboot = "70bfbd21cdf5f6d1402bc8d0031e197222ed2ec0"
+SRCREV_mcumgr = "9ffebd5e92d9d069667b9af2a3a028f4a033cfd3"
+SRCREV_mipi-sys-t = "75e671550ac1acb502f315fe4952514dc73f7bfb"
+SRCREV_nanopb = "d148bd26718e4c10414f07a7eb1bd24c62e56c5d"
+SRCREV_net-tools = "f49bd1354616fae4093bf36e5eaee43c51a55127"
+SRCREV_nrf_hw_models = "a47e326ca772ddd14cc3b9d4ca30a9ab44ecca16"
SRCREV_open-amp = "6010f0523cbc75f551d9256cf782f173177acdef"
SRCREV_openthread = "5d706547ebcb0a85e11412bcd88e80e2af98c74d"
-SRCREV_stm32 = "5c8275071ec1cf160bfe8c18bbd9330a7d714dc8"
+SRCREV_segger = "3a52ab222133193802d3c3b4d21730b9b1f1d2f6"
+SRCREV_sof = "76feb11d1b8f425021b5691668af2250fee444ac"
+SRCREV_tflite-micro = "9156d050927012da87079064db59d07f03b8baf6"
+SRCREV_tinycbor = "40daca97b478989884bffb5226e9ab73ca54b8c4"
SRCREV_tinycrypt = "3e9a49d2672ec01435ffbf0d788db6d95ef28de0"
+SRCREV_TraceRecorder = "36c577727642457b0db7274298a4b96558374832"
+SRCREV_tfm = "c74be3890c9d975976fde1b1a3b2f5742bec34c0"

ZEPHYR_BRANCH = "v2.7-branch"
PV = "2.7.1+git${SRCPV}"
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 da1efea..60291ed 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
@@ -10,15 +10,46 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/files:"

SRC_URI = "\
git://github.com/zephyrproject-rtos/zephyr.git;protocol=https;branch=${ZEPHYR_BRANCH};name=default \
- git://github.com/zephyrproject-rtos/cmsis.git;protocol=https;nobranch=1;destsuffix=git/modules/cmsis;name=cmsis \
+ git://github.com/zephyrproject-rtos/canopennode.git;protocol=https;nobranch=1;destsuffix=git/modules/lib/canopennode;name=canopennode \
+ git://github.com/zephyrproject-rtos/civetweb.git;protocol=https;nobranch=1;destsuffix=git/modules/lib/civetweb;name=civetweb \
+ git://github.com/zephyrproject-rtos/cmsis.git;protocol=https;nobranch=1;destsuffix=git/modules/hal/cmsis;name=cmsis \
+ git://github.com/zephyrproject-rtos/edtt.git;protocol=https;nobranch=1;destsuffix=git/tools/edtt;name=edtt \
+ git://github.com/zephyrproject-rtos/fatfs.git;protocol=https;nobranch=1;destsuffix=git/modules/fs/fatfs;name=fatfs \
+ git://github.com/zephyrproject-rtos/hal_altera.git;protocol=https;nobranch=1;destsuffix=git/modules/hal/altera;name=altera \
+ git://github.com/zephyrproject-rtos/hal_atmel.git;protocol=https;nobranch=1;destsuffix=git/modules/hal/atmel;name=atmel \
+ git://github.com/zephyrproject-rtos/hal_cypress.git;protocol=https;nobranch=1;destsuffix=git/modules/hal/cypress;name=cypress \
+ git://github.com/zephyrproject-rtos/hal_espressif.git;protocol=https;nobranch=1;destsuffix=git/modules/hal/espressif;name=espressif \
+ git://github.com/zephyrproject-rtos/hal_infineon.git;protocol=https;nobranch=1;destsuffix=git/modules/hal/infineon;name=infineon \
+ git://github.com/zephyrproject-rtos/hal_microchip.git;protocol=https;nobranch=1;destsuffix=git/modules/hal/microchip;name=microchip \
git://github.com/zephyrproject-rtos/hal_nordic.git;protocol=https;nobranch=1;destsuffix=git/modules/hal/nordic;name=nordic \
- git://github.com/zephyrproject-rtos/hal_stm32.git;protocol=https;branch=main;destsuffix=git/modules/hal/stm32;name=stm32 \
+ git://github.com/zephyrproject-rtos/hal_nuvoton.git;protocol=https;nobranch=1;destsuffix=git/modules/hal/nuvoton;name=nuvoton \
+ git://github.com/zephyrproject-rtos/hal_nxp.git;protocol=https;nobranch=1;destsuffix=git/modules/hal/nxp;name=nxp \
+ git://github.com/zephyrproject-rtos/hal_openisa.git;protocol=https;nobranch=1;destsuffix=git/modules/hal/openisa;name=openisa \
+ git://github.com/zephyrproject-rtos/hal_quicklogic.git;protocol=https;nobranch=1;destsuffix=git/modules/hal/quicklogic;name=quicklogic \
+ git://github.com/zephyrproject-rtos/hal_silabs.git;protocol=https;nobranch=1;destsuffix=git/modules/hal/silabs;name=silabs \
+ git://github.com/zephyrproject-rtos/hal_st.git;protocol=https;nobranch=1;destsuffix=git/modules/hal/st;name=st \
+ git://github.com/zephyrproject-rtos/hal_stm32.git;protocol=https;nobranch=1;destsuffix=git/modules/hal/stm32;name=stm32 \
+ git://github.com/zephyrproject-rtos/hal_ti.git;protocol=https;nobranch=1;destsuffix=git/modules/hal/ti;name=ti \
+ git://github.com/zephyrproject-rtos/hal_xtensa.git;protocol=https;nobranch=1;destsuffix=git/modules/hal/xtensa;name=xtensa \
git://github.com/zephyrproject-rtos/libmetal.git;protocol=https;nobranch=1;destsuffix=git/modules/hal/libmetal;name=libmetal \
- git://github.com/zephyrproject-rtos/lvgl.git;branch=zephyr;protocol=https;destsuffix=git/modules/lib/gui/lvgl;name=lvgl \
- git://github.com/zephyrproject-rtos/mbedtls.git;protocol=https;nobranch=1;destsuffix=git/modules/lib/mbedtls;name=mbedtls \
+ git://github.com/zephyrproject-rtos/littlefs.git;protocol=https;nobranch=1;destsuffix=git/modules/fs/littlefs;name=littlefs \
+ git://github.com/zephyrproject-rtos/loramac-node.git;protocol=https;nobranch=1;destsuffix=git/modules/lib/loramac-node;name=loramac-node \
+ git://github.com/zephyrproject-rtos/lvgl.git;protocol=https;nobranch=1;destsuffix=git/modules/lib/gui/lvgl;name=lvgl \
+ git://github.com/zephyrproject-rtos/mbedtls.git;protocol=https;nobranch=1;destsuffix=git/modules/crypto/mbedtls;name=mbedtls \
+ git://github.com/zephyrproject-rtos/mcuboot.git;protocol=https;nobranch=1;destsuffix=git/bootloader/mcuboot;name=mcuboot \
+ git://github.com/zephyrproject-rtos/mcumgr.git;protocol=https;nobranch=1;destsuffix=git/modules/lib/mcumgr;name=mcumgr \
+ git://github.com/zephyrproject-rtos/mipi-sys-t.git;protocol=https;nobranch=1;destsuffix=git/modules/debug/mipi-sys-t;name=mipi-sys-t \
+ git://github.com/zephyrproject-rtos/nanopb.git;protocol=https;nobranch=1;destsuffix=git/modules/lib/nanopb;name=nanopb \
+ git://github.com/zephyrproject-rtos/net-tools.git;protocol=https;nobranch=1;destsuffix=git/tools/net-tools;name=net-tools \
+ git://github.com/zephyrproject-rtos/nrf_hw_models.git;protocol=https;nobranch=1;destsuffix=git/modules/bsim_hw_models/nrf_hw_models;name=nrf_hw_models \
git://github.com/zephyrproject-rtos/open-amp.git;protocol=https;nobranch=1;destsuffix=git/modules/lib/open-amp;name=open-amp \
- git://github.com/zephyrproject-rtos/openthread.git;protocol=https;nobranch=1;branch=zephyr;destsuffix=git/modules/lib/openthread;name=openthread \
+ git://github.com/zephyrproject-rtos/openthread.git;protocol=https;nobranch=1;destsuffix=git/modules/lib/openthread;name=openthread \
+ git://github.com/zephyrproject-rtos/segger.git;protocol=https;nobranch=1;destsuffix=git/modules/debug/segger;name=segger \
+ git://github.com/zephyrproject-rtos/sof.git;protocol=https;nobranch=1;destsuffix=git/modules/audio/sof;name=sof \
+ git://github.com/zephyrproject-rtos/tinycbor.git;protocol=https;nobranch=1;destsuffix=git/modules/lib/tinycbor;name=tinycbor \
git://github.com/zephyrproject-rtos/tinycrypt.git;protocol=https;nobranch=1;destsuffix=git/modules/crypto/tinycrypt;name=tinycrypt \
+ git://github.com/zephyrproject-rtos/TraceRecorderSource.git;protocol=https;nobranch=1;destsuffix=git/modules/debug/TraceRecorder;name=TraceRecorder \
+ git://github.com/zephyrproject-rtos/trusted-firmware-m.git;protocol=https;nobranch=1;destsuffix=git/modules/tee/tfm;name=tfm \
"
S = "${WORKDIR}/git"

--
2.25.1


[meta-zephyr][PATCH v4] zephyr.bbclass: Remove need for MACHINEOVERRIDES for ZEPHYR_MODULES

Eilís Ní Fhlannagáin
 

From: Eilís Ní Fhlannagáin <elizabeth.flanagan@huawei.com>

This commit removes the need for calling out ZEPHYR_MODULES via
MACHINEOVERRIDES. It uses west list to figure out what ZEPHYR_MODULES
are available and attaches them to -DZEPHYR_MODULES. Additional out of
tree modules may be added via ZEPHYR_EXTRA_MODULES.

Signed-off-by: Eilís Ní Fhlannagáin <elizabeth.flanagan@huawei.com>
---
.../conf/machine/include/nrf52.inc | 2 -
.../machine/include/stm32mp1-cortex-m4.inc | 3 --
meta-zephyr-core/classes/zephyr.bbclass | 42 +++++++++++++++++++
meta-zephyr-core/conf/layer.conf | 2 +
.../zephyr-kernel/zephyr-kernel-common.inc | 13 +++---
5 files changed, 49 insertions(+), 13 deletions(-)

diff --git a/meta-zephyr-bsp/conf/machine/include/nrf52.inc b/meta-zephyr-bsp/conf/machine/include/nrf52.inc
index d22f8bc..4162d3e 100644
--- a/meta-zephyr-bsp/conf/machine/include/nrf52.inc
+++ b/meta-zephyr-bsp/conf/machine/include/nrf52.inc
@@ -5,8 +5,6 @@

require conf/machine/include/tune-cortexm4.inc

-MACHINEOVERRIDES =. "nordic:"
-
TUNE_FEATURES = "armv7m cortexm4"

# Target type for this machine used by Pyocd
diff --git a/meta-zephyr-bsp/conf/machine/include/stm32mp1-cortex-m4.inc b/meta-zephyr-bsp/conf/machine/include/stm32mp1-cortex-m4.inc
index b82b02d..0d46620 100644
--- a/meta-zephyr-bsp/conf/machine/include/stm32mp1-cortex-m4.inc
+++ b/meta-zephyr-bsp/conf/machine/include/stm32mp1-cortex-m4.inc
@@ -5,7 +5,4 @@

require conf/machine/include/tune-cortexm4.inc

-# Include OpenAMP for communication with Cortex-A7 core of the SoC
-MACHINEOVERRIDES =. "stm32:openamp:"
-
TUNE_FEATURES = "armv7m cortexm4"
diff --git a/meta-zephyr-core/classes/zephyr.bbclass b/meta-zephyr-core/classes/zephyr.bbclass
index e1d3185..f3d16b7 100644
--- a/meta-zephyr-core/classes/zephyr.bbclass
+++ b/meta-zephyr-core/classes/zephyr.bbclass
@@ -1,4 +1,7 @@
inherit terminal
+inherit python3native
+
+PYTHONPATH="${STAGING_DIR_HOST}${libdir}/${PYTHON_DIR}/site-packages"

OE_TERMINAL_EXPORTS += "HOST_EXTRACFLAGS HOSTLDFLAGS TERMINFO CROSS_CURSES_LIB CROSS_CURSES_INC"
HOST_EXTRACFLAGS = "${BUILD_CFLAGS} ${BUILD_LDFLAGS}"
@@ -21,6 +24,45 @@ python () {
d.setVar('BOARD',board)
}

+do_get_zmods() {
+
+ export PYTHONPATH="${RECIPE_SYSROOT_NATIVE}/${libdir}/${PYTHON_DIR}/site-packages:${RECIPE_SYSROOT_NATIVE}/${libdir}/${PYTHON_DIR}"
+ cd ${S}
+
+ # I really dislike how tied in this is to west, but without reimplementing their script, this seems to be the
+ # easiest way to do this
+ rm -rf .west; mkdir .west
+ cat << EOF >> ${S}/.west/config
+[manifest]
+path = .
+file = west.yml
+EOF
+
+ # Because of how we structure things, we need to either structure this more like a west workspace or just tweak
+ # the manifest in order to get access to the west extentions like build and whatnot. Tweaking the manifest is the
+ # easier path here and minimizes the amount of breakage that might occur.
+
+ 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="${S}/$i\;${ZEPHYR_MODULES}"
+ done
+ export ZEPHYR_MODULES
+}
+
+do_get_zmods[nostamp] = "1"
+do_get_zmods[dirs] = "${B}"
+
+EXTRA_OECMAKE:append = " -DZEPHYR_MODULES=${ZEPHYR_MODULES}"
+
+addtask get_zmods after do_patch before do_configure
+do_get_zmods[depends] += "west-native:do_populate_sysroot"
+do_get_zmods[depends] += "python3-pyyaml-native:do_populate_sysroot"
+do_get_zmods[depends] += "python3-pykwalify-native:do_populate_sysroot"
+do_get_zmods[depends] += "python3-colorama-native:do_populate_sysroot"
+do_get_zmods[depends] += "python3-pyelftools-native:do_populate_sysroot"
+
python do_menuconfig() {
os.chdir(d.getVar('ZEPHYR_SRC_DIR', True))
configdir = d.getVar('ZEPHYR_SRC_DIR', True) + '/outdir/' + d.getVar('BOARD', True)
diff --git a/meta-zephyr-core/conf/layer.conf b/meta-zephyr-core/conf/layer.conf
index 4b1bf91..d3ac10e 100644
--- a/meta-zephyr-core/conf/layer.conf
+++ b/meta-zephyr-core/conf/layer.conf
@@ -18,3 +18,5 @@ LAYERDEPENDS_zephyrcore = "core meta-python"
LAYERSERIES_COMPAT_zephyrcore = "dunfell gatesgarth hardknott honister"

X86_TUNE_DIR = "${@bb.utils.contains('LAYERSERIES_CORENAMES', 'honister', 'include/x86', 'include', d)}"
+
+PYTHON3_NATIVE_SITEPACKAGES_DIR = "${libdir_native}/${PYTHON3_DIR}/site-packages"
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 5ae7504..e69ba3c 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
@@ -2,7 +2,6 @@

ZEPHYR_INHERIT_CLASSES += "zephyr cmake"
inherit ${ZEPHYR_INHERIT_CLASSES}
-inherit python3native

# There shouldn't be a manifest for zephyr kernels since there is no root
# filesystem.
@@ -24,19 +23,17 @@ EXTRA_OECMAKE = "\
-DZEPHYR_SYSROOT=${ZEPHYR_SYSROOT} \
-DZEPHYR_TOOLCHAIN_VARIANT=yocto \
-DEXTRA_CPPFLAGS=${CPPFLAGS} \
+ -DZEPHYR_MODULES=${ZEPHYR_MODULES} \
"

-ZEPHYR_MODULES = ""
-ZEPHYR_MODULES:append:arm = "\;${S}/modules/cmsis"
-ZEPHYR_MODULES:append:nordic = "\;${S}/modules/hal/nordic"
-ZEPHYR_MODULES:append:stm32 = "\;${S}/modules/hal/stm32"
-ZEPHYR_MODULES:append:openamp = "\;${S}/modules/lib/open-amp\;${S}/modules/hal/libmetal"
+ZEPHYR_EXTRA_MODULES = ""

-EXTRA_OECMAKE:append = " -DZEPHYR_MODULES=${ZEPHYR_MODULES}"
+EXTRA_OECMAKE:append = " -DZEPHYR_EXTRA_MODULES=${ZEPHYR_EXTRA_MODULES}"

export ZEPHYR_BASE="${S}"

-DEPENDS += "gperf-native python3-pyelftools-native python3-pyyaml-native python3-pykwalify-native"
+DEPENDS += "gperf-native"
+
CROSS_COMPILE = "${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}"

DEPENDS:append:qemuall = " qemu-native qemu-helper-native"
--
2.25.1


[meta-zephyr][PATCH v4] west: Add west and python dependencies

Eilís Ní Fhlannagáin
 

From: Eilís Ní Fhlannagáin <elizabeth.flanagan@huawei.com>

We will need west for a few things.

First, west knows about all the boards supported, so for automatic
machine generation, we will need to be able to run west boards.

Secondly, I want to get rid of the dependance on MACHINEOVERRIDES in
machine definition files. One of the things that drives me a bit mad
about how we're doing this is effort replication. Zephyr knows what the
machine is, and modules needed and includes. We shouldn't need to
replicate that effort. Future patches will address that through
automatic machine generation.

Signed-off-by: Eilís Ní Fhlannagáin <elizabeth.flanagan@huawei.com>
---
.../python/python3-anytree_2.8.0.bb | 14 ++++++++++++
.../python/python3-breathe_4.31.0.bb | 17 ++++++++++++++
.../python/python3-canopen_1.2.1.bb | 17 ++++++++++++++
.../python/python3-cbor_1.0.0.bb | 19 ++++++++++++++++
.../python/python3-colorama_0.4.4.bb | 16 --------------
.../python/python3-gitlint_0.15.1.bb | 14 ++++++++++++
.../python/python3-imgtool_1.7.2.bb | 14 ++++++++++++
.../python/python3-intelhex_2.3.0.bb | 12 ----------
.../python/python3-junithtml_30.0.4.bb | 14 ++++++++++++
.../python/python3-junitparser_2.1.1.bb | 14 ++++++++++++
.../python/python3-packaging_21.0.bb | 14 ++++++++++++
.../python/python3-pyelftools_0.27.bb | 14 ++++++++++++
.../python/python3-pygithub_1.55.bb | 14 ++++++++++++
.../python/python3-pygments_2.10.0.bb | 15 +++++++++++++
.../recipes-devtools/python/python3-pylink | 11 ++++++++++
.../python/python3-pyocd_0.32.0.bb | 14 ++++++++++++
.../python/python3-pyparsing_2.4.7.bb | 14 ++++++++++++
.../python/python3-sphinx_4.2.0.bb | 14 ++++++++++++
.../recipes-devtools/west/west_0.12.99.bb | 22 +++++++++++++++++++
19 files changed, 255 insertions(+), 28 deletions(-)
create mode 100644 meta-zephyr-core/recipes-devtools/python/python3-anytree_2.8.0.bb
create mode 100644 meta-zephyr-core/recipes-devtools/python/python3-breathe_4.31.0.bb
create mode 100644 meta-zephyr-core/recipes-devtools/python/python3-canopen_1.2.1.bb
create mode 100644 meta-zephyr-core/recipes-devtools/python/python3-cbor_1.0.0.bb
delete mode 100644 meta-zephyr-core/recipes-devtools/python/python3-colorama_0.4.4.bb
create mode 100644 meta-zephyr-core/recipes-devtools/python/python3-gitlint_0.15.1.bb
create mode 100644 meta-zephyr-core/recipes-devtools/python/python3-imgtool_1.7.2.bb
delete mode 100644 meta-zephyr-core/recipes-devtools/python/python3-intelhex_2.3.0.bb
create mode 100644 meta-zephyr-core/recipes-devtools/python/python3-junithtml_30.0.4.bb
create mode 100644 meta-zephyr-core/recipes-devtools/python/python3-junitparser_2.1.1.bb
create mode 100644 meta-zephyr-core/recipes-devtools/python/python3-packaging_21.0.bb
create mode 100644 meta-zephyr-core/recipes-devtools/python/python3-pyelftools_0.27.bb
create mode 100644 meta-zephyr-core/recipes-devtools/python/python3-pygithub_1.55.bb
create mode 100644 meta-zephyr-core/recipes-devtools/python/python3-pygments_2.10.0.bb
create mode 100644 meta-zephyr-core/recipes-devtools/python/python3-pylink
create mode 100644 meta-zephyr-core/recipes-devtools/python/python3-pyocd_0.32.0.bb
create mode 100644 meta-zephyr-core/recipes-devtools/python/python3-pyparsing_2.4.7.bb
create mode 100644 meta-zephyr-core/recipes-devtools/python/python3-sphinx_4.2.0.bb
create mode 100644 meta-zephyr-core/recipes-devtools/west/west_0.12.99.bb

diff --git a/meta-zephyr-core/recipes-devtools/python/python3-anytree_2.8.0.bb b/meta-zephyr-core/recipes-devtools/python/python3-anytree_2.8.0.bb
new file mode 100644
index 0000000..a19c998
--- /dev/null
+++ b/meta-zephyr-core/recipes-devtools/python/python3-anytree_2.8.0.bb
@@ -0,0 +1,14 @@
+# SPDX-FileCopyrightText: Huawei Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+SUMMARY = "Python anytree"
+DESCRIPTION = "Powerful and Lightweight Python Tree Data Structure"
+HOMEPAGE = "https://pypi.org/project/anytree"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
+
+inherit pypi setuptools3
+
+PYPI_PACKAGE = "anytree"
+SRC_URI[md5sum] = "25ef3e656ad16a2a6b6c187807da7e5f"
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-zephyr-core/recipes-devtools/python/python3-breathe_4.31.0.bb b/meta-zephyr-core/recipes-devtools/python/python3-breathe_4.31.0.bb
new file mode 100644
index 0000000..4389d20
--- /dev/null
+++ b/meta-zephyr-core/recipes-devtools/python/python3-breathe_4.31.0.bb
@@ -0,0 +1,17 @@
+# SPDX-FileCopyrightText: Huawei Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+SUMMARY = "Python breathe"
+DESCRIPTION = "Breathe is an extension to reStructuredText and Sphinx to be \
+ able to read and render Doxygen xml output."
+HOMEPAGE = "https://pypi.org/project/breathe"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=9e49eecf36fc015de7c61a0247df75d6"
+
+inherit pypi setuptools3
+
+DEPENDS = "python3-sphinx-native python3-docutils-native python3-pygments-native python3-babel-native python3-jinja2-native python3-distro-native"
+PYPI_PACKAGE = "breathe"
+SRC_URI[md5sum] = "33a86368215dbcb59e5c71687f6b228b"
+SRC_URI[sha256sum] = "925eeff96c6640cd857e4ddeae6f75464a1d5e2e08ee56dccce4043583ae2050"
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-zephyr-core/recipes-devtools/python/python3-canopen_1.2.1.bb b/meta-zephyr-core/recipes-devtools/python/python3-canopen_1.2.1.bb
new file mode 100644
index 0000000..0608199
--- /dev/null
+++ b/meta-zephyr-core/recipes-devtools/python/python3-canopen_1.2.1.bb
@@ -0,0 +1,17 @@
+# SPDX-FileCopyrightText: Huawei Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+SUMMARY = "Python canopen"
+DESCRIPTION = "A Python implementation of the CANopen standard. The aim of \
+ the project is to support the most common parts of the CiA \
+ 301 standard in a simple Pythonic interface."
+HOMEPAGE = "https://pypi.org/project/canopen"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=97f135a6ee6f800c377b5512122c7a8d"
+
+inherit pypi setuptools3
+
+PYPI_PACKAGE = "canopen"
+SRC_URI[md5sum] = "da37dcf725e774385f05f05e04ca54a0"
+SRC_URI[sha256sum] = "18d01d56ff0023795cb336cafd4810a76cf402b98b42139b201fa8c5d4ba8c06"
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-zephyr-core/recipes-devtools/python/python3-cbor_1.0.0.bb b/meta-zephyr-core/recipes-devtools/python/python3-cbor_1.0.0.bb
new file mode 100644
index 0000000..9e240f0
--- /dev/null
+++ b/meta-zephyr-core/recipes-devtools/python/python3-cbor_1.0.0.bb
@@ -0,0 +1,19 @@
+# SPDX-FileCopyrightText: Huawei Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+SUMMARY = "Python cbor"
+DESCRIPTION = "An implementation of RFC 7049 - Concise Binary Object \
+ Representation (CBOR). \
+ CBOR is comparable to JSON, has a superset of JSON’s ability, \
+ but serializes to a binary format which is smaller and faster \
+ to generate and parse."
+HOMEPAGE = "https://pypi.org/project/cbor"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://setup.cfg;md5=d86758afb08a60bc589dc67bfea670b2"
+
+inherit pypi setuptools3
+
+PYPI_PACKAGE = "cbor"
+SRC_URI[md5sum] = "22b03b59784fd78cb6c27aa498af0db6"
+SRC_URI[sha256sum] = "13225a262ddf5615cbd9fd55a76a0d53069d18b07d2e9f19c39e6acb8609bbb6"
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-zephyr-core/recipes-devtools/python/python3-colorama_0.4.4.bb b/meta-zephyr-core/recipes-devtools/python/python3-colorama_0.4.4.bb
deleted file mode 100644
index 67b8d52..0000000
--- a/meta-zephyr-core/recipes-devtools/python/python3-colorama_0.4.4.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-# SPDX-FileCopyrightText: Huawei Inc.
-# SPDX-License-Identifier: Apache-2.0
-
-SUMMARY = "Python colorama"
-HOMEPAGE = "https://pypi.org/project/colorama"
-DESCRIPTION = "Makes ANSI escape character sequences (for producing colored \
- terminal text and cursor positioning) work under MS Windows."
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b4936429a56a652b84c5c01280dcaa26"
-
-inherit pypi setuptools3
-
-PYPI_PACKAGE = "colorama"
-SRC_URI[md5sum] = "57b22f2597f63df051b69906fbf310cc"
-SRC_URI[sha256sum] = "5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b"
-BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-zephyr-core/recipes-devtools/python/python3-gitlint_0.15.1.bb b/meta-zephyr-core/recipes-devtools/python/python3-gitlint_0.15.1.bb
new file mode 100644
index 0000000..143e2cb
--- /dev/null
+++ b/meta-zephyr-core/recipes-devtools/python/python3-gitlint_0.15.1.bb
@@ -0,0 +1,14 @@
+# SPDX-FileCopyrightText: Huawei Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+SUMMARY = "Python gitlint"
+HOMEPAGE = "https://pypi.org/project/gitlint"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=2ddf75221dde30f107af8595a43b4009"
+
+inherit pypi setuptools3
+
+PYPI_PACKAGE = "gitlint"
+SRC_URI[md5sum] = "4835bedc50129934a47cf099d906d2ca"
+SRC_URI[sha256sum] = "4b22916dcbdca381244aee6cb8d8743756cfd98f27e7d1f02e78733f07c3c21c"
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-zephyr-core/recipes-devtools/python/python3-imgtool_1.7.2.bb b/meta-zephyr-core/recipes-devtools/python/python3-imgtool_1.7.2.bb
new file mode 100644
index 0000000..40d8176
--- /dev/null
+++ b/meta-zephyr-core/recipes-devtools/python/python3-imgtool_1.7.2.bb
@@ -0,0 +1,14 @@
+# SPDX-FileCopyrightText: Huawei Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+SUMMARY = "Python imgtool"
+HOMEPAGE = "https://pypi.org/project/imgtool"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://setup.cfg;md5=3f78c6150b7d619a476c799812e31d5a"
+
+inherit pypi setuptools3
+
+PYPI_PACKAGE = "imgtool"
+SRC_URI[md5sum] = "08fe63c644977aa8f9e6038e2067c3de"
+SRC_URI[sha256sum] = "799484f3f61e398ac4157548f309b6baa4084e464176449694ba9de7909eed6e"
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-zephyr-core/recipes-devtools/python/python3-intelhex_2.3.0.bb b/meta-zephyr-core/recipes-devtools/python/python3-intelhex_2.3.0.bb
deleted file mode 100644
index e297491..0000000
--- a/meta-zephyr-core/recipes-devtools/python/python3-intelhex_2.3.0.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-# SPDX-FileCopyrightText: Huawei Inc.
-# SPDX-License-Identifier: Apache-2.0
-
-SUMMARY = "Python library for Intel HEX files manipulations"
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4eba844696655c3eae07aca8e3a94772"
-
-SRC_URI[sha256sum] = "892b7361a719f4945237da8ccf754e9513db32f5628852785aea108dcd250093"
-
-inherit pypi setuptools3
-
-BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-zephyr-core/recipes-devtools/python/python3-junithtml_30.0.4.bb b/meta-zephyr-core/recipes-devtools/python/python3-junithtml_30.0.4.bb
new file mode 100644
index 0000000..ddc34aa
--- /dev/null
+++ b/meta-zephyr-core/recipes-devtools/python/python3-junithtml_30.0.4.bb
@@ -0,0 +1,14 @@
+# SPDX-FileCopyrightText: Huawei Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+SUMMARY = "Python junit2html"
+HOMEPAGE = "https://pypi.org/project/junit2html"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://MANIFEST.in;md5=899c50bccc6c8221c8ca0a9c7633b5b8"
+
+inherit pypi setuptools3
+
+PYPI_PACKAGE = "junit2html"
+SRC_URI[md5sum] = "a816cf502da0a8905f24aefab0739206"
+SRC_URI[sha256sum] = "9b3967c92142abd5fb94e2cbb938c51cc6c2689ec1c7fd348c6ba4ddab92da14"
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-zephyr-core/recipes-devtools/python/python3-junitparser_2.1.1.bb b/meta-zephyr-core/recipes-devtools/python/python3-junitparser_2.1.1.bb
new file mode 100644
index 0000000..5932e66
--- /dev/null
+++ b/meta-zephyr-core/recipes-devtools/python/python3-junitparser_2.1.1.bb
@@ -0,0 +1,14 @@
+# SPDX-FileCopyrightText: Huawei Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+SUMMARY = "Python junitparser"
+HOMEPAGE = "https://pypi.org/project/junitparser"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=2d00702cde917dd61c41041bc30136dd"
+
+inherit pypi setuptools3
+
+PYPI_PACKAGE = "junitparser"
+SRC_URI[md5sum] = "f8704c2b18e6f4d482c62b33e141a0cb"
+SRC_URI[sha256sum] = "d54d0eaa2b15ee2efab0220ce0ab31448d26dcb78170d5667453d7755b9f1480"
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-zephyr-core/recipes-devtools/python/python3-packaging_21.0.bb b/meta-zephyr-core/recipes-devtools/python/python3-packaging_21.0.bb
new file mode 100644
index 0000000..f857224
--- /dev/null
+++ b/meta-zephyr-core/recipes-devtools/python/python3-packaging_21.0.bb
@@ -0,0 +1,14 @@
+# SPDX-FileCopyrightText: Huawei Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+SUMMARY = "Python packaging"
+HOMEPAGE = "https://pypi.org/project/packaging"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=faadaedca9251a90b205c9167578ce91"
+
+inherit pypi setuptools3
+
+PYPI_PACKAGE = "packaging"
+SRC_URI[md5sum] = "240ba5823ed31051a1254e74c9d18d55"
+SRC_URI[sha256sum] = "7dc96269f53a4ccec5c0670940a4281106dd0bb343f47b7471f779df49c2fbe7"
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-zephyr-core/recipes-devtools/python/python3-pyelftools_0.27.bb b/meta-zephyr-core/recipes-devtools/python/python3-pyelftools_0.27.bb
new file mode 100644
index 0000000..1405fc5
--- /dev/null
+++ b/meta-zephyr-core/recipes-devtools/python/python3-pyelftools_0.27.bb
@@ -0,0 +1,14 @@
+# SPDX-FileCopyrightText: Huawei Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+SUMMARY = "Python pyelftools"
+HOMEPAGE = "https://pypi.org/project/pyelftools"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=5ce2a2b07fca326bc7c146d10105ccfc"
+
+inherit pypi setuptools3
+
+PYPI_PACKAGE = "pyelftools"
+SRC_URI[md5sum] = "061d67c669a9b1f8d07f28c47fb6a65f"
+SRC_URI[sha256sum] = "cde854e662774c5457d688ca41615f6594187ba7067af101232df889a6b7a66b"
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-zephyr-core/recipes-devtools/python/python3-pygithub_1.55.bb b/meta-zephyr-core/recipes-devtools/python/python3-pygithub_1.55.bb
new file mode 100644
index 0000000..268d2b7
--- /dev/null
+++ b/meta-zephyr-core/recipes-devtools/python/python3-pygithub_1.55.bb
@@ -0,0 +1,14 @@
+# SPDX-FileCopyrightText: Huawei Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+SUMMARY = "Python PyGithub"
+HOMEPAGE = "https://pypi.org/project/PyGithub"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://MANIFEST.in;md5=c5e8b6057f82b73046c24a30809903bd"
+
+inherit pypi setuptools3
+
+PYPI_PACKAGE = "PyGithub"
+SRC_URI[md5sum] = "03e5883a8d4358b0786a0db84ad56a22"
+SRC_URI[sha256sum] = "1bbfff9372047ff3f21d5cd8e07720f3dbfdaf6462fcaed9d815f528f1ba7283"
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-zephyr-core/recipes-devtools/python/python3-pygments_2.10.0.bb b/meta-zephyr-core/recipes-devtools/python/python3-pygments_2.10.0.bb
new file mode 100644
index 0000000..c4b63c1
--- /dev/null
+++ b/meta-zephyr-core/recipes-devtools/python/python3-pygments_2.10.0.bb
@@ -0,0 +1,15 @@
+# SPDX-FileCopyrightText: Huawei Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+SUMMARY = "Python pygments"
+HOMEPAGE = "https://pypi.org/project/Pygments/"
+DESCRIPTION = "Pygments is a syntax highlighting package written in Python."
+LICENSE = "BSD-2-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
+SRC_URI = "https://files.pythonhosted.org/packages/b7/b3/5cba26637fe43500d4568d0ee7b7362de1fb29c0e158d50b4b69e9a40422/Pygments-2.10.0.tar.gz"
+
+inherit pypi setuptools3
+
+PYPI_PACKAGE = "Pygments"
+SRC_URI[md5sum] = "87369a4e15019caf9cf056ab2c5858b3"
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-zephyr-core/recipes-devtools/python/python3-pylink b/meta-zephyr-core/recipes-devtools/python/python3-pylink
new file mode 100644
index 0000000..ddfe3ca
--- /dev/null
+++ b/meta-zephyr-core/recipes-devtools/python/python3-pylink
@@ -0,0 +1,11 @@
+SUMMARY = "Python pylink-square"
+HOMEPAGE ="https://pypi.org/project/pylink-square"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://MANIFEST.in;md5=8aa920a7ab8eabc590a0ab6dbe1b3bf2"
+
+inherit pypi setuptools3
+
+PYPI_PACKAGE = "pylink-square"
+SRC_URI[md5sum] = "e156ee1c73516e8b2cf52347f6c663f3"
+SRC_URI[sha256sum] = "45674112acab890483ee738bb3957e18cc6063dca763fc91283f890fb72d2f59"
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-zephyr-core/recipes-devtools/python/python3-pyocd_0.32.0.bb b/meta-zephyr-core/recipes-devtools/python/python3-pyocd_0.32.0.bb
new file mode 100644
index 0000000..bbdae6a
--- /dev/null
+++ b/meta-zephyr-core/recipes-devtools/python/python3-pyocd_0.32.0.bb
@@ -0,0 +1,14 @@
+# SPDX-FileCopyrightText: Huawei Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+SUMMARY = "Python pyocd"
+HOMEPAGE = "https://pypi.org/project/pyocd"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=421492e27872cb498685e9d7649f63a2"
+
+inherit pypi setuptools3
+
+PYPI_PACKAGE = "pyocd"
+SRC_URI[md5sum] = "25153f563a629bb2be7560e2dc23c0a8"
+SRC_URI[sha256sum] = "d5aa498130f251373ac50724be73dc2f8cf60b03c9547bddf3c140fa6555ead1"
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-zephyr-core/recipes-devtools/python/python3-pyparsing_2.4.7.bb b/meta-zephyr-core/recipes-devtools/python/python3-pyparsing_2.4.7.bb
new file mode 100644
index 0000000..0cb0d36
--- /dev/null
+++ b/meta-zephyr-core/recipes-devtools/python/python3-pyparsing_2.4.7.bb
@@ -0,0 +1,14 @@
+# SPDX-FileCopyrightText: Huawei Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+SUMMARY = "Python pyparsing"
+HOMEPAGE = "https://pypi.org/project/pyparsing"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=657a566233888513e1f07ba13e2f47f1"
+
+inherit pypi setuptools3
+
+PYPI_PACKAGE = "pyparsing"
+SRC_URI[md5sum] = "f0953e47a0112f7a65aec2305ffdf7b4"
+SRC_URI[sha256sum] = "c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1"
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-zephyr-core/recipes-devtools/python/python3-sphinx_4.2.0.bb b/meta-zephyr-core/recipes-devtools/python/python3-sphinx_4.2.0.bb
new file mode 100644
index 0000000..290fabb
--- /dev/null
+++ b/meta-zephyr-core/recipes-devtools/python/python3-sphinx_4.2.0.bb
@@ -0,0 +1,14 @@
+# SPDX-FileCopyrightText: Huawei Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+DESCRIPTION = "Python documentation generator"
+HOMEPAGE = "http://sphinx-doc.org/"
+SECTION = "devel/python"
+LICENSE = "BSD-2-Clause & BSD-3-Clause & MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=82cc7d23060a75a07b820eaaf75abecf"
+
+inherit setuptools3 pypi
+
+PYPI_PACKAGE = "Sphinx"
+SRC_URI[sha256sum] = "94078db9184491e15bce0a56d9186e0aec95f16ac20b12d00e06d4e36f1058a6"
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-zephyr-core/recipes-devtools/west/west_0.12.99.bb b/meta-zephyr-core/recipes-devtools/west/west_0.12.99.bb
new file mode 100644
index 0000000..6a9f8bc
--- /dev/null
+++ b/meta-zephyr-core/recipes-devtools/west/west_0.12.99.bb
@@ -0,0 +1,22 @@
+# SPDX-FileCopyrightText: Huawei Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+SUMMARY = "Zephyr RTOS Project meta-tool"
+HOMEPAGE = "https://github.com/zephyrproject-rtos/west"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
+
+SRC_URI = "git://github.com/zephyrproject-rtos/west;protocol=https;branch=main"
+
+PV = "0.12.99"
+SRCREV = "38e656b05ea8f4c8d80b953f6d88b1ed604d11f8"
+PROVIDES = "virtual/west"
+
+S = "${WORKDIR}/git"
+
+inherit setuptools3 python3native
+
+DEPENDS_${PN} += "python3-pyyaml python3-core python3-packaging python3-colorama python3-pyparsing"
+RDEPENDS_${PN} += "python3-pyyaml python3-core python3-packaging python3-colorama python3-pyparsing"
+BBCLASSEXTEND = "native nativesdk"
+TOOLCHAIN_HOST_TASK:append = " nativesdk-west"
--
2.25.1


[meta-zephyr][PATCH v4] meta-zephyr-core/bsp: Restructure into sublayers

Eilís Ní Fhlannagáin
 

From: Eilís Ní Fhlannagáin <elizabeth.flanagan@huawei.com>

This commit restructures meta-zephyr into meta-zephyr-core and
meta-zephyr-bsp. It moves machine definitions into meta-zephyr-bsp
in preparation for adding the autogenerated zephyr machines.

Signed-off-by: Eilís Ní Fhlannagáin <elizabeth.flanagan@huawei.com>
---
README.txt | 2 +-
meta-zephyr-bsp/conf/layer.conf | 20 +++
.../conf}/machine/96b-avenger96.conf | 0
.../conf}/machine/96b-nitrogen.conf | 0
.../conf}/machine/arduino-nano-33-ble.conf | 0
.../conf}/machine/include/nrf52.inc | 0
.../machine/include/stm32mp1-cortex-m4.inc | 0
.../conf}/machine/include/tune-arc.inc | 0
.../machine/include/tune-corei7-common.inc | 0
.../conf}/machine/include/tune-cortexm0.inc | 0
.../conf}/machine/include/tune-cortexm3.inc | 0
.../conf}/machine/include/tune-cortexm4.inc | 0
.../conf}/machine/include/tune-iamcu.inc | 0
.../conf}/machine/include/tune-nios2.inc | 0
.../conf}/machine/intel-x86-64.conf | 0
.../conf}/machine/nrf52840dk-nrf52840.conf | 0
.../conf}/machine/qemu-cortex-m3.conf | 0
.../conf}/machine/qemu-nios2.conf | 0
.../conf}/machine/qemu-x86.conf | 0
.../conf}/machine/stm32mp157c-dk2.conf | 0
COPYING.MIT => meta-zephyr-core/COPYING.MIT | 0
meta-zephyr-core/README.txt | 119 ++++++++++++++++++
.../classes}/siteinfo-zephyr.bbclass | 0
.../classes}/zephyr-flash-bossac.bbclass | 0
.../classes}/zephyr-flash-dfu.bbclass | 0
.../classes}/zephyr-flash-pyocd.bbclass | 0
.../classes}/zephyr-qemuboot.bbclass | 0
.../classes}/zephyr.bbclass | 0
.../classes}/zephyrtest.bbclass | 0
.../conf}/distro/zephyr.conf | 0
{conf => meta-zephyr-core/conf}/layer.conf | 12 +-
.../lib}/oeqa/controllers/__init__.py | 0
.../oeqa/controllers/zephyrtargetcontrol.py | 0
.../lib}/oeqa/runtime/__init__.py | 0
.../lib}/oeqa/runtime/cases/zephyr.py | 0
.../lib}/oeqa/utils/qemuzephyrrunner.py | 0
.../recipes-core}/newlib/newlib_%.bbappend | 0
.../binutils/binutils-2.26arc.inc | 0
.../binutils-cross-canadian_2.26arc.bb | 0
.../binutils/binutils-cross_2.26arc.bb | 0
...e54244cd02bdcf4f1057be3ce96631f35ac3.patch | 0
.../recipes-devtools-arc}/gcc/gcc-6.x.arc.inc | 0
.../gcc/gcc-cross-canadian_6.x.arc.bb | 0
.../gcc/gcc-cross_6.x.arc .bb | 0
.../gcc/gcc-source_6.x.arc.bb | 0
.../gcc/libgcc_6.x.arc.bb | 0
.../gcc/gcc-cross_6.%.bbappend | 0
.../recipes-devtools}/gcc/libgcc_6.%.bbappend | 0
.../python/python3-colorama_0.4.4.bb | 16 +++
.../python/python3-intelhex_2.3.0.bb | 12 ++
.../python/python3-lpc-checksum_2.2.0.bb | 14 +++
.../qemu/files/nios2-add-support.patch | 0
.../recipes-devtools}/qemu/qemu_%.bbappend | 0
.../0001-cmake-add-yocto-toolchain.patch | 0
...0001-cmake-added-missing-file-ext-to.patch | 0
...ry-generation-issue-in-cross-compila.patch | 0
...rduino-nano-33-ble-storage-partition.patch | 0
.../zephyr-kernel/files/dtc.patch | 0
.../zephyr-kernel/zephyr-blinky.bb | 0
.../zephyr-kernel/zephyr-coap-client.bb | 0
.../zephyr-kernel/zephyr-coap-server.bb | 0
.../zephyr-kernel/zephyr-echo-client.bb | 0
.../zephyr-kernel/zephyr-hci-uart.bb | 0
.../zephyr-kernel/zephyr-helloworld.bb | 0
.../zephyr-kernel/zephyr-http-client.bb | 0
.../zephyr-kernel/zephyr-image.inc | 0
.../zephyr-kernel/zephyr-kernel-common.inc | 0
.../zephyr-kernel/zephyr-kernel-src-2.6.1.inc | 0
.../zephyr-kernel/zephyr-kernel-src-2.7.1.inc | 0
.../zephyr-kernel/zephyr-kernel-src-dev.inc | 0
.../zephyr-kernel/zephyr-kernel-src.bb | 0
.../zephyr-kernel/zephyr-kernel-src.inc | 0
.../zephyr-kernel/zephyr-kernel-test-all.bb | 0
.../zephyr-kernel/zephyr-kernel-test.bb | 0
.../zephyr-kernel/zephyr-kernel-test.inc | 0
.../zephyr-kernel/zephyr-lvgl.bb | 0
.../zephyr-kernel/zephyr-mqtt-publisher.bb | 0
.../zephyr-kernel/zephyr-openamp-rsc-table.bb | 0
.../zephyr-openthread-echo-client.bb | 0
.../zephyr-kernel/zephyr-peripheral-esp.bb | 0
.../zephyr-kernel/zephyr-peripheral-hr.bb | 0
.../zephyr-kernel/zephyr-philosophers.bb | 0
.../zephyr-kernel/zephyr-sample.inc | 0
.../zephyr-kernel/zephyr-websocket-client.bb | 0
84 files changed, 188 insertions(+), 7 deletions(-)
create mode 100644 meta-zephyr-bsp/conf/layer.conf
rename {conf => meta-zephyr-bsp/conf}/machine/96b-avenger96.conf (100%)
rename {conf => meta-zephyr-bsp/conf}/machine/96b-nitrogen.conf (100%)
rename {conf => meta-zephyr-bsp/conf}/machine/arduino-nano-33-ble.conf (100%)
rename {conf => meta-zephyr-bsp/conf}/machine/include/nrf52.inc (100%)
rename {conf => meta-zephyr-bsp/conf}/machine/include/stm32mp1-cortex-m4.inc (100%)
rename {conf => meta-zephyr-bsp/conf}/machine/include/tune-arc.inc (100%)
rename {conf => meta-zephyr-bsp/conf}/machine/include/tune-corei7-common.inc (100%)
rename {conf => meta-zephyr-bsp/conf}/machine/include/tune-cortexm0.inc (100%)
rename {conf => meta-zephyr-bsp/conf}/machine/include/tune-cortexm3.inc (100%)
rename {conf => meta-zephyr-bsp/conf}/machine/include/tune-cortexm4.inc (100%)
rename {conf => meta-zephyr-bsp/conf}/machine/include/tune-iamcu.inc (100%)
rename {conf => meta-zephyr-bsp/conf}/machine/include/tune-nios2.inc (100%)
rename {conf => meta-zephyr-bsp/conf}/machine/intel-x86-64.conf (100%)
rename {conf => meta-zephyr-bsp/conf}/machine/nrf52840dk-nrf52840.conf (100%)
rename {conf => meta-zephyr-bsp/conf}/machine/qemu-cortex-m3.conf (100%)
rename {conf => meta-zephyr-bsp/conf}/machine/qemu-nios2.conf (100%)
rename {conf => meta-zephyr-bsp/conf}/machine/qemu-x86.conf (100%)
rename {conf => meta-zephyr-bsp/conf}/machine/stm32mp157c-dk2.conf (100%)
rename COPYING.MIT => meta-zephyr-core/COPYING.MIT (100%)
create mode 100644 meta-zephyr-core/README.txt
rename {classes => meta-zephyr-core/classes}/siteinfo-zephyr.bbclass (100%)
rename {classes => meta-zephyr-core/classes}/zephyr-flash-bossac.bbclass (100%)
rename {classes => meta-zephyr-core/classes}/zephyr-flash-dfu.bbclass (100%)
rename {classes => meta-zephyr-core/classes}/zephyr-flash-pyocd.bbclass (100%)
rename {classes => meta-zephyr-core/classes}/zephyr-qemuboot.bbclass (100%)
rename {classes => meta-zephyr-core/classes}/zephyr.bbclass (100%)
rename {classes => meta-zephyr-core/classes}/zephyrtest.bbclass (100%)
rename {conf => meta-zephyr-core/conf}/distro/zephyr.conf (100%)
rename {conf => meta-zephyr-core/conf}/layer.conf (62%)
rename {lib => meta-zephyr-core/lib}/oeqa/controllers/__init__.py (100%)
rename {lib => meta-zephyr-core/lib}/oeqa/controllers/zephyrtargetcontrol.py (100%)
rename {lib => meta-zephyr-core/lib}/oeqa/runtime/__init__.py (100%)
rename {lib => meta-zephyr-core/lib}/oeqa/runtime/cases/zephyr.py (100%)
rename {lib => meta-zephyr-core/lib}/oeqa/utils/qemuzephyrrunner.py (100%)
rename {recipes-core => meta-zephyr-core/recipes-core}/newlib/newlib_%.bbappend (100%)
rename {recipes-devtools-arc => meta-zephyr-core/recipes-devtools-arc}/binutils/binutils-2.26arc.inc (100%)
rename {recipes-devtools-arc => meta-zephyr-core/recipes-devtools-arc}/binutils/binutils-cross-canadian_2.26arc.bb (100%)
rename {recipes-devtools-arc => meta-zephyr-core/recipes-devtools-arc}/binutils/binutils-cross_2.26arc.bb (100%)
rename {recipes-devtools-arc => meta-zephyr-core/recipes-devtools-arc}/gcc/files/cbd8e54244cd02bdcf4f1057be3ce96631f35ac3.patch (100%)
rename {recipes-devtools-arc => meta-zephyr-core/recipes-devtools-arc}/gcc/gcc-6.x.arc.inc (100%)
rename {recipes-devtools-arc => meta-zephyr-core/recipes-devtools-arc}/gcc/gcc-cross-canadian_6.x.arc.bb (100%)
rename {recipes-devtools-arc => meta-zephyr-core/recipes-devtools-arc}/gcc/gcc-cross_6.x.arc .bb (100%)
rename {recipes-devtools-arc => meta-zephyr-core/recipes-devtools-arc}/gcc/gcc-source_6.x.arc.bb (100%)
rename {recipes-devtools-arc => meta-zephyr-core/recipes-devtools-arc}/gcc/libgcc_6.x.arc.bb (100%)
rename {recipes-devtools => meta-zephyr-core/recipes-devtools}/gcc/gcc-cross_6.%.bbappend (100%)
rename {recipes-devtools => meta-zephyr-core/recipes-devtools}/gcc/libgcc_6.%.bbappend (100%)
create mode 100644 meta-zephyr-core/recipes-devtools/python/python3-colorama_0.4.4.bb
create mode 100644 meta-zephyr-core/recipes-devtools/python/python3-intelhex_2.3.0.bb
create mode 100644 meta-zephyr-core/recipes-devtools/python/python3-lpc-checksum_2.2.0.bb
rename {recipes-devtools => meta-zephyr-core/recipes-devtools}/qemu/files/nios2-add-support.patch (100%)
rename {recipes-devtools => meta-zephyr-core/recipes-devtools}/qemu/qemu_%.bbappend (100%)
rename {recipes-kernel => meta-zephyr-core/recipes-kernel}/zephyr-kernel/files/0001-cmake-add-yocto-toolchain.patch (100%)
rename {recipes-kernel => meta-zephyr-core/recipes-kernel}/zephyr-kernel/files/0001-cmake-added-missing-file-ext-to.patch (100%)
rename {recipes-kernel => meta-zephyr-core/recipes-kernel}/zephyr-kernel/files/0001-x86-fix-efi-binary-generation-issue-in-cross-compila.patch (100%)
rename {recipes-kernel => meta-zephyr-core/recipes-kernel}/zephyr-kernel/files/arduino-nano-33-ble-storage-partition.patch (100%)
rename {recipes-kernel => meta-zephyr-core/recipes-kernel}/zephyr-kernel/files/dtc.patch (100%)
rename {recipes-kernel => meta-zephyr-core/recipes-kernel}/zephyr-kernel/zephyr-blinky.bb (100%)
rename {recipes-kernel => meta-zephyr-core/recipes-kernel}/zephyr-kernel/zephyr-coap-client.bb (100%)
rename {recipes-kernel => meta-zephyr-core/recipes-kernel}/zephyr-kernel/zephyr-coap-server.bb (100%)
rename {recipes-kernel => meta-zephyr-core/recipes-kernel}/zephyr-kernel/zephyr-echo-client.bb (100%)
rename {recipes-kernel => meta-zephyr-core/recipes-kernel}/zephyr-kernel/zephyr-hci-uart.bb (100%)
rename {recipes-kernel => meta-zephyr-core/recipes-kernel}/zephyr-kernel/zephyr-helloworld.bb (100%)
rename {recipes-kernel => meta-zephyr-core/recipes-kernel}/zephyr-kernel/zephyr-http-client.bb (100%)
rename {recipes-kernel => meta-zephyr-core/recipes-kernel}/zephyr-kernel/zephyr-image.inc (100%)
rename {recipes-kernel => meta-zephyr-core/recipes-kernel}/zephyr-kernel/zephyr-kernel-common.inc (100%)
rename {recipes-kernel => meta-zephyr-core/recipes-kernel}/zephyr-kernel/zephyr-kernel-src-2.6.1.inc (100%)
rename {recipes-kernel => meta-zephyr-core/recipes-kernel}/zephyr-kernel/zephyr-kernel-src-2.7.1.inc (100%)
rename {recipes-kernel => meta-zephyr-core/recipes-kernel}/zephyr-kernel/zephyr-kernel-src-dev.inc (100%)
rename {recipes-kernel => meta-zephyr-core/recipes-kernel}/zephyr-kernel/zephyr-kernel-src.bb (100%)
rename {recipes-kernel => meta-zephyr-core/recipes-kernel}/zephyr-kernel/zephyr-kernel-src.inc (100%)
rename {recipes-kernel => meta-zephyr-core/recipes-kernel}/zephyr-kernel/zephyr-kernel-test-all.bb (100%)
rename {recipes-kernel => meta-zephyr-core/recipes-kernel}/zephyr-kernel/zephyr-kernel-test.bb (100%)
rename {recipes-kernel => meta-zephyr-core/recipes-kernel}/zephyr-kernel/zephyr-kernel-test.inc (100%)
rename {recipes-kernel => meta-zephyr-core/recipes-kernel}/zephyr-kernel/zephyr-lvgl.bb (100%)
rename {recipes-kernel => meta-zephyr-core/recipes-kernel}/zephyr-kernel/zephyr-mqtt-publisher.bb (100%)
rename {recipes-kernel => meta-zephyr-core/recipes-kernel}/zephyr-kernel/zephyr-openamp-rsc-table.bb (100%)
rename {recipes-kernel => meta-zephyr-core/recipes-kernel}/zephyr-kernel/zephyr-openthread-echo-client.bb (100%)
rename {recipes-kernel => meta-zephyr-core/recipes-kernel}/zephyr-kernel/zephyr-peripheral-esp.bb (100%)
rename {recipes-kernel => meta-zephyr-core/recipes-kernel}/zephyr-kernel/zephyr-peripheral-hr.bb (100%)
rename {recipes-kernel => meta-zephyr-core/recipes-kernel}/zephyr-kernel/zephyr-philosophers.bb (100%)
rename {recipes-kernel => meta-zephyr-core/recipes-kernel}/zephyr-kernel/zephyr-sample.inc (100%)
rename {recipes-kernel => meta-zephyr-core/recipes-kernel}/zephyr-kernel/zephyr-websocket-client.bb (100%)

diff --git a/README.txt b/README.txt
index 5a0ccc7..f3dda51 100644
--- a/README.txt
+++ b/README.txt
@@ -19,7 +19,7 @@ Modify local conf by adding:

Add "meta-openembedded/meta-oe" to BBLAYERS
Add "meta-openembedded/meta-python" to BBLAYERS
-Add "meta-zephyr" to BBLAYERS
+Add "meta-zephyr-core" and "meta-zephyr-bsp" to BBLAYERS

Building and Running Zephyr Samples
===================================
diff --git a/meta-zephyr-bsp/conf/layer.conf b/meta-zephyr-bsp/conf/layer.conf
new file mode 100644
index 0000000..d5d478c
--- /dev/null
+++ b/meta-zephyr-bsp/conf/layer.conf
@@ -0,0 +1,20 @@
+# We have a conf and classes directory, add to BBPATH
+BBPATH .= ":${LAYERDIR}"
+
+# We have recipes-* directories, add to BBFILES
+BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
+ ${LAYERDIR}/recipes-*/*/*.bbappend"
+
+BBFILE_COLLECTIONS += "zephyrbsp"
+BBFILE_PATTERN_zephyrbsp = "^${LAYERDIR}/"
+BBFILE_PRIORITY_zephyrbsp = "6"
+
+# This should only be incremented on significant changes that will
+# cause compatibility issues with other layers
+LAYERVERSION_zephyrbsp = "1"
+
+LAYERDEPENDS_zephyrbsp = "zephyrcore core meta-python"
+
+LAYERSERIES_COMPAT_zephyrbsp = "dunfell gatesgarth hardknott honister"
+
+X86_TUNE_DIR = "${@bb.utils.contains('LAYERSERIES_CORENAMES', 'honister', 'include/x86', 'include', d)}"
diff --git a/conf/machine/96b-avenger96.conf b/meta-zephyr-bsp/conf/machine/96b-avenger96.conf
similarity index 100%
rename from conf/machine/96b-avenger96.conf
rename to meta-zephyr-bsp/conf/machine/96b-avenger96.conf
diff --git a/conf/machine/96b-nitrogen.conf b/meta-zephyr-bsp/conf/machine/96b-nitrogen.conf
similarity index 100%
rename from conf/machine/96b-nitrogen.conf
rename to meta-zephyr-bsp/conf/machine/96b-nitrogen.conf
diff --git a/conf/machine/arduino-nano-33-ble.conf b/meta-zephyr-bsp/conf/machine/arduino-nano-33-ble.conf
similarity index 100%
rename from conf/machine/arduino-nano-33-ble.conf
rename to meta-zephyr-bsp/conf/machine/arduino-nano-33-ble.conf
diff --git a/conf/machine/include/nrf52.inc b/meta-zephyr-bsp/conf/machine/include/nrf52.inc
similarity index 100%
rename from conf/machine/include/nrf52.inc
rename to meta-zephyr-bsp/conf/machine/include/nrf52.inc
diff --git a/conf/machine/include/stm32mp1-cortex-m4.inc b/meta-zephyr-bsp/conf/machine/include/stm32mp1-cortex-m4.inc
similarity index 100%
rename from conf/machine/include/stm32mp1-cortex-m4.inc
rename to meta-zephyr-bsp/conf/machine/include/stm32mp1-cortex-m4.inc
diff --git a/conf/machine/include/tune-arc.inc b/meta-zephyr-bsp/conf/machine/include/tune-arc.inc
similarity index 100%
rename from conf/machine/include/tune-arc.inc
rename to meta-zephyr-bsp/conf/machine/include/tune-arc.inc
diff --git a/conf/machine/include/tune-corei7-common.inc b/meta-zephyr-bsp/conf/machine/include/tune-corei7-common.inc
similarity index 100%
rename from conf/machine/include/tune-corei7-common.inc
rename to meta-zephyr-bsp/conf/machine/include/tune-corei7-common.inc
diff --git a/conf/machine/include/tune-cortexm0.inc b/meta-zephyr-bsp/conf/machine/include/tune-cortexm0.inc
similarity index 100%
rename from conf/machine/include/tune-cortexm0.inc
rename to meta-zephyr-bsp/conf/machine/include/tune-cortexm0.inc
diff --git a/conf/machine/include/tune-cortexm3.inc b/meta-zephyr-bsp/conf/machine/include/tune-cortexm3.inc
similarity index 100%
rename from conf/machine/include/tune-cortexm3.inc
rename to meta-zephyr-bsp/conf/machine/include/tune-cortexm3.inc
diff --git a/conf/machine/include/tune-cortexm4.inc b/meta-zephyr-bsp/conf/machine/include/tune-cortexm4.inc
similarity index 100%
rename from conf/machine/include/tune-cortexm4.inc
rename to meta-zephyr-bsp/conf/machine/include/tune-cortexm4.inc
diff --git a/conf/machine/include/tune-iamcu.inc b/meta-zephyr-bsp/conf/machine/include/tune-iamcu.inc
similarity index 100%
rename from conf/machine/include/tune-iamcu.inc
rename to meta-zephyr-bsp/conf/machine/include/tune-iamcu.inc
diff --git a/conf/machine/include/tune-nios2.inc b/meta-zephyr-bsp/conf/machine/include/tune-nios2.inc
similarity index 100%
rename from conf/machine/include/tune-nios2.inc
rename to meta-zephyr-bsp/conf/machine/include/tune-nios2.inc
diff --git a/conf/machine/intel-x86-64.conf b/meta-zephyr-bsp/conf/machine/intel-x86-64.conf
similarity index 100%
rename from conf/machine/intel-x86-64.conf
rename to meta-zephyr-bsp/conf/machine/intel-x86-64.conf
diff --git a/conf/machine/nrf52840dk-nrf52840.conf b/meta-zephyr-bsp/conf/machine/nrf52840dk-nrf52840.conf
similarity index 100%
rename from conf/machine/nrf52840dk-nrf52840.conf
rename to meta-zephyr-bsp/conf/machine/nrf52840dk-nrf52840.conf
diff --git a/conf/machine/qemu-cortex-m3.conf b/meta-zephyr-bsp/conf/machine/qemu-cortex-m3.conf
similarity index 100%
rename from conf/machine/qemu-cortex-m3.conf
rename to meta-zephyr-bsp/conf/machine/qemu-cortex-m3.conf
diff --git a/conf/machine/qemu-nios2.conf b/meta-zephyr-bsp/conf/machine/qemu-nios2.conf
similarity index 100%
rename from conf/machine/qemu-nios2.conf
rename to meta-zephyr-bsp/conf/machine/qemu-nios2.conf
diff --git a/conf/machine/qemu-x86.conf b/meta-zephyr-bsp/conf/machine/qemu-x86.conf
similarity index 100%
rename from conf/machine/qemu-x86.conf
rename to meta-zephyr-bsp/conf/machine/qemu-x86.conf
diff --git a/conf/machine/stm32mp157c-dk2.conf b/meta-zephyr-bsp/conf/machine/stm32mp157c-dk2.conf
similarity index 100%
rename from conf/machine/stm32mp157c-dk2.conf
rename to meta-zephyr-bsp/conf/machine/stm32mp157c-dk2.conf
diff --git a/COPYING.MIT b/meta-zephyr-core/COPYING.MIT
similarity index 100%
rename from COPYING.MIT
rename to meta-zephyr-core/COPYING.MIT
diff --git a/meta-zephyr-core/README.txt b/meta-zephyr-core/README.txt
new file mode 100644
index 0000000..5a0ccc7
--- /dev/null
+++ b/meta-zephyr-core/README.txt
@@ -0,0 +1,119 @@
+Building Zephyr Images via bitbake recipes
+==========================================
+
+More detailed and up-to-date information can be found here:
+
+https://wiki.yoctoproject.org/wiki/TipsAndTricks/BuildingZephyrImages
+
+Prerequisites:
+==============
+
+This layer depends on:
+ Yocto distro (master)
+ git://git.yoctoproject.org/poky
+ Python layer (meta-openembedded/meta-python)
+ git://git.openembedded.org/meta-openembedded
+
+Modify local conf by adding:
+ DISTRO="zephyr"
+
+Add "meta-openembedded/meta-oe" to BBLAYERS
+Add "meta-openembedded/meta-python" to BBLAYERS
+Add "meta-zephyr" to BBLAYERS
+
+Building and Running Zephyr Samples
+===================================
+
+You can build Zephyr samples. There are several sample recipes.
+For example, to build the Zephyr "philosophers" sample:
+
+ $ MACHINE=qemu-x86 bitbake zephyr-philosophers
+
+You can then run the created "philosophers" image in qemu:
+
+ $ runqemu qemu-x86
+
+The same sample, for ARM image:
+
+ $ MACHINE=qemu-cortex-m3 bitbake zephyr-philosophers
+ $ runqemu qemu-cortex-m3
+
+The same sample, for Nios2 image:
+
+ $ MACHINE=qemu-nios2 bitbake zephyr-philosophers
+ $ runqemu qemu-nios2
+
+Flashing
+=================================
+
+You can flash Zephyr samples to boards. Currently, the following MACHINEs
+are supported:
+ * DFU:
+ - arduino-101-sss
+ - arduino-101
+ - arduino-101-ble
+ * pyocd:
+ - 96b-nitrogen
+
+To flash the example you built with command e.g.
+
+ $ MACHINE=96b-nitrogen bitbake zephyr-philosophers
+
+call similar command with explicit flash_usb command:
+
+ $ MACHINE=96b-nitrogen bitbake zephyr-philosophers -c flash_usb
+
+dfu-util and/or pyocd need to be installed in your system. If you observe
+permission errors or the flashing process seem to hang, follow those instructions:
+https://github.com/pyocd/pyOCD/tree/master/udev
+
+By default, pyocd tries to flash all the attached probes. This behaviour can be
+customised by defining the PYOCD_FLASH_IDS variable as a space-separated list
+of IDs. Once that is set, the tool will only try to program these IDs. You can
+query for the IDs by running `pyocd list` on your host while having the probes
+attached. Besides setting this variable through the build's configuration or
+metadata, you can also inject its value from command line with something like:
+
+ $ PYOCD_FLASH_IDS='<ID1> <ID2> <ID3>' BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE PYOCD_FLASH_IDS" bitbake <TARGET> -c flash_usb
+
+Building and Running Zephyr Tests
+=================================
+Presently only toolchains for ARM, x86, IAMCU and Nios2 are supported.
+(For ARM we use CortexM3 toolchain)
+
+To run Zephyr Test using Yocto Image Tests, ensure following in local.conf:
+
+ INHERIT += "testimage"
+
+You can build and test an individual existing Zephyr test.
+This is done by appending the actual test name to the "zephyr-kernel-test",
+for example:
+
+ $ MACHINE=qemu-x86 bitbake zephyr-kernel-test-sleep
+ $ MACHINE=qemu-x86 bitbake zephyr-kernel-test-sleep -c testimage
+
+You can also build and run all Zephyr existing tests (as listed in the file
+zephyr-kernel-test.inc). For example:
+
+ $ MACHINE=qemu-x86 bitbake zephyr-kernel-test-all
+ $ MACHINE=qemu-x86 bitbake zephyr-kernel-test-all -c testimage
+or
+ $ MACHINE=qemu-cortex-m3 bitbake zephyr-kernel-test-all
+ $ MACHINE=qemu-cortex-m3 bitbake zephyr-kernel-test-all -c testimage
+or
+ $ MACHINE=qemu-nios2 bitbake zephyr-kernel-test-all
+ $ MACHINE=qemu-nios2 bitbake zephyr-kernel-test-all -c testimage
+
+
+Contributing
+============
+
+Patches for meta-zephyr should be sent to the yocto@lists.yoctoproject.org
+mailing list. See https://lists.yoctoproject.org/g/yocto for subscription
+details and the list archive. Please add [meta-zephyr] to the subject so
+the patches are identifable.
+
+Git can be configured to send mails appropriately when using git send-email:
+
+$ git config --local sendemail.to yocto@lists.yoctoproject.org
+$ git config --local format.subjectPrefix meta-zephyr][PATCH
diff --git a/classes/siteinfo-zephyr.bbclass b/meta-zephyr-core/classes/siteinfo-zephyr.bbclass
similarity index 100%
rename from classes/siteinfo-zephyr.bbclass
rename to meta-zephyr-core/classes/siteinfo-zephyr.bbclass
diff --git a/classes/zephyr-flash-bossac.bbclass b/meta-zephyr-core/classes/zephyr-flash-bossac.bbclass
similarity index 100%
rename from classes/zephyr-flash-bossac.bbclass
rename to meta-zephyr-core/classes/zephyr-flash-bossac.bbclass
diff --git a/classes/zephyr-flash-dfu.bbclass b/meta-zephyr-core/classes/zephyr-flash-dfu.bbclass
similarity index 100%
rename from classes/zephyr-flash-dfu.bbclass
rename to meta-zephyr-core/classes/zephyr-flash-dfu.bbclass
diff --git a/classes/zephyr-flash-pyocd.bbclass b/meta-zephyr-core/classes/zephyr-flash-pyocd.bbclass
similarity index 100%
rename from classes/zephyr-flash-pyocd.bbclass
rename to meta-zephyr-core/classes/zephyr-flash-pyocd.bbclass
diff --git a/classes/zephyr-qemuboot.bbclass b/meta-zephyr-core/classes/zephyr-qemuboot.bbclass
similarity index 100%
rename from classes/zephyr-qemuboot.bbclass
rename to meta-zephyr-core/classes/zephyr-qemuboot.bbclass
diff --git a/classes/zephyr.bbclass b/meta-zephyr-core/classes/zephyr.bbclass
similarity index 100%
rename from classes/zephyr.bbclass
rename to meta-zephyr-core/classes/zephyr.bbclass
diff --git a/classes/zephyrtest.bbclass b/meta-zephyr-core/classes/zephyrtest.bbclass
similarity index 100%
rename from classes/zephyrtest.bbclass
rename to meta-zephyr-core/classes/zephyrtest.bbclass
diff --git a/conf/distro/zephyr.conf b/meta-zephyr-core/conf/distro/zephyr.conf
similarity index 100%
rename from conf/distro/zephyr.conf
rename to meta-zephyr-core/conf/distro/zephyr.conf
diff --git a/conf/layer.conf b/meta-zephyr-core/conf/layer.conf
similarity index 62%
rename from conf/layer.conf
rename to meta-zephyr-core/conf/layer.conf
index 35f1075..4b1bf91 100644
--- a/conf/layer.conf
+++ b/meta-zephyr-core/conf/layer.conf
@@ -5,16 +5,16 @@ BBPATH .= ":${LAYERDIR}"
BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
${LAYERDIR}/recipes-*/*/*.bbappend"

-BBFILE_COLLECTIONS += "zephyr"
-BBFILE_PATTERN_zephyr = "^${LAYERDIR}/"
-BBFILE_PRIORITY_zephyr = "6"
+BBFILE_COLLECTIONS += "zephyrcore"
+BBFILE_PATTERN_zephyrcore = "^${LAYERDIR}/"
+BBFILE_PRIORITY_zephyrcore = "6"

# This should only be incremented on significant changes that will
# cause compatibility issues with other layers
-LAYERVERSION_zephyr = "1"
+LAYERVERSION_zephyrcore = "1"

-LAYERDEPENDS_zephyr = "core meta-python"
+LAYERDEPENDS_zephyrcore = "core meta-python"

-LAYERSERIES_COMPAT_zephyr = "dunfell gatesgarth hardknott honister"
+LAYERSERIES_COMPAT_zephyrcore = "dunfell gatesgarth hardknott honister"

X86_TUNE_DIR = "${@bb.utils.contains('LAYERSERIES_CORENAMES', 'honister', 'include/x86', 'include', d)}"
diff --git a/lib/oeqa/controllers/__init__.py b/meta-zephyr-core/lib/oeqa/controllers/__init__.py
similarity index 100%
rename from lib/oeqa/controllers/__init__.py
rename to meta-zephyr-core/lib/oeqa/controllers/__init__.py
diff --git a/lib/oeqa/controllers/zephyrtargetcontrol.py b/meta-zephyr-core/lib/oeqa/controllers/zephyrtargetcontrol.py
similarity index 100%
rename from lib/oeqa/controllers/zephyrtargetcontrol.py
rename to meta-zephyr-core/lib/oeqa/controllers/zephyrtargetcontrol.py
diff --git a/lib/oeqa/runtime/__init__.py b/meta-zephyr-core/lib/oeqa/runtime/__init__.py
similarity index 100%
rename from lib/oeqa/runtime/__init__.py
rename to meta-zephyr-core/lib/oeqa/runtime/__init__.py
diff --git a/lib/oeqa/runtime/cases/zephyr.py b/meta-zephyr-core/lib/oeqa/runtime/cases/zephyr.py
similarity index 100%
rename from lib/oeqa/runtime/cases/zephyr.py
rename to meta-zephyr-core/lib/oeqa/runtime/cases/zephyr.py
diff --git a/lib/oeqa/utils/qemuzephyrrunner.py b/meta-zephyr-core/lib/oeqa/utils/qemuzephyrrunner.py
similarity index 100%
rename from lib/oeqa/utils/qemuzephyrrunner.py
rename to meta-zephyr-core/lib/oeqa/utils/qemuzephyrrunner.py
diff --git a/recipes-core/newlib/newlib_%.bbappend b/meta-zephyr-core/recipes-core/newlib/newlib_%.bbappend
similarity index 100%
rename from recipes-core/newlib/newlib_%.bbappend
rename to meta-zephyr-core/recipes-core/newlib/newlib_%.bbappend
diff --git a/recipes-devtools-arc/binutils/binutils-2.26arc.inc b/meta-zephyr-core/recipes-devtools-arc/binutils/binutils-2.26arc.inc
similarity index 100%
rename from recipes-devtools-arc/binutils/binutils-2.26arc.inc
rename to meta-zephyr-core/recipes-devtools-arc/binutils/binutils-2.26arc.inc
diff --git a/recipes-devtools-arc/binutils/binutils-cross-canadian_2.26arc.bb b/meta-zephyr-core/recipes-devtools-arc/binutils/binutils-cross-canadian_2.26arc.bb
similarity index 100%
rename from recipes-devtools-arc/binutils/binutils-cross-canadian_2.26arc.bb
rename to meta-zephyr-core/recipes-devtools-arc/binutils/binutils-cross-canadian_2.26arc.bb
diff --git a/recipes-devtools-arc/binutils/binutils-cross_2.26arc.bb b/meta-zephyr-core/recipes-devtools-arc/binutils/binutils-cross_2.26arc.bb
similarity index 100%
rename from recipes-devtools-arc/binutils/binutils-cross_2.26arc.bb
rename to meta-zephyr-core/recipes-devtools-arc/binutils/binutils-cross_2.26arc.bb
diff --git a/recipes-devtools-arc/gcc/files/cbd8e54244cd02bdcf4f1057be3ce96631f35ac3.patch b/meta-zephyr-core/recipes-devtools-arc/gcc/files/cbd8e54244cd02bdcf4f1057be3ce96631f35ac3.patch
similarity index 100%
rename from recipes-devtools-arc/gcc/files/cbd8e54244cd02bdcf4f1057be3ce96631f35ac3.patch
rename to meta-zephyr-core/recipes-devtools-arc/gcc/files/cbd8e54244cd02bdcf4f1057be3ce96631f35ac3.patch
diff --git a/recipes-devtools-arc/gcc/gcc-6.x.arc.inc b/meta-zephyr-core/recipes-devtools-arc/gcc/gcc-6.x.arc.inc
similarity index 100%
rename from recipes-devtools-arc/gcc/gcc-6.x.arc.inc
rename to meta-zephyr-core/recipes-devtools-arc/gcc/gcc-6.x.arc.inc
diff --git a/recipes-devtools-arc/gcc/gcc-cross-canadian_6.x.arc.bb b/meta-zephyr-core/recipes-devtools-arc/gcc/gcc-cross-canadian_6.x.arc.bb
similarity index 100%
rename from recipes-devtools-arc/gcc/gcc-cross-canadian_6.x.arc.bb
rename to meta-zephyr-core/recipes-devtools-arc/gcc/gcc-cross-canadian_6.x.arc.bb
diff --git a/recipes-devtools-arc/gcc/gcc-cross_6.x.arc .bb b/meta-zephyr-core/recipes-devtools-arc/gcc/gcc-cross_6.x.arc .bb
similarity index 100%
rename from recipes-devtools-arc/gcc/gcc-cross_6.x.arc .bb
rename to meta-zephyr-core/recipes-devtools-arc/gcc/gcc-cross_6.x.arc .bb
diff --git a/recipes-devtools-arc/gcc/gcc-source_6.x.arc.bb b/meta-zephyr-core/recipes-devtools-arc/gcc/gcc-source_6.x.arc.bb
similarity index 100%
rename from recipes-devtools-arc/gcc/gcc-source_6.x.arc.bb
rename to meta-zephyr-core/recipes-devtools-arc/gcc/gcc-source_6.x.arc.bb
diff --git a/recipes-devtools-arc/gcc/libgcc_6.x.arc.bb b/meta-zephyr-core/recipes-devtools-arc/gcc/libgcc_6.x.arc.bb
similarity index 100%
rename from recipes-devtools-arc/gcc/libgcc_6.x.arc.bb
rename to meta-zephyr-core/recipes-devtools-arc/gcc/libgcc_6.x.arc.bb
diff --git a/recipes-devtools/gcc/gcc-cross_6.%.bbappend b/meta-zephyr-core/recipes-devtools/gcc/gcc-cross_6.%.bbappend
similarity index 100%
rename from recipes-devtools/gcc/gcc-cross_6.%.bbappend
rename to meta-zephyr-core/recipes-devtools/gcc/gcc-cross_6.%.bbappend
diff --git a/recipes-devtools/gcc/libgcc_6.%.bbappend b/meta-zephyr-core/recipes-devtools/gcc/libgcc_6.%.bbappend
similarity index 100%
rename from recipes-devtools/gcc/libgcc_6.%.bbappend
rename to meta-zephyr-core/recipes-devtools/gcc/libgcc_6.%.bbappend
diff --git a/meta-zephyr-core/recipes-devtools/python/python3-colorama_0.4.4.bb b/meta-zephyr-core/recipes-devtools/python/python3-colorama_0.4.4.bb
new file mode 100644
index 0000000..67b8d52
--- /dev/null
+++ b/meta-zephyr-core/recipes-devtools/python/python3-colorama_0.4.4.bb
@@ -0,0 +1,16 @@
+# SPDX-FileCopyrightText: Huawei Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+SUMMARY = "Python colorama"
+HOMEPAGE = "https://pypi.org/project/colorama"
+DESCRIPTION = "Makes ANSI escape character sequences (for producing colored \
+ terminal text and cursor positioning) work under MS Windows."
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b4936429a56a652b84c5c01280dcaa26"
+
+inherit pypi setuptools3
+
+PYPI_PACKAGE = "colorama"
+SRC_URI[md5sum] = "57b22f2597f63df051b69906fbf310cc"
+SRC_URI[sha256sum] = "5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b"
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-zephyr-core/recipes-devtools/python/python3-intelhex_2.3.0.bb b/meta-zephyr-core/recipes-devtools/python/python3-intelhex_2.3.0.bb
new file mode 100644
index 0000000..e297491
--- /dev/null
+++ b/meta-zephyr-core/recipes-devtools/python/python3-intelhex_2.3.0.bb
@@ -0,0 +1,12 @@
+# SPDX-FileCopyrightText: Huawei Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+SUMMARY = "Python library for Intel HEX files manipulations"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4eba844696655c3eae07aca8e3a94772"
+
+SRC_URI[sha256sum] = "892b7361a719f4945237da8ccf754e9513db32f5628852785aea108dcd250093"
+
+inherit pypi setuptools3
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-zephyr-core/recipes-devtools/python/python3-lpc-checksum_2.2.0.bb b/meta-zephyr-core/recipes-devtools/python/python3-lpc-checksum_2.2.0.bb
new file mode 100644
index 0000000..503f7ca
--- /dev/null
+++ b/meta-zephyr-core/recipes-devtools/python/python3-lpc-checksum_2.2.0.bb
@@ -0,0 +1,14 @@
+# SPDX-FileCopyrightText: Huawei Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+SUMMARY = "Python lpc_checksum"
+HOMEPAGE = "https://pypi.org/project/lpc_checksum"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=85c86965b0249c221935f585c0313d60"
+
+inherit pypi setuptools3
+
+PYPI_PACKAGE = "lpc_checksum"
+SRC_URI[md5sum] = "eef81888414a111e1fd5992b8614b6cb"
+SRC_URI[sha256sum] = "1f2fb198483cc718141f1aa0ed4717fd188e29874d7db0409d1ed04358b64185"
+BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-devtools/qemu/files/nios2-add-support.patch b/meta-zephyr-core/recipes-devtools/qemu/files/nios2-add-support.patch
similarity index 100%
rename from recipes-devtools/qemu/files/nios2-add-support.patch
rename to meta-zephyr-core/recipes-devtools/qemu/files/nios2-add-support.patch
diff --git a/recipes-devtools/qemu/qemu_%.bbappend b/meta-zephyr-core/recipes-devtools/qemu/qemu_%.bbappend
similarity index 100%
rename from recipes-devtools/qemu/qemu_%.bbappend
rename to meta-zephyr-core/recipes-devtools/qemu/qemu_%.bbappend
diff --git a/recipes-kernel/zephyr-kernel/files/0001-cmake-add-yocto-toolchain.patch b/meta-zephyr-core/recipes-kernel/zephyr-kernel/files/0001-cmake-add-yocto-toolchain.patch
similarity index 100%
rename from recipes-kernel/zephyr-kernel/files/0001-cmake-add-yocto-toolchain.patch
rename to meta-zephyr-core/recipes-kernel/zephyr-kernel/files/0001-cmake-add-yocto-toolchain.patch
diff --git a/recipes-kernel/zephyr-kernel/files/0001-cmake-added-missing-file-ext-to.patch b/meta-zephyr-core/recipes-kernel/zephyr-kernel/files/0001-cmake-added-missing-file-ext-to.patch
similarity index 100%
rename from recipes-kernel/zephyr-kernel/files/0001-cmake-added-missing-file-ext-to.patch
rename to meta-zephyr-core/recipes-kernel/zephyr-kernel/files/0001-cmake-added-missing-file-ext-to.patch
diff --git a/recipes-kernel/zephyr-kernel/files/0001-x86-fix-efi-binary-generation-issue-in-cross-compila.patch b/meta-zephyr-core/recipes-kernel/zephyr-kernel/files/0001-x86-fix-efi-binary-generation-issue-in-cross-compila.patch
similarity index 100%
rename from recipes-kernel/zephyr-kernel/files/0001-x86-fix-efi-binary-generation-issue-in-cross-compila.patch
rename to meta-zephyr-core/recipes-kernel/zephyr-kernel/files/0001-x86-fix-efi-binary-generation-issue-in-cross-compila.patch
diff --git a/recipes-kernel/zephyr-kernel/files/arduino-nano-33-ble-storage-partition.patch b/meta-zephyr-core/recipes-kernel/zephyr-kernel/files/arduino-nano-33-ble-storage-partition.patch
similarity index 100%
rename from recipes-kernel/zephyr-kernel/files/arduino-nano-33-ble-storage-partition.patch
rename to meta-zephyr-core/recipes-kernel/zephyr-kernel/files/arduino-nano-33-ble-storage-partition.patch
diff --git a/recipes-kernel/zephyr-kernel/files/dtc.patch b/meta-zephyr-core/recipes-kernel/zephyr-kernel/files/dtc.patch
similarity index 100%
rename from recipes-kernel/zephyr-kernel/files/dtc.patch
rename to meta-zephyr-core/recipes-kernel/zephyr-kernel/files/dtc.patch
diff --git a/recipes-kernel/zephyr-kernel/zephyr-blinky.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-blinky.bb
similarity index 100%
rename from recipes-kernel/zephyr-kernel/zephyr-blinky.bb
rename to meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-blinky.bb
diff --git a/recipes-kernel/zephyr-kernel/zephyr-coap-client.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-coap-client.bb
similarity index 100%
rename from recipes-kernel/zephyr-kernel/zephyr-coap-client.bb
rename to meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-coap-client.bb
diff --git a/recipes-kernel/zephyr-kernel/zephyr-coap-server.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-coap-server.bb
similarity index 100%
rename from recipes-kernel/zephyr-kernel/zephyr-coap-server.bb
rename to meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-coap-server.bb
diff --git a/recipes-kernel/zephyr-kernel/zephyr-echo-client.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-echo-client.bb
similarity index 100%
rename from recipes-kernel/zephyr-kernel/zephyr-echo-client.bb
rename to meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-echo-client.bb
diff --git a/recipes-kernel/zephyr-kernel/zephyr-hci-uart.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-hci-uart.bb
similarity index 100%
rename from recipes-kernel/zephyr-kernel/zephyr-hci-uart.bb
rename to meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-hci-uart.bb
diff --git a/recipes-kernel/zephyr-kernel/zephyr-helloworld.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-helloworld.bb
similarity index 100%
rename from recipes-kernel/zephyr-kernel/zephyr-helloworld.bb
rename to meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-helloworld.bb
diff --git a/recipes-kernel/zephyr-kernel/zephyr-http-client.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-http-client.bb
similarity index 100%
rename from recipes-kernel/zephyr-kernel/zephyr-http-client.bb
rename to meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-http-client.bb
diff --git a/recipes-kernel/zephyr-kernel/zephyr-image.inc b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-image.inc
similarity index 100%
rename from recipes-kernel/zephyr-kernel/zephyr-image.inc
rename to meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-image.inc
diff --git a/recipes-kernel/zephyr-kernel/zephyr-kernel-common.inc b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-common.inc
similarity index 100%
rename from recipes-kernel/zephyr-kernel/zephyr-kernel-common.inc
rename to meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-common.inc
diff --git a/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.6.1.inc b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.6.1.inc
similarity index 100%
rename from recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.6.1.inc
rename to meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.6.1.inc
diff --git a/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.7.1.inc b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.7.1.inc
similarity index 100%
rename from recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.7.1.inc
rename to meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.7.1.inc
diff --git a/recipes-kernel/zephyr-kernel/zephyr-kernel-src-dev.inc b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src-dev.inc
similarity index 100%
rename from recipes-kernel/zephyr-kernel/zephyr-kernel-src-dev.inc
rename to meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src-dev.inc
diff --git a/recipes-kernel/zephyr-kernel/zephyr-kernel-src.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src.bb
similarity index 100%
rename from recipes-kernel/zephyr-kernel/zephyr-kernel-src.bb
rename to meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src.bb
diff --git a/recipes-kernel/zephyr-kernel/zephyr-kernel-src.inc b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src.inc
similarity index 100%
rename from recipes-kernel/zephyr-kernel/zephyr-kernel-src.inc
rename to meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src.inc
diff --git a/recipes-kernel/zephyr-kernel/zephyr-kernel-test-all.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-test-all.bb
similarity index 100%
rename from recipes-kernel/zephyr-kernel/zephyr-kernel-test-all.bb
rename to meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-test-all.bb
diff --git a/recipes-kernel/zephyr-kernel/zephyr-kernel-test.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-test.bb
similarity index 100%
rename from recipes-kernel/zephyr-kernel/zephyr-kernel-test.bb
rename to meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-test.bb
diff --git a/recipes-kernel/zephyr-kernel/zephyr-kernel-test.inc b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-test.inc
similarity index 100%
rename from recipes-kernel/zephyr-kernel/zephyr-kernel-test.inc
rename to meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-test.inc
diff --git a/recipes-kernel/zephyr-kernel/zephyr-lvgl.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-lvgl.bb
similarity index 100%
rename from recipes-kernel/zephyr-kernel/zephyr-lvgl.bb
rename to meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-lvgl.bb
diff --git a/recipes-kernel/zephyr-kernel/zephyr-mqtt-publisher.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-mqtt-publisher.bb
similarity index 100%
rename from recipes-kernel/zephyr-kernel/zephyr-mqtt-publisher.bb
rename to meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-mqtt-publisher.bb
diff --git a/recipes-kernel/zephyr-kernel/zephyr-openamp-rsc-table.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-openamp-rsc-table.bb
similarity index 100%
rename from recipes-kernel/zephyr-kernel/zephyr-openamp-rsc-table.bb
rename to meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-openamp-rsc-table.bb
diff --git a/recipes-kernel/zephyr-kernel/zephyr-openthread-echo-client.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-openthread-echo-client.bb
similarity index 100%
rename from recipes-kernel/zephyr-kernel/zephyr-openthread-echo-client.bb
rename to meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-openthread-echo-client.bb
diff --git a/recipes-kernel/zephyr-kernel/zephyr-peripheral-esp.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-peripheral-esp.bb
similarity index 100%
rename from recipes-kernel/zephyr-kernel/zephyr-peripheral-esp.bb
rename to meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-peripheral-esp.bb
diff --git a/recipes-kernel/zephyr-kernel/zephyr-peripheral-hr.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-peripheral-hr.bb
similarity index 100%
rename from recipes-kernel/zephyr-kernel/zephyr-peripheral-hr.bb
rename to meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-peripheral-hr.bb
diff --git a/recipes-kernel/zephyr-kernel/zephyr-philosophers.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-philosophers.bb
similarity index 100%
rename from recipes-kernel/zephyr-kernel/zephyr-philosophers.bb
rename to meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-philosophers.bb
diff --git a/recipes-kernel/zephyr-kernel/zephyr-sample.inc b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-sample.inc
similarity index 100%
rename from recipes-kernel/zephyr-kernel/zephyr-sample.inc
rename to meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-sample.inc
diff --git a/recipes-kernel/zephyr-kernel/zephyr-websocket-client.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-websocket-client.bb
similarity index 100%
rename from recipes-kernel/zephyr-kernel/zephyr-websocket-client.bb
rename to meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-websocket-client.bb
--
2.25.1


[meta-zephyr][PATCH v4] Restructure and remove MACHINEOVERRIDES

Eilís Ní Fhlannagáin
 

From: Eilís Ní Fhlannagáin <elizabeth.flanagan@huawei.com>

This set of patches relates to what I discussed at https://lists.yoctoproject.org/g/yocto/message/55285.

Four major issues (and one minor issue)are dealt with in this series. The first is a logical split of the
meta-zephyr layer into a machine BSP layer and a functional core layer.

The second is the removal for the need of MACHINEOVERRIDES as a method of telling zephyr it's'-DZEPHYR_MODULES. Zephyr
already knows this, so by abusing west list a bit, we can pull that information out and generate the needed config
line to be passed into cmake. Out of tree ZEPHYR_MODULES should be added via ZEPHYR_EXTRA_MODULES.

The third major issue is as we're now relying on west to know what modules Zephyr needs, we need to checkout the
complete Zephyr source.

The last major issue is that Zephyr knows it's own machine config and I would like us to support as many of the Zephyr
machines as possible. As I've yet to find a way to do this at build time, with a little abuse of cmake exports we can
generate machine configurations based on what is in Zephyr itself. These have obviously not all been tested

I've not added the machines it generates as there are still some issues around automatic machine generation that I wish
to solve before adding those machines, however 288 machines will build helloworld without issue. More work needs to be
done here. A few machines will most likely never work at all without some significant work.

Lastly there was a minor issue with the 2.6.1 kernel in that the dtc patch Ross created for 2.7.0 (moved to 2.7.1) wasn't
applied which causes 2.6.1 to fail with the same error


Eilís Ní Fhlannagáin (8):
meta-zephyr-core/bsp: Restructure into sublayers
west: Add west and python dependencies
zephyr.bbclass: Remove need for MACHINEOVERRIDES for ZEPHYR_MODULES
zephyr-kernel-src: Add complete zephyr source
zephyr-kernel-src-2.6.1: Add dtc patch.
recipes-meta: Abuse CMake to create OE machine definitions
zephyr-kernel: Modify recipes to work with new -DZEPHYR_MODULES
README.txt: Document generate-zephyr-machine use

README.txt | 18 +-
{conf => meta-zephyr-bsp/conf}/layer.conf | 12 +-
.../conf}/machine/96b-avenger96.conf | 0
.../conf}/machine/96b-nitrogen.conf | 0
.../conf}/machine/arduino-nano-33-ble.conf | 0
.../conf}/machine/include/nrf52.inc | 2 -
.../machine/include/stm32mp1-cortex-m4.inc | 3 -
.../conf}/machine/include/tune-arc.inc | 0
.../machine/include/tune-corei7-common.inc | 0
.../conf}/machine/include/tune-cortexm0.inc | 0
.../conf}/machine/include/tune-cortexm3.inc | 0
.../conf}/machine/include/tune-cortexm4.inc | 0
.../conf}/machine/include/tune-iamcu.inc | 0
.../conf}/machine/include/tune-nios2.inc | 0
.../conf}/machine/intel-x86-64.conf | 0
.../conf}/machine/nrf52840dk-nrf52840.conf | 0
.../conf}/machine/qemu-cortex-m3.conf | 0
.../conf}/machine/qemu-nios2.conf | 0
.../conf}/machine/qemu-x86.conf | 0
.../conf}/machine/stm32mp157c-dk2.conf | 0
...xport-an-OpenEmbedded-machine-config.patch | 184 ++++++++++++++++++
.../meta/generate-zephyr-machines.bb | 45 +++++
COPYING.MIT => meta-zephyr-core/COPYING.MIT | 0
meta-zephyr-core/README.txt | 119 +++++++++++
.../classes}/siteinfo-zephyr.bbclass | 0
.../classes}/zephyr-flash-bossac.bbclass | 0
.../classes}/zephyr-flash-dfu.bbclass | 0
.../classes}/zephyr-flash-pyocd.bbclass | 0
.../classes}/zephyr-qemuboot.bbclass | 0
.../classes}/zephyr.bbclass | 42 ++++
.../classes}/zephyrtest.bbclass | 0
.../conf}/distro/zephyr.conf | 0
meta-zephyr-core/conf/layer.conf | 22 +++
.../lib}/oeqa/controllers/__init__.py | 0
.../oeqa/controllers/zephyrtargetcontrol.py | 0
.../lib}/oeqa/runtime/__init__.py | 0
.../lib}/oeqa/runtime/cases/zephyr.py | 0
.../lib}/oeqa/utils/qemuzephyrrunner.py | 0
.../recipes-core}/newlib/newlib_%.bbappend | 0
.../binutils/binutils-2.26arc.inc | 0
.../binutils-cross-canadian_2.26arc.bb | 0
.../binutils/binutils-cross_2.26arc.bb | 0
...e54244cd02bdcf4f1057be3ce96631f35ac3.patch | 0
.../recipes-devtools-arc}/gcc/gcc-6.x.arc.inc | 0
.../gcc/gcc-cross-canadian_6.x.arc.bb | 0
.../gcc/gcc-cross_6.x.arc .bb | 0
.../gcc/gcc-source_6.x.arc.bb | 0
.../gcc/libgcc_6.x.arc.bb | 0
.../gcc/gcc-cross_6.%.bbappend | 0
.../recipes-devtools}/gcc/libgcc_6.%.bbappend | 0
.../python/python3-anytree_2.8.0.bb | 14 ++
.../python/python3-breathe_4.31.0.bb | 17 ++
.../python/python3-canopen_1.2.1.bb | 17 ++
.../python/python3-cbor_1.0.0.bb | 19 ++
.../python/python3-gitlint_0.15.1.bb | 14 ++
.../python/python3-imgtool_1.7.2.bb | 14 ++
.../python/python3-junithtml_30.0.4.bb | 14 ++
.../python/python3-junitparser_2.1.1.bb | 14 ++
.../python/python3-lpc-checksum_2.2.0.bb | 14 ++
.../python/python3-packaging_21.0.bb | 14 ++
.../python/python3-pyelftools_0.27.bb | 14 ++
.../python/python3-pygithub_1.55.bb | 14 ++
.../python/python3-pygments_2.10.0.bb | 15 ++
.../recipes-devtools/python/python3-pylink | 11 ++
.../python/python3-pyocd_0.32.0.bb | 14 ++
.../python/python3-pyparsing_2.4.7.bb | 14 ++
.../python/python3-sphinx_4.2.0.bb | 14 ++
.../qemu/files/nios2-add-support.patch | 0
.../recipes-devtools}/qemu/qemu_%.bbappend | 0
.../recipes-devtools/west/west_0.12.99.bb | 22 +++
.../0001-cmake-add-yocto-toolchain.patch | 0
...0001-cmake-added-missing-file-ext-to.patch | 0
...ry-generation-issue-in-cross-compila.patch | 0
...rduino-nano-33-ble-storage-partition.patch | 0
.../zephyr-kernel/files/dtc.patch | 0
.../zephyr-kernel/zephyr-blinky.bb | 0
.../zephyr-kernel/zephyr-coap-client.bb | 2 -
.../zephyr-kernel/zephyr-coap-server.bb | 2 -
.../zephyr-kernel/zephyr-echo-client.bb | 2 -
.../zephyr-kernel/zephyr-hci-uart.bb | 0
.../zephyr-kernel/zephyr-helloworld.bb | 0
.../zephyr-kernel/zephyr-http-client.bb | 1 -
.../zephyr-kernel/zephyr-image.inc | 0
.../zephyr-kernel/zephyr-kernel-common.inc | 13 +-
.../zephyr-kernel/zephyr-kernel-src-2.6.1.inc | 54 +++++
.../zephyr-kernel/zephyr-kernel-src-2.7.1.inc | 69 +++++++
.../zephyr-kernel/zephyr-kernel-src-dev.inc | 0
.../zephyr-kernel/zephyr-kernel-src.bb | 0
.../zephyr-kernel/zephyr-kernel-src.inc | 58 ++++++
.../zephyr-kernel/zephyr-kernel-test-all.bb | 0
.../zephyr-kernel/zephyr-kernel-test.bb | 0
.../zephyr-kernel/zephyr-kernel-test.inc | 0
.../zephyr-kernel/zephyr-lvgl.bb | 8 +
.../zephyr-kernel/zephyr-mqtt-publisher.bb | 2 -
.../zephyr-kernel/zephyr-openamp-rsc-table.bb | 0
.../zephyr-openthread-echo-client.bb | 3 -
.../zephyr-kernel/zephyr-peripheral-esp.bb | 2 -
.../zephyr-kernel/zephyr-peripheral-hr.bb | 2 -
.../zephyr-kernel/zephyr-philosophers.bb | 0
.../zephyr-kernel/zephyr-sample.inc | 0
.../zephyr-kernel/zephyr-websocket-client.bb | 2 -
.../zephyr-kernel/zephyr-kernel-src-2.6.1.inc | 20 --
.../zephyr-kernel/zephyr-kernel-src-2.7.1.inc | 20 --
.../zephyr-kernel/zephyr-kernel-src.inc | 27 ---
recipes-kernel/zephyr-kernel/zephyr-lvgl.bb | 18 --
105 files changed, 898 insertions(+), 123 deletions(-)
rename {conf => meta-zephyr-bsp/conf}/layer.conf (62%)
rename {conf => meta-zephyr-bsp/conf}/machine/96b-avenger96.conf (100%)
rename {conf => meta-zephyr-bsp/conf}/machine/96b-nitrogen.conf (100%)
rename {conf => meta-zephyr-bsp/conf}/machine/arduino-nano-33-ble.conf (100%)
rename {conf => meta-zephyr-bsp/conf}/machine/include/nrf52.inc (89%)
rename {conf => meta-zephyr-bsp/conf}/machine/include/stm32mp1-cortex-m4.inc (67%)
rename {conf => meta-zephyr-bsp/conf}/machine/include/tune-arc.inc (100%)
rename {conf => meta-zephyr-bsp/conf}/machine/include/tune-corei7-common.inc (100%)
rename {conf => meta-zephyr-bsp/conf}/machine/include/tune-cortexm0.inc (100%)
rename {conf => meta-zephyr-bsp/conf}/machine/include/tune-cortexm3.inc (100%)
rename {conf => meta-zephyr-bsp/conf}/machine/include/tune-cortexm4.inc (100%)
rename {conf => meta-zephyr-bsp/conf}/machine/include/tune-iamcu.inc (100%)
rename {conf => meta-zephyr-bsp/conf}/machine/include/tune-nios2.inc (100%)
rename {conf => meta-zephyr-bsp/conf}/machine/intel-x86-64.conf (100%)
rename {conf => meta-zephyr-bsp/conf}/machine/nrf52840dk-nrf52840.conf (100%)
rename {conf => meta-zephyr-bsp/conf}/machine/qemu-cortex-m3.conf (100%)
rename {conf => meta-zephyr-bsp/conf}/machine/qemu-nios2.conf (100%)
rename {conf => meta-zephyr-bsp/conf}/machine/qemu-x86.conf (100%)
rename {conf => meta-zephyr-bsp/conf}/machine/stm32mp157c-dk2.conf (100%)
create mode 100644 meta-zephyr-bsp/recipes-meta/meta/files/0001-zephyr-Export-an-OpenEmbedded-machine-config.patch
create mode 100644 meta-zephyr-bsp/recipes-meta/meta/generate-zephyr-machines.bb
rename COPYING.MIT => meta-zephyr-core/COPYING.MIT (100%)
create mode 100644 meta-zephyr-core/README.txt
rename {classes => meta-zephyr-core/classes}/siteinfo-zephyr.bbclass (100%)
rename {classes => meta-zephyr-core/classes}/zephyr-flash-bossac.bbclass (100%)
rename {classes => meta-zephyr-core/classes}/zephyr-flash-dfu.bbclass (100%)
rename {classes => meta-zephyr-core/classes}/zephyr-flash-pyocd.bbclass (100%)
rename {classes => meta-zephyr-core/classes}/zephyr-qemuboot.bbclass (100%)
rename {classes => meta-zephyr-core/classes}/zephyr.bbclass (54%)
rename {classes => meta-zephyr-core/classes}/zephyrtest.bbclass (100%)
rename {conf => meta-zephyr-core/conf}/distro/zephyr.conf (100%)
create mode 100644 meta-zephyr-core/conf/layer.conf
rename {lib => meta-zephyr-core/lib}/oeqa/controllers/__init__.py (100%)
rename {lib => meta-zephyr-core/lib}/oeqa/controllers/zephyrtargetcontrol.py (100%)
rename {lib => meta-zephyr-core/lib}/oeqa/runtime/__init__.py (100%)
rename {lib => meta-zephyr-core/lib}/oeqa/runtime/cases/zephyr.py (100%)
rename {lib => meta-zephyr-core/lib}/oeqa/utils/qemuzephyrrunner.py (100%)
rename {recipes-core => meta-zephyr-core/recipes-core}/newlib/newlib_%.bbappend (100%)
rename {recipes-devtools-arc => meta-zephyr-core/recipes-devtools-arc}/binutils/binutils-2.26arc.inc (100%)
rename {recipes-devtools-arc => meta-zephyr-core/recipes-devtools-arc}/binutils/binutils-cross-canadian_2.26arc.bb (100%)
rename {recipes-devtools-arc => meta-zephyr-core/recipes-devtools-arc}/binutils/binutils-cross_2.26arc.bb (100%)
rename {recipes-devtools-arc => meta-zephyr-core/recipes-devtools-arc}/gcc/files/cbd8e54244cd02bdcf4f1057be3ce96631f35ac3.patch (100%)
rename {recipes-devtools-arc => meta-zephyr-core/recipes-devtools-arc}/gcc/gcc-6.x.arc.inc (100%)
rename {recipes-devtools-arc => meta-zephyr-core/recipes-devtools-arc}/gcc/gcc-cross-canadian_6.x.arc.bb (100%)
rename {recipes-devtools-arc => meta-zephyr-core/recipes-devtools-arc}/gcc/gcc-cross_6.x.arc .bb (100%)
rename {recipes-devtools-arc => meta-zephyr-core/recipes-devtools-arc}/gcc/gcc-source_6.x.arc.bb (100%)
rename {recipes-devtools-arc => meta-zephyr-core/recipes-devtools-arc}/gcc/libgcc_6.x.arc.bb (100%)
rename {recipes-devtools => meta-zephyr-core/recipes-devtools}/gcc/gcc-cross_6.%.bbappend (100%)
rename {recipes-devtools => meta-zephyr-core/recipes-devtools}/gcc/libgcc_6.%.bbappend (100%)
create mode 100644 meta-zephyr-core/recipes-devtools/python/python3-anytree_2.8.0.bb
create mode 100644 meta-zephyr-core/recipes-devtools/python/python3-breathe_4.31.0.bb
create mode 100644 meta-zephyr-core/recipes-devtools/python/python3-canopen_1.2.1.bb
create mode 100644 meta-zephyr-core/recipes-devtools/python/python3-cbor_1.0.0.bb
create mode 100644 meta-zephyr-core/recipes-devtools/python/python3-gitlint_0.15.1.bb
create mode 100644 meta-zephyr-core/recipes-devtools/python/python3-imgtool_1.7.2.bb
create mode 100644 meta-zephyr-core/recipes-devtools/python/python3-junithtml_30.0.4.bb
create mode 100644 meta-zephyr-core/recipes-devtools/python/python3-junitparser_2.1.1.bb
create mode 100644 meta-zephyr-core/recipes-devtools/python/python3-lpc-checksum_2.2.0.bb
create mode 100644 meta-zephyr-core/recipes-devtools/python/python3-packaging_21.0.bb
create mode 100644 meta-zephyr-core/recipes-devtools/python/python3-pyelftools_0.27.bb
create mode 100644 meta-zephyr-core/recipes-devtools/python/python3-pygithub_1.55.bb
create mode 100644 meta-zephyr-core/recipes-devtools/python/python3-pygments_2.10.0.bb
create mode 100644 meta-zephyr-core/recipes-devtools/python/python3-pylink
create mode 100644 meta-zephyr-core/recipes-devtools/python/python3-pyocd_0.32.0.bb
create mode 100644 meta-zephyr-core/recipes-devtools/python/python3-pyparsing_2.4.7.bb
create mode 100644 meta-zephyr-core/recipes-devtools/python/python3-sphinx_4.2.0.bb
rename {recipes-devtools => meta-zephyr-core/recipes-devtools}/qemu/files/nios2-add-support.patch (100%)
rename {recipes-devtools => meta-zephyr-core/recipes-devtools}/qemu/qemu_%.bbappend (100%)
create mode 100644 meta-zephyr-core/recipes-devtools/west/west_0.12.99.bb
rename {recipes-kernel => meta-zephyr-core/recipes-kernel}/zephyr-kernel/files/0001-cmake-add-yocto-toolchain.patch (100%)
rename {recipes-kernel => meta-zephyr-core/recipes-kernel}/zephyr-kernel/files/0001-cmake-added-missing-file-ext-to.patch (100%)
rename {recipes-kernel => meta-zephyr-core/recipes-kernel}/zephyr-kernel/files/0001-x86-fix-efi-binary-generation-issue-in-cross-compila.patch (100%)
rename {recipes-kernel => meta-zephyr-core/recipes-kernel}/zephyr-kernel/files/arduino-nano-33-ble-storage-partition.patch (100%)
rename {recipes-kernel => meta-zephyr-core/recipes-kernel}/zephyr-kernel/files/dtc.patch (100%)
rename {recipes-kernel => meta-zephyr-core/recipes-kernel}/zephyr-kernel/zephyr-blinky.bb (100%)
rename {recipes-kernel => meta-zephyr-core/recipes-kernel}/zephyr-kernel/zephyr-coap-client.bb (60%)
rename {recipes-kernel => meta-zephyr-core/recipes-kernel}/zephyr-kernel/zephyr-coap-server.bb (60%)
rename {recipes-kernel => meta-zephyr-core/recipes-kernel}/zephyr-kernel/zephyr-echo-client.bb (60%)
rename {recipes-kernel => meta-zephyr-core/recipes-kernel}/zephyr-kernel/zephyr-hci-uart.bb (100%)
rename {recipes-kernel => meta-zephyr-core/recipes-kernel}/zephyr-kernel/zephyr-helloworld.bb (100%)
rename {recipes-kernel => meta-zephyr-core/recipes-kernel}/zephyr-kernel/zephyr-http-client.bb (61%)
rename {recipes-kernel => meta-zephyr-core/recipes-kernel}/zephyr-kernel/zephyr-image.inc (100%)
rename {recipes-kernel => meta-zephyr-core/recipes-kernel}/zephyr-kernel/zephyr-kernel-common.inc (76%)
create mode 100644 meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.6.1.inc
create mode 100644 meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.7.1.inc
rename {recipes-kernel => meta-zephyr-core/recipes-kernel}/zephyr-kernel/zephyr-kernel-src-dev.inc (100%)
rename {recipes-kernel => meta-zephyr-core/recipes-kernel}/zephyr-kernel/zephyr-kernel-src.bb (100%)
create mode 100644 meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src.inc
rename {recipes-kernel => meta-zephyr-core/recipes-kernel}/zephyr-kernel/zephyr-kernel-test-all.bb (100%)
rename {recipes-kernel => meta-zephyr-core/recipes-kernel}/zephyr-kernel/zephyr-kernel-test.bb (100%)
rename {recipes-kernel => meta-zephyr-core/recipes-kernel}/zephyr-kernel/zephyr-kernel-test.inc (100%)
create mode 100644 meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-lvgl.bb
rename {recipes-kernel => meta-zephyr-core/recipes-kernel}/zephyr-kernel/zephyr-mqtt-publisher.bb (59%)
rename {recipes-kernel => meta-zephyr-core/recipes-kernel}/zephyr-kernel/zephyr-openamp-rsc-table.bb (100%)
rename {recipes-kernel => meta-zephyr-core/recipes-kernel}/zephyr-kernel/zephyr-openthread-echo-client.bb (77%)
rename {recipes-kernel => meta-zephyr-core/recipes-kernel}/zephyr-kernel/zephyr-peripheral-esp.bb (58%)
rename {recipes-kernel => meta-zephyr-core/recipes-kernel}/zephyr-kernel/zephyr-peripheral-hr.bb (58%)
rename {recipes-kernel => meta-zephyr-core/recipes-kernel}/zephyr-kernel/zephyr-philosophers.bb (100%)
rename {recipes-kernel => meta-zephyr-core/recipes-kernel}/zephyr-kernel/zephyr-sample.inc (100%)
rename {recipes-kernel => meta-zephyr-core/recipes-kernel}/zephyr-kernel/zephyr-websocket-client.bb (61%)
delete mode 100644 recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.6.1.inc
delete mode 100644 recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.7.1.inc
delete mode 100644 recipes-kernel/zephyr-kernel/zephyr-kernel-src.inc
delete mode 100644 recipes-kernel/zephyr-kernel/zephyr-lvgl.bb

--
2.25.1


Re: Invalid checksums for SRC_URI ignored?

Michael Opdenacker
 

Peter, Ross

On 1/19/22 1:56 PM, Peter Bergin wrote:
Hi,

On 2022-01-19 13:16, Michael Opdenacker wrote:
Greetings,

I reused a simple "hello" recipe and added a non-matching checksum to
it:

...
SRC_URI = "file://helloworld.c"
SRC_URI[md5sum] = "34f0efd76b4f18888888888833cdd129"
...

The rest of the recipe comes from
https://git.openembedded.org/openembedded-core/tree/meta-skeleton/recipes-skeleton/hello-single.


Why doesn't Bitbake stop, reporting that the checksum doesn't match the
source file?
Anyway, why does the recipe build without a checksum? Shouldn't
checksums be mandatory?
No they are not mandatory for all fetchers. They are only used for
content downloaded from non-local archives.
https://docs.yoctoproject.org/bitbake/bitbake-user-manual/bitbake-user-manual-fetching.html#the-download-fetch


https://github.com/openembedded/bitbake/blob/32180d5057c818a69987aada482e82acf3c72ef2/lib/bb/fetch2/__init__.py#L1268


^^ here you can see the selection of URI's that automatically needs a
checksum.

Thanks for your replies. This all makes perfect sense then.
Thanks again
Michael.

--
Michael Opdenacker, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com


Re: Invalid checksums for SRC_URI ignored?

Peter Bergin
 

Hi,

On 2022-01-19 13:16, Michael Opdenacker wrote:
Greetings,

I reused a simple "hello" recipe and added a non-matching checksum to it:

...
SRC_URI = "file://helloworld.c"
SRC_URI[md5sum] = "34f0efd76b4f18888888888833cdd129"
...

The rest of the recipe comes from
https://git.openembedded.org/openembedded-core/tree/meta-skeleton/recipes-skeleton/hello-single.

Why doesn't Bitbake stop, reporting that the checksum doesn't match the
source file?
Anyway, why does the recipe build without a checksum? Shouldn't
checksums be mandatory?
No they are not mandatory for all fetchers. They are only used for content downloaded from non-local archives. https://docs.yoctoproject.org/bitbake/bitbake-user-manual/bitbake-user-manual-fetching.html#the-download-fetch


https://github.com/openembedded/bitbake/blob/32180d5057c818a69987aada482e82acf3c72ef2/lib/bb/fetch2/__init__.py#L1268

^^ here you can see the selection of URI's that automatically needs a checksum.

Best regards,
/Peter


Re: Invalid checksums for SRC_URI ignored?

Ross Burton <ross@...>
 

On Wed, 19 Jan 2022 at 12:16, Michael Opdenacker
<michael.opdenacker@bootlin.com> wrote:

Greetings,

I reused a simple "hello" recipe and added a non-matching checksum to it:

...
SRC_URI = "file://helloworld.c"
SRC_URI[md5sum] = "34f0efd76b4f18888888888833cdd129"
...

The rest of the recipe comes from
https://git.openembedded.org/openembedded-core/tree/meta-skeleton/recipes-skeleton/hello-single.

Why doesn't Bitbake stop, reporting that the checksum doesn't match the
source file?
Anyway, why does the recipe build without a checksum? Shouldn't
checksums be mandatory?
Checksums are for files that are fetched via http:// and friends, not
local files.

Ross

1221 - 1240 of 57104