diff options
Diffstat (limited to 'templates')
5 files changed, 10 insertions, 6 deletions
diff --git a/templates/feature/agl-ci/99_local.conf.inc b/templates/feature/agl-ci/99_local.conf.inc index e17bc83a9..c12cd1717 100644 --- a/templates/feature/agl-ci/99_local.conf.inc +++ b/templates/feature/agl-ci/99_local.conf.inc @@ -30,3 +30,6 @@ INHERIT += "buildstats-summary" #PRSERV_HOST = "${AGL_HOST_PRSERV}:8181" IMAGE_INSTALL:append = " curl" + +# remote .rootfs suffix +IMAGE_NAME_SUFFIX = "" diff --git a/templates/feature/agl-selinux/50_bblayers.conf.inc b/templates/feature/agl-selinux/50_bblayers.conf.inc index b17e292e9..392b70099 100644 --- a/templates/feature/agl-selinux/50_bblayers.conf.inc +++ b/templates/feature/agl-selinux/50_bblayers.conf.inc @@ -1,5 +1,8 @@ AGL_META_PYTHON = "${METADIR}/external/meta-openembedded/meta-python" +# Needed to satisfy uutils-coreutils DEPENDS when using SELinux +AGL_META_CLANG = "${METADIR}/external/meta-clang" + BBLAYERS =+ " \ ${METADIR}/external/meta-selinux \ " diff --git a/templates/feature/agl-weston-remoting/included.dep b/templates/feature/agl-weston-remoting/included.dep deleted file mode 100644 index 82639da07..000000000 --- a/templates/feature/agl-weston-remoting/included.dep +++ /dev/null @@ -1 +0,0 @@ -agl-demo diff --git a/templates/machine/raspberrypi5/50_bblayers.conf.inc b/templates/machine/raspberrypi5/50_bblayers.conf.inc index 2e677dd8a..d225d627b 100644 --- a/templates/machine/raspberrypi5/50_bblayers.conf.inc +++ b/templates/machine/raspberrypi5/50_bblayers.conf.inc @@ -1 +1,4 @@ -BBLAYERS =+ "${METADIR}/bsp/meta-raspberrypi" +BBLAYERS =+ " \ + ${METADIR}/bsp/meta-raspberrypi \ + ${METADIR}/bsp/meta-lts-mixins_u-boot \ +" diff --git a/templates/machine/unmatched/50_bblayers.conf.inc b/templates/machine/unmatched/50_bblayers.conf.inc index 03565bafd..bf78285b5 100644 --- a/templates/machine/unmatched/50_bblayers.conf.inc +++ b/templates/machine/unmatched/50_bblayers.conf.inc @@ -1,6 +1,2 @@ # This is the original place, but we need to tweak layer.conf BBLAYERS =+ "${METADIR}/bsp/meta-sifive" - -# For now, tweak the layer's compatibility to allow using with kirkstone, -# since we know it works without major issues. -LAYERSERIES_COMPAT_meta-sifive:append = " kirkstone" |