| Message ID | 20230104043632.1351038-1-naveen.kumar.saini@intel.com |
|---|---|
| State | New |
| Headers | show |
| Series | [meta-zephyr] layer.conf: update LAYERSERIES_COMPAT for mickledore | expand |
On Wed, Jan 04, 2023 at 12:36:32PM +0800, Naveen Saini wrote: > 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> I ran this series (batched with the other patches destined for the master branch) though CI and it passes (with the known qemu a9 poll issue). See: https://gitlab.com/jonmason00/meta-zephyr/-/pipelines/747733921 Tested-by: Jon Mason <jon.mason@arm.com> > --- > meta-zephyr-bsp/conf/layer.conf | 4 +--- > meta-zephyr-bsp/conf/machine/include/tune-corei7-common.inc | 4 ++-- > meta-zephyr-bsp/conf/machine/qemu-x86.conf | 2 +- > meta-zephyr-core/conf/layer.conf | 4 +--- > 4 files changed, 5 insertions(+), 9 deletions(-) > > diff --git a/meta-zephyr-bsp/conf/layer.conf b/meta-zephyr-bsp/conf/layer.conf > index cbbaafe..d809926 100644 > --- a/meta-zephyr-bsp/conf/layer.conf > +++ b/meta-zephyr-bsp/conf/layer.conf > @@ -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" > diff --git a/meta-zephyr-bsp/conf/machine/include/tune-corei7-common.inc b/meta-zephyr-bsp/conf/machine/include/tune-corei7-common.inc > index b68fc05..6975c50 100644 > --- a/meta-zephyr-bsp/conf/machine/include/tune-corei7-common.inc > +++ b/meta-zephyr-bsp/conf/machine/include/tune-corei7-common.inc > @@ -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:" > diff --git a/meta-zephyr-bsp/conf/machine/qemu-x86.conf b/meta-zephyr-bsp/conf/machine/qemu-x86.conf > index 0333d7c..d21de35 100644 > --- a/meta-zephyr-bsp/conf/machine/qemu-x86.conf > +++ b/meta-zephyr-bsp/conf/machine/qemu-x86.conf > @@ -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" > > diff --git a/meta-zephyr-core/conf/layer.conf b/meta-zephyr-core/conf/layer.conf > index 2b1c821..fdff4f6 100644 > --- a/meta-zephyr-core/conf/layer.conf > +++ b/meta-zephyr-core/conf/layer.conf > @@ -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" > > -- > 2.25.1 > >
diff --git a/meta-zephyr-bsp/conf/layer.conf b/meta-zephyr-bsp/conf/layer.conf index cbbaafe..d809926 100644 --- a/meta-zephyr-bsp/conf/layer.conf +++ b/meta-zephyr-bsp/conf/layer.conf @@ -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" diff --git a/meta-zephyr-bsp/conf/machine/include/tune-corei7-common.inc b/meta-zephyr-bsp/conf/machine/include/tune-corei7-common.inc index b68fc05..6975c50 100644 --- a/meta-zephyr-bsp/conf/machine/include/tune-corei7-common.inc +++ b/meta-zephyr-bsp/conf/machine/include/tune-corei7-common.inc @@ -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:" diff --git a/meta-zephyr-bsp/conf/machine/qemu-x86.conf b/meta-zephyr-bsp/conf/machine/qemu-x86.conf index 0333d7c..d21de35 100644 --- a/meta-zephyr-bsp/conf/machine/qemu-x86.conf +++ b/meta-zephyr-bsp/conf/machine/qemu-x86.conf @@ -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" diff --git a/meta-zephyr-core/conf/layer.conf b/meta-zephyr-core/conf/layer.conf index 2b1c821..fdff4f6 100644 --- a/meta-zephyr-core/conf/layer.conf +++ b/meta-zephyr-core/conf/layer.conf @@ -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"
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> --- meta-zephyr-bsp/conf/layer.conf | 4 +--- meta-zephyr-bsp/conf/machine/include/tune-corei7-common.inc | 4 ++-- meta-zephyr-bsp/conf/machine/qemu-x86.conf | 2 +- meta-zephyr-core/conf/layer.conf | 4 +--- 4 files changed, 5 insertions(+), 9 deletions(-)