Skip to content

Commit

Permalink
layer.conf: update LAYERSERIES_COMPAT for mickledore
Browse files Browse the repository at this point in the history
oe-core switched to mickedore in:
https://git.openembedded.org/openembedded-core/commit/?id=57239d66b933c4313cf331d35d13ec2d0661c38f

Drop support for old releases.

Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
  • Loading branch information
saininav committed Jan 5, 2023
1 parent 226b881 commit 174c318
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 9 deletions.
4 changes: 1 addition & 3 deletions meta-zephyr-bsp/conf/layer.conf
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,4 @@ LAYERVERSION_zephyrbsp = "1"

LAYERDEPENDS_zephyrbsp = "zephyrcore core meta-python"

LAYERSERIES_COMPAT_zephyrbsp = "dunfell gatesgarth hardknott honister kirkstone langdale"

X86_TUNE_DIR = "${@bb.utils.contains_any('LAYERSERIES_CORENAMES', 'honister kirkstone langdale', 'include/x86', 'include', d)}"
LAYERSERIES_COMPAT_zephyrbsp = "kirkstone langdale mickledore"
4 changes: 2 additions & 2 deletions meta-zephyr-bsp/conf/machine/include/tune-corei7-common.inc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
DEFAULTTUNE ?= "corei7-64"
require conf/machine/${X86_TUNE_DIR}/tune-corei7.inc
require conf/machine/${X86_TUNE_DIR}/x86-base.inc
require conf/machine/include/x86/tune-corei7.inc
require conf/machine/include/x86/x86-base.inc

# Add x86 to MACHINEOVERRIDE
MACHINEOVERRIDES =. "x86:"
2 changes: 1 addition & 1 deletion meta-zephyr-bsp/conf/machine/qemu-x86.conf
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#@DESCRIPTION: Machine for Zephyr BOARD qemu_x86

require conf/machine/include/qemu.inc
require conf/machine/${X86_TUNE_DIR}/tune-i586.inc
require conf/machine/include/x86/tune-i586.inc

ZEPHYR_INHERIT_CLASSES += "zephyr-qemuboot"

Expand Down
4 changes: 1 addition & 3 deletions meta-zephyr-core/conf/layer.conf
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@ LAYERVERSION_zephyrcore = "1"

LAYERDEPENDS_zephyrcore = "core meta-python"

LAYERSERIES_COMPAT_zephyrcore = "dunfell gatesgarth hardknott honister kirkstone langdale"

X86_TUNE_DIR = "${@bb.utils.contains_any('LAYERSERIES_CORENAMES', 'honister kirkstone langdale', 'include/x86', 'include', d)}"
LAYERSERIES_COMPAT_zephyrcore = "kirkstone langdale mickledore"

PYTHON3_NATIVE_SITEPACKAGES_DIR = "${libdir_native}/${PYTHON3_DIR}/site-packages"

Expand Down

0 comments on commit 174c318

Please sign in to comment.