From ca38cdc4de1143cf6b7af76e9426ecf31f0922f0 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Wed, 15 Jul 2015 17:21:16 -0300 Subject: [PATCH] Move external layer's specific changes for 'dynamic-layers' subdir The external layer's specific changes are now in the 'dynamic-layers' subdirectory. This approach ease the identification of layer specific recipes and extensions as all those are more visible isolated of the main layer components. Signed-off-by: Otavio Salvador --- conf/layer.conf | 12 +++++++----- .../recipes-browser/chromium/chromium-imx.inc | 0 .../chromium/chromium_40.0.2214.91.bbappend | 0 ...ocessor-definitions-for-Vivante-GLES-header.patch | 0 .../efl-layer}/recipes-efl/efl/efl_%.bbappend | 0 .../recipes-benchmark/glmark2/glmark2_%.bbappend | 0 .../recipes-kernel/asf/asf_git.bb | 0 ...ccc-Opencv-app-can-t-run-on-imx6sx-with-cam.patch | 0 .../recipes-support/opencv/opencv_%.bbappend | 0 .../qt5/qtbase/Force_egl_visual_ID_33.patch | 0 .../qt5-layer}/recipes-qt/qt5/qtbase_%.bbappend | 0 ...tch-the-uniform-precision-qualifiers-in-ver.patch | 0 .../qt5-layer}/recipes-qt/qt5/qtwebkit_%.bbappend | 0 13 files changed, 7 insertions(+), 5 deletions(-) rename {browser-layer => dynamic-layers/browser-layer}/recipes-browser/chromium/chromium-imx.inc (100%) rename {browser-layer => dynamic-layers/browser-layer}/recipes-browser/chromium/chromium_40.0.2214.91.bbappend (100%) rename {efl-layer => dynamic-layers/efl-layer}/recipes-efl/efl/efl/0001-Add-preprocessor-definitions-for-Vivante-GLES-header.patch (100%) rename {efl-layer => dynamic-layers/efl-layer}/recipes-efl/efl/efl_%.bbappend (100%) rename {openembedded-layer => dynamic-layers/openembedded-layer}/recipes-benchmark/glmark2/glmark2_%.bbappend (100%) rename {openembedded-layer => dynamic-layers/openembedded-layer}/recipes-kernel/asf/asf_git.bb (100%) rename {openembedded-layer => dynamic-layers/openembedded-layer}/recipes-support/opencv/opencv/0001-MGS-515-ccc-Opencv-app-can-t-run-on-imx6sx-with-cam.patch (100%) rename {openembedded-layer => dynamic-layers/openembedded-layer}/recipes-support/opencv/opencv_%.bbappend (100%) rename {qt5-layer => dynamic-layers/qt5-layer}/recipes-qt/qt5/qtbase/Force_egl_visual_ID_33.patch (100%) rename {qt5-layer => dynamic-layers/qt5-layer}/recipes-qt/qt5/qtbase_%.bbappend (100%) rename {qt5-layer => dynamic-layers/qt5-layer}/recipes-qt/qt5/qtwebkit/0001-Fix-to-match-the-uniform-precision-qualifiers-in-ver.patch (100%) rename {qt5-layer => dynamic-layers/qt5-layer}/recipes-qt/qt5/qtwebkit_%.bbappend (100%) diff --git a/conf/layer.conf b/conf/layer.conf index 4c718ace..0899deb3 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -17,10 +17,12 @@ MIRRORS += " \ ${FSL_MIRROR} http://download.ossystems.com.br/bsp/freescale/source/ \n \ " -# Let us add layer-specific bbappends which are only applied when that -# layer is included in our configuration -BBFILES += "${@' '.join('${LAYERDIR}/%s/recipes*/*/*.bbappend' % layer \ +# The dynamic-layers directory hosts the extensions and layer specific +# modifications related to Freescale products. +# +# 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())}" -# Add layer-specific bb files too -BBFILES += "${@' '.join('${LAYERDIR}/%s/recipes*/*/*.bb' % layer \ +BBFILES += "${@' '.join('${LAYERDIR}/dynamic-layers/%s/recipes*/*/*.bb' % layer \ for layer in BBFILE_COLLECTIONS.split())}" diff --git a/browser-layer/recipes-browser/chromium/chromium-imx.inc b/dynamic-layers/browser-layer/recipes-browser/chromium/chromium-imx.inc similarity index 100% rename from browser-layer/recipes-browser/chromium/chromium-imx.inc rename to dynamic-layers/browser-layer/recipes-browser/chromium/chromium-imx.inc diff --git a/browser-layer/recipes-browser/chromium/chromium_40.0.2214.91.bbappend b/dynamic-layers/browser-layer/recipes-browser/chromium/chromium_40.0.2214.91.bbappend similarity index 100% rename from browser-layer/recipes-browser/chromium/chromium_40.0.2214.91.bbappend rename to dynamic-layers/browser-layer/recipes-browser/chromium/chromium_40.0.2214.91.bbappend diff --git a/efl-layer/recipes-efl/efl/efl/0001-Add-preprocessor-definitions-for-Vivante-GLES-header.patch b/dynamic-layers/efl-layer/recipes-efl/efl/efl/0001-Add-preprocessor-definitions-for-Vivante-GLES-header.patch similarity index 100% rename from efl-layer/recipes-efl/efl/efl/0001-Add-preprocessor-definitions-for-Vivante-GLES-header.patch rename to dynamic-layers/efl-layer/recipes-efl/efl/efl/0001-Add-preprocessor-definitions-for-Vivante-GLES-header.patch diff --git a/efl-layer/recipes-efl/efl/efl_%.bbappend b/dynamic-layers/efl-layer/recipes-efl/efl/efl_%.bbappend similarity index 100% rename from efl-layer/recipes-efl/efl/efl_%.bbappend rename to dynamic-layers/efl-layer/recipes-efl/efl/efl_%.bbappend diff --git a/openembedded-layer/recipes-benchmark/glmark2/glmark2_%.bbappend b/dynamic-layers/openembedded-layer/recipes-benchmark/glmark2/glmark2_%.bbappend similarity index 100% rename from openembedded-layer/recipes-benchmark/glmark2/glmark2_%.bbappend rename to dynamic-layers/openembedded-layer/recipes-benchmark/glmark2/glmark2_%.bbappend diff --git a/openembedded-layer/recipes-kernel/asf/asf_git.bb b/dynamic-layers/openembedded-layer/recipes-kernel/asf/asf_git.bb similarity index 100% rename from openembedded-layer/recipes-kernel/asf/asf_git.bb rename to dynamic-layers/openembedded-layer/recipes-kernel/asf/asf_git.bb diff --git a/openembedded-layer/recipes-support/opencv/opencv/0001-MGS-515-ccc-Opencv-app-can-t-run-on-imx6sx-with-cam.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0001-MGS-515-ccc-Opencv-app-can-t-run-on-imx6sx-with-cam.patch similarity index 100% rename from openembedded-layer/recipes-support/opencv/opencv/0001-MGS-515-ccc-Opencv-app-can-t-run-on-imx6sx-with-cam.patch rename to dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0001-MGS-515-ccc-Opencv-app-can-t-run-on-imx6sx-with-cam.patch diff --git a/openembedded-layer/recipes-support/opencv/opencv_%.bbappend b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv_%.bbappend similarity index 100% rename from openembedded-layer/recipes-support/opencv/opencv_%.bbappend rename to dynamic-layers/openembedded-layer/recipes-support/opencv/opencv_%.bbappend diff --git a/qt5-layer/recipes-qt/qt5/qtbase/Force_egl_visual_ID_33.patch b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase/Force_egl_visual_ID_33.patch similarity index 100% rename from qt5-layer/recipes-qt/qt5/qtbase/Force_egl_visual_ID_33.patch rename to dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase/Force_egl_visual_ID_33.patch diff --git a/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend similarity index 100% rename from qt5-layer/recipes-qt/qt5/qtbase_%.bbappend rename to dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend diff --git a/qt5-layer/recipes-qt/qt5/qtwebkit/0001-Fix-to-match-the-uniform-precision-qualifiers-in-ver.patch b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtwebkit/0001-Fix-to-match-the-uniform-precision-qualifiers-in-ver.patch similarity index 100% rename from qt5-layer/recipes-qt/qt5/qtwebkit/0001-Fix-to-match-the-uniform-precision-qualifiers-in-ver.patch rename to dynamic-layers/qt5-layer/recipes-qt/qt5/qtwebkit/0001-Fix-to-match-the-uniform-precision-qualifiers-in-ver.patch diff --git a/qt5-layer/recipes-qt/qt5/qtwebkit_%.bbappend b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtwebkit_%.bbappend similarity index 100% rename from qt5-layer/recipes-qt/qt5/qtwebkit_%.bbappend rename to dynamic-layers/qt5-layer/recipes-qt/qt5/qtwebkit_%.bbappend -- 2.40.1