Skip to content
Snippets Groups Projects
Commit 3bf39b12 authored by Stefan Schmidt's avatar Stefan Schmidt
Browse files

Merge branch 'upstream-bump-without-ci' into kirkstone

Upmerge of the latest changes from meta-zephyr kirkstone branch.
parents c7a397ff d19cc749
No related branches found
No related tags found
1 merge request!26Upmerge of latest meta-zephyr kirkstone branch without the new CI
Pipeline #11296 passed with warnings
......@@ -9,9 +9,9 @@ Prerequisites:
==============
This layer depends on:
Yocto distro (master)
Yocto distro (kirkstone)
git://git.yoctoproject.org/poky
Python layer (meta-openembedded/meta-python)
Python layer (meta-openembedded/meta-python) (kirkstone)
git://git.openembedded.org/meta-openembedded
Modify local conf by adding:
......
......@@ -14,3 +14,5 @@ QB_OPT_APPEND = "-nographic"
QB_CPU = "-cpu nios2"
ARCH:qemu-nios2 = "nios2"
TCLIBC = "glibc"
......@@ -50,4 +50,4 @@ python testdata_clean() {
os.remove(fname)
}
addtask do_testdata_write before do_build after do_deploy
addtask do_testdata_write before do_testimage after do_deploy
......@@ -4,7 +4,7 @@ DISTRO_VERSION = "1.0"
TARGET_VENDOR = "-yocto"
TCLIBC = "newlib"
TCLIBC ?= "newlib"
TEST_TARGET = "QemuTargetZephyr"
TEST_SUITES = "zephyr"
......
......@@ -17,7 +17,7 @@ SRC_URI += " \
# echo SRCREV_$x = \"$rev\"'
#
SRCREV_default = "e4da3e528088a34a9989f5a50e7ed3149d57de92"
SRCREV_default = "6dd320f791c4da49190b30f9134f776d85bc5836"
SRCREV_canopennode = "f167efe85c8c7de886f1bc47f9173cfb8a346bb5"
SRCREV_civetweb = "094aeb41bb93e9199d24d665ee43e9e05d6d7b1c"
SRCREV_cmsis = "b0612c97c1401feeb4160add6462c3627fe90fc7"
......@@ -63,6 +63,6 @@ SRCREV_TraceRecorder = "36c577727642457b0db7274298a4b96558374832"
SRCREV_tfm = "c74be3890c9d975976fde1b1a3b2f5742bec34c0"
ZEPHYR_BRANCH = "v2.7-branch"
PV = "2.7.1+git${SRCPV}"
PV = "2.7.2+git${SRCPV}"
SRC_URI:append = " file://dtc.patch"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment