LM
/
coreos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(layers): move third party layers to external-layers 

BREAKING CHANGE: bblayers.conf / bblayers.conf.sample of project
using CoreOS should be adapted to use external-layers instead
of layers for each moved layers
This commit is contained in:
Samuel Dolt 2023-06-14 14:39:56 +02:00
parent e2d30321b9
commit 0d5beff86f
8 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.gitmodules vendored
View File

@ -3,22 +3,22 @@
url = ssh://git@bitbucket.gad.local:7999/ico/bitbake.git url = ssh://git@bitbucket.gad.local:7999/ico/bitbake.git
branch = 2.0 branch = 2.0
[submodule "layers/openembedded-core"] [submodule "layers/openembedded-core"]
path = layers/openembedded-core path = external-layers/openembedded-core
url = ssh://git@bitbucket.gad.local:7999/ico/openembedded-core.git url = ssh://git@bitbucket.gad.local:7999/ico/openembedded-core.git
branch = kirkstone branch = kirkstone
[submodule "layers/meta-openembedded"] [submodule "layers/meta-openembedded"]
path = layers/meta-openembedded path = external-layers/meta-openembedded
url = ssh://git@bitbucket.gad.local:7999/ico/meta-openembedded.git url = ssh://git@bitbucket.gad.local:7999/ico/meta-openembedded.git
branch = kirkstone branch = kirkstone
[submodule "layers/meta-virtualization"] [submodule "layers/meta-virtualization"]
path = layers/meta-virtualization path = external-layers/meta-virtualization
url = ssh://git@bitbucket.gad.local:7999/ico/meta-virtualization.git url = ssh://git@bitbucket.gad.local:7999/ico/meta-virtualization.git
branch = kirkstone branch = kirkstone
[submodule "layers/meta-efibootguard"] [submodule "layers/meta-efibootguard"]
path = layers/meta-efibootguard path = external-layers/meta-efibootguard
url = ssh://git@bitbucket.gad.local:7999/ico/meta-efibootguard.git url = ssh://git@bitbucket.gad.local:7999/ico/meta-efibootguard.git
branch = master branch = master
[submodule "layers/meta-swupdate"] [submodule "layers/meta-swupdate"]
path = layers/meta-swupdate path = external-layers/meta-swupdate
url = ssh://git@bitbucket.gad.local:7999/ico/meta-swupdate.git url = ssh://git@bitbucket.gad.local:7999/ico/meta-swupdate.git
branch = kirkstone branch = kirkstone

5
coreos-init-build-env
View File

@ -26,7 +26,7 @@ COREOS_ROOT=$(readlink -f "${COREOS_ROOT}")
# Set the path to bitbake, openembedded-core and the template directory # Set the path to bitbake, openembedded-core and the template directory
# All theses values can be overriden by the caller of coreos-init-build-env # All theses values can be overriden by the caller of coreos-init-build-env
BITBAKEDIR="${BITBAKEDIR:-${COREOS_ROOT}/bitbake}" BITBAKEDIR="${BITBAKEDIR:-${COREOS_ROOT}/bitbake}"
OEROOT="${OEROOT:-${COREOS_ROOT}/layers/openembedded-core}" OEROOT="${OEROOT:-${COREOS_ROOT}/external-layers/openembedded-core}"
TEMPLATECONF="${TEMPLATECONF:-${COREOS_ROOT}/templates}" TEMPLATECONF="${TEMPLATECONF:-${COREOS_ROOT}/templates}"
# Sanity checks # Sanity checks
@ -84,6 +84,9 @@ coreos_path_add "${COREOS_ROOT}/scripts"
# Add support for ##COREOS_LAYERSDIR## inside of bblayer template # Add support for ##COREOS_LAYERSDIR## inside of bblayer template
coreos-bblayers-envsub COREOS_LAYERSDIR "${COREOS_ROOT}/layers" coreos-bblayers-envsub COREOS_LAYERSDIR "${COREOS_ROOT}/layers"
# Add support for ##COREOS_EXTLAYERSDIR## inside of bblayer template
coreos-bblayers-envsub COREOS_EXTLAYERSDIR "${COREOS_ROOT}/external-layers"
# Generate the ${BUILDDIR}/key directory. The scripts doesn't generate anything it # Generate the ${BUILDDIR}/key directory. The scripts doesn't generate anything it
# the directory already exist, so it's safe to call it everytime # the directory already exist, so it's safe to call it everytime
coreos-keygen > /dev/null 2> /dev/null coreos-keygen > /dev/null 2> /dev/null

0
layers/meta-efibootguard → external-layers/meta-efibootguard
View File

0
layers/meta-openembedded → external-layers/meta-openembedded
View File

0
layers/meta-swupdate → external-layers/meta-swupdate
View File

0
layers/meta-virtualization → external-layers/meta-virtualization
View File

0
layers/openembedded-core → external-layers/openembedded-core
View File

16
templates/bblayers.conf.sample
View File

@ -11,12 +11,12 @@ BBLAYERS ?= " \
##COREOS_LAYERSDIR##/meta-belden-coreos-bsp \ ##COREOS_LAYERSDIR##/meta-belden-coreos-bsp \
##COREOS_LAYERSDIR##/meta-belden-coreos-demo \ ##COREOS_LAYERSDIR##/meta-belden-coreos-demo \
##COREOS_LAYERSDIR##/meta-belden-marvell-bsp \ ##COREOS_LAYERSDIR##/meta-belden-marvell-bsp \
##COREOS_LAYERSDIR##/meta-openembedded/meta-oe \ ##COREOS_EXTLAYERSDIR##/meta-openembedded/meta-oe \
##COREOS_LAYERSDIR##/meta-openembedded/meta-networking \ ##COREOS_EXTLAYERSDIR##/meta-openembedded/meta-networking \
##COREOS_LAYERSDIR##/meta-openembedded/meta-filesystems \ ##COREOS_EXTLAYERSDIR##/meta-openembedded/meta-filesystems \
##COREOS_LAYERSDIR##/meta-openembedded/meta-python \ ##COREOS_EXTLAYERSDIR##/meta-openembedded/meta-python \
##COREOS_LAYERSDIR##/meta-openembedded/meta-webserver \ ##COREOS_EXTLAYERSDIR##/meta-openembedded/meta-webserver \
##COREOS_LAYERSDIR##/meta-virtualization \ ##COREOS_EXTLAYERSDIR##/meta-virtualization \
##COREOS_LAYERSDIR##/meta-efibootguard \ ##COREOS_EXTLAYERSDIR##/meta-efibootguard \
##COREOS_LAYERSDIR##/meta-swupdate \ ##COREOS_EXTLAYERSDIR##/meta-swupdate \
" "