Forráskód Böngészése

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 <liezhi.yang@windriver.com>
Robert Yang 10 hónapja
szülő
commit
1b6de69afd
1 módosított fájl, 2 hozzáadás és 5 törlés
  1. 2 5
      conf/layer.conf

+ 2 - 5
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"