Merge pull request #2771 from Freescale/backport-2757-to-wrynose

[Backport wrynose] isp-imx: Move to dynamic-layers/openembedded-layer

4 files changed, 2 insertions, 2 deletions

diff --git a/recipes-bsp/isp-imx/basler-camera_4.2.2.26.1.bb b/dynamic-layers/openembedded-layer/recipes-bsp/isp-imx/basler-camera_4.2.2.26.1.bb
index 802bee5e4..802bee5e4 100644
--- a/recipes-bsp/isp-imx/basler-camera_4.2.2.26.1.bb
+++ b/dynamic-layers/openembedded-layer/recipes-bsp/isp-imx/basler-camera_4.2.2.26.1.bb
diff --git a/recipes-bsp/isp-imx/isp-imx/0001-isp-imx-start_isp-don-t-report-error-if-no-camera-is.patch b/dynamic-layers/openembedded-layer/recipes-bsp/isp-imx/isp-imx/0001-isp-imx-start_isp-don-t-report-error-if-no-camera-is.patch
index 930119261..930119261 100644
--- a/recipes-bsp/isp-imx/isp-imx/0001-isp-imx-start_isp-don-t-report-error-if-no-camera-is.patch
+++ b/dynamic-layers/openembedded-layer/recipes-bsp/isp-imx/isp-imx/0001-isp-imx-start_isp-don-t-report-error-if-no-camera-is.patch
diff --git a/recipes-bsp/isp-imx/isp-imx_4.2.2.26.1.bb b/dynamic-layers/openembedded-layer/recipes-bsp/isp-imx/isp-imx_4.2.2.26.1.bb
index 866123e8e..866123e8e 100644
--- a/recipes-bsp/isp-imx/isp-imx_4.2.2.26.1.bb
+++ b/dynamic-layers/openembedded-layer/recipes-bsp/isp-imx/isp-imx_4.2.2.26.1.bb
diff --git a/recipes-fsl/packagegroups/packagegroup-fsl-isp.bb b/recipes-fsl/packagegroups/packagegroup-fsl-isp.bb
index 81e1a9640..a1282e7a0 100644
--- a/recipes-fsl/packagegroups/packagegroup-fsl-isp.bb
+++ b/recipes-fsl/packagegroups/packagegroup-fsl-isp.bb
@@ -9,9 +9,9 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 inherit packagegroup
 
 ISP_PKGS ?= ""
+# isp-imx and basler-camera are in dynamic-layers/openembedded-layer.
 ISP_PKGS:mx8mp-nxp-bsp = "\
-    isp-imx \
-    basler-camera \
+    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'openembedded-layer', 'isp-imx basler-camera', '', d)} \
     kernel-module-isp-vvcam \
 "
 RDEPENDS:${PN} = "\