summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2024-07-08 13:08:05 -0400
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2024-07-09 09:35:22 +0000
commitf30ecab82fbc3cf1e591fdf667644e4bc69689e6 (patch)
tree48d29628d2ac075a15680f8f2d18f6c3c797ed2d
parenta399ba323c850ecf1604b1e32921b25531682a46 (diff)
agl-pipewire: update layer dependenciessalmon_18.90.0salmon/18.90.018.90.0
meta-pipewire now requires meta-multimeda for the base pipewire recipe, make sure that layer gets added when the agl-pipewire feature is used. This fixes builds without "agl-demo". Bug-AGL: SPEC-5129 Change-Id: If054d63f8328607d2063e8168bc88f2b82b146db Signed-off-by: Scott Murray <scott.murray@konsulko.com> Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/30101 Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org> ci-image-boot-test: Jenkins Job builder account Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account
-rw-r--r--templates/feature/agl-pipewire/50_bblayers.conf.inc10
1 files changed, 5 insertions, 5 deletions
diff --git a/templates/feature/agl-pipewire/50_bblayers.conf.inc b/templates/feature/agl-pipewire/50_bblayers.conf.inc
index e05cd4090..613ed97b3 100644
--- a/templates/feature/agl-pipewire/50_bblayers.conf.inc
+++ b/templates/feature/agl-pipewire/50_bblayers.conf.inc
@@ -1,7 +1,7 @@
+# PipeWire recipe comes from meta-multimedia
+AGL_META_MULTIMEDIA = "${METADIR}/external/meta-openembedded/meta-multimedia"
+AGL_META_PYTHON = "${METADIR}/external/meta-openembedded/meta-python"
BBLAYERS =+ " \
- ${METADIR}/meta-agl/meta-pipewire \
- "
-
-# we ship our own pipewire
-BBMASK += "meta-openembedded/meta-oe/recipes-multimedia/pipewire/"
+ ${METADIR}/meta-agl/meta-pipewire \
+"