From 1b6de69afd6c32c4b33c59547d2da49d7f7d62af Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Sat, 3 Aug 2024 11:26:24 +0800 Subject: [PATCH] conf/layer.conf: Remove duplicated BBFILES The following line doubles BBFILES for all layers in BBFILE_COLLECTIONS: BBFILES += "${@' '.join('${LAYERDIR}/dynamic-layers/%s/recipes*/*/*.bb' % layer \ for layer in BBFILE_COLLECTIONS.split())}" And most of them are invalid, use BBFILES_DYNAMIC is the correct solution. Signed-off-by: Robert Yang --- conf/layer.conf | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/conf/layer.conf b/conf/layer.conf index 97879c0..cdf8112 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -20,11 +20,6 @@ LICENSE_PATH += "${LAYERDIR}/files/custom-licenses" # # The .bbappend and .bb files are included if the respective layer # collection is available. -BBFILES += "${@' '.join('${LAYERDIR}/dynamic-layers/%s/recipes*/*/*.bbappend' % layer \ - for layer in BBFILE_COLLECTIONS.split())}" -BBFILES += "${@' '.join('${LAYERDIR}/dynamic-layers/%s/recipes*/*/*.bb' % layer \ - for layer in BBFILE_COLLECTIONS.split())}" - BBFILES_DYNAMIC += " \ openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/*/*/*.bb \ openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/*/*/*.bbappend \ @@ -34,6 +29,8 @@ BBFILES_DYNAMIC += " \ qt5-layer:${LAYERDIR}/dynamic-layers/qt5-layer/*/*/*.bbappend \ multimedia-layer:${LAYERDIR}/dynamic-layers/multimedia-layer/*/*/*.bb \ multimedia-layer:${LAYERDIR}/dynamic-layers/multimedia-layer/*/*/*.bbappend \ + meta-python:${LAYERDIR}/dynamic-layers/meta-python/*/*/*.bb \ + meta-python:${LAYERDIR}/dynamic-layers/meta-python/*/*/*.bbappend \ " DEFAULT_TEST_SUITES:remove:rpi = "parselogs"