From 02d512b09fa21df8c0a9b91008b7a88eb8a13322 Mon Sep 17 00:00:00 2001 From: Sam Dolt Date: Mon, 13 Nov 2023 16:08:42 +0100 Subject: [PATCH] feat: update bitbake to latest master --- .gitmodules | 8 ++++---- bitbake | 2 +- layers/meta-belden-coreos-bsp/conf/layer.conf | 2 +- layers/meta-belden-coreos-demo/conf/layer.conf | 2 +- .../conf/distro/belden-coreos-base.conf | 2 +- layers/meta-belden-coreos/conf/distro/belden-coreos.conf | 2 +- layers/meta-belden-coreos/conf/layer.conf | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitmodules b/.gitmodules index 6b44124..b9e9147 100644 --- a/.gitmodules +++ b/.gitmodules @@ -5,15 +5,15 @@ [submodule "layers/openembedded-core"] path = external-layers/openembedded-core url = ssh://git@bitbucket.gad.local:7999/ico/openembedded-core.git - branch = kirkstone + branch = master [submodule "layers/meta-openembedded"] path = external-layers/meta-openembedded url = ssh://git@bitbucket.gad.local:7999/ico/meta-openembedded.git - branch = kirkstone + branch = master [submodule "layers/meta-virtualization"] path = external-layers/meta-virtualization url = ssh://git@bitbucket.gad.local:7999/ico/meta-virtualization.git - branch = kirkstone + branch = master [submodule "layers/meta-efibootguard"] path = external-layers/meta-efibootguard url = ssh://git@bitbucket.gad.local:7999/ico/meta-efibootguard.git @@ -21,4 +21,4 @@ [submodule "layers/meta-swupdate"] path = external-layers/meta-swupdate url = ssh://git@bitbucket.gad.local:7999/ico/meta-swupdate.git - branch = kirkstone + branch = master diff --git a/bitbake b/bitbake index 41b6684..c0e87e0 160000 --- a/bitbake +++ b/bitbake @@ -1 +1 @@ -Subproject commit 41b6684489d0261753344956042be2cc4adb0159 +Subproject commit c0e87e005a5b135353ffdf1d17b77f40bff29af2 diff --git a/layers/meta-belden-coreos-bsp/conf/layer.conf b/layers/meta-belden-coreos-bsp/conf/layer.conf index 2577c7a..b4fb95f 100644 --- a/layers/meta-belden-coreos-bsp/conf/layer.conf +++ b/layers/meta-belden-coreos-bsp/conf/layer.conf @@ -10,4 +10,4 @@ BBFILE_PATTERN_meta-belden-coreos-bsp = "^${LAYERDIR}/" BBFILE_PRIORITY_meta-belden-coreos-bsp = "6" LAYERDEPENDS_meta-belden-coreos-bsp = "core meta-belden-coreos" -LAYERSERIES_COMPAT_meta-belden-coreos-bsp = "kirkstone" +LAYERSERIES_COMPAT_meta-belden-coreos-bsp = "nanbield" diff --git a/layers/meta-belden-coreos-demo/conf/layer.conf b/layers/meta-belden-coreos-demo/conf/layer.conf index 514f8d2..d4cf41d 100644 --- a/layers/meta-belden-coreos-demo/conf/layer.conf +++ b/layers/meta-belden-coreos-demo/conf/layer.conf @@ -10,4 +10,4 @@ BBFILE_PATTERN_meta-belden-coreos-demo = "^${LAYERDIR}/" BBFILE_PRIORITY_meta-belden-coreos-demo = "6" LAYERDEPENDS_meta-belden-coreos-demo = "meta-belden-coreos meta-belden-coreos-bsp" -LAYERSERIES_COMPAT_meta-belden-coreos-demo = "kirkstone" +LAYERSERIES_COMPAT_meta-belden-coreos-demo = "nanbield" diff --git a/layers/meta-belden-coreos/conf/distro/belden-coreos-base.conf b/layers/meta-belden-coreos/conf/distro/belden-coreos-base.conf index 22001d4..4f4a1ef 100644 --- a/layers/meta-belden-coreos/conf/distro/belden-coreos-base.conf +++ b/layers/meta-belden-coreos/conf/distro/belden-coreos-base.conf @@ -5,4 +5,4 @@ DISTRO_NAME = "Belden CoreOS (Base)" MAINTAINER = "Belden CoreOS Team" DISTRO_VERSION = "0.0.1" -DISTRO_CODENAME = "kirkstone" +DISTRO_CODENAME = "master" diff --git a/layers/meta-belden-coreos/conf/distro/belden-coreos.conf b/layers/meta-belden-coreos/conf/distro/belden-coreos.conf index 4eec78e..68c0285 100644 --- a/layers/meta-belden-coreos/conf/distro/belden-coreos.conf +++ b/layers/meta-belden-coreos/conf/distro/belden-coreos.conf @@ -6,4 +6,4 @@ DISTRO_NAME = "Belden CoreOS" MAINTAINER = "Belden CoreOS Team" DISTRO_VERSION = "0.0.1" -DISTRO_CODENAME = "kirkstone" +DISTRO_CODENAME = "master" diff --git a/layers/meta-belden-coreos/conf/layer.conf b/layers/meta-belden-coreos/conf/layer.conf index 9a797c1..68cf248 100644 --- a/layers/meta-belden-coreos/conf/layer.conf +++ b/layers/meta-belden-coreos/conf/layer.conf @@ -17,7 +17,7 @@ LAYERDEPENDS_meta-belden-coreos = "\ webserver \ " -LAYERSERIES_COMPAT_meta-belden-coreos = "kirkstone" +LAYERSERIES_COMPAT_meta-belden-coreos = "nanbield" # Set a variable to get to the top of the metadata location COREOS_ROOT = '${@os.path.normpath("${LAYERDIR}/../../")}'