Initial morty branch setup for poky & meta layers

New or updated branches:
* meta-fsl-arm & meta-fsl-arm-extra layers changes
to meta-freescale & meta-freescale-3rdparty
(morty)
* poky (morty)
* meta-openembedded (morty)
* meta-qt5 (5.9)
* meta-mingw (morty)
* meta-tegra (morty)

Modified accordingly:
* conf/.sample files
* classes/image_dd.class
* conf/distro .inc files
* scripts/manifest.xml

Change-Id: Ia8ad563f2f1176882019490f274a6b4bb043475f
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>

8 files changed, 21 insertions, 21 deletions

diff --git a/classes/image_dd.bbclass b/classes/image_dd.bbclass
index 07cd58f..cdb1054 100644
--- a/classes/image_dd.bbclass
+++ b/classes/image_dd.bbclass
@@ -27,7 +27,7 @@
 ##
 ############################################################################
 
-# This class is based on meta-fsl-arm/classes/image_types_fsl.bbclass::generate_imx_sdcard()
+# This class is based on meta-freescale/classes/image_types_fsl.bbclass::generate_imx_sdcard()
 DESCRIPTION = "The base class for building images that can be deployed with GNU coreutils dd tool."
 inherit image_types
 
diff --git a/conf/bblayers.conf.fsl.sample b/conf/bblayers.conf.fsl.sample
index 61e12fa..389cb82 100644
--- a/conf/bblayers.conf.fsl.sample
+++ b/conf/bblayers.conf.fsl.sample
@@ -38,8 +38,8 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..'
 BBLAYERS ?= " \
   ${BSPDIR}/sources/poky/meta \
   ${BSPDIR}/sources/poky/meta-poky \
-  ${BSPDIR}/sources/meta-fsl-arm \
-  ${BSPDIR}/sources/meta-fsl-arm-extra \
+  ${BSPDIR}/sources/meta-freescale \
+  ${BSPDIR}/sources/meta-freescale-3rdparty \
   ${BSPDIR}/sources/meta-openembedded/meta-oe \
   ${BSPDIR}/sources/meta-openembedded/meta-python \
   ${BSPDIR}/sources/meta-openembedded/meta-networking \
diff --git a/conf/bblayers.conf.rcar-gen2.sample b/conf/bblayers.conf.rcar-gen2.sample
index 27f28ae..737f968 100644
--- a/conf/bblayers.conf.rcar-gen2.sample
+++ b/conf/bblayers.conf.rcar-gen2.sample
@@ -42,7 +42,7 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/poky/meta \
   ${BSPDIR}/sources/poky/meta-poky \
   ${BSPDIR}/sources/meta-boot2qt/meta-renesas-extras \
-  ${BSPDIR}/sources/meta-fsl-arm \
+  ${BSPDIR}/sources/meta-freescale \
   ${BSPDIR}/sources/meta-openembedded/meta-oe \
   ${BSPDIR}/sources/meta-openembedded/meta-python \
   ${BSPDIR}/sources/meta-openembedded/meta-networking \
diff --git a/conf/bblayers.conf.smx6.sample b/conf/bblayers.conf.smx6.sample
index b10e415..4c634ec 100644
--- a/conf/bblayers.conf.smx6.sample
+++ b/conf/bblayers.conf.smx6.sample
@@ -38,8 +38,8 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..'
 BBLAYERS ?= " \
   ${BSPDIR}/sources/poky/meta \
   ${BSPDIR}/sources/poky/meta-poky \
-  ${BSPDIR}/sources/meta-fsl-arm \
-  ${BSPDIR}/sources/meta-fsl-arm-extra \
+  ${BSPDIR}/sources/meta-freescale \
+  ${BSPDIR}/sources/meta-freescale-3rdparty \
   ${BSPDIR}/sources/meta-smx6 \
   ${BSPDIR}/sources/meta-openembedded/meta-oe \
   ${BSPDIR}/sources/meta-openembedded/meta-python \
diff --git a/conf/bblayers.conf.ti.sample b/conf/bblayers.conf.ti.sample
index 8ad8960..d97a613 100644
--- a/conf/bblayers.conf.ti.sample
+++ b/conf/bblayers.conf.ti.sample
@@ -39,7 +39,7 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/poky/meta \
   ${BSPDIR}/sources/poky/meta-poky \
   ${BSPDIR}/sources/meta-ti \
-  ${BSPDIR}/sources/meta-fsl-arm \
+  ${BSPDIR}/sources/meta-freescale \
   ${BSPDIR}/sources/meta-openembedded/meta-oe \
   ${BSPDIR}/sources/meta-openembedded/meta-python \
   ${BSPDIR}/sources/meta-openembedded/meta-networking \
diff --git a/conf/distro/include/fsl.inc b/conf/distro/include/fsl.inc
index bdd0b88..32fec1b 100644
--- a/conf/distro/include/fsl.inc
+++ b/conf/distro/include/fsl.inc
@@ -27,7 +27,7 @@
 ##
 ############################################################################
 
-BBMASK += "meta-fsl-arm/qt5-layer/recipes-qt/qt5"
+BBMASK += "meta-freescale/dynamic-layers/qt5-layer/recipes-qt/qt5"
 
 IMAGE_FSTYPES += "ext3 sdcard"
 IMAGE_CLASSES += "image_types_fsl"
diff --git a/conf/distro/include/rcar-gen2.inc b/conf/distro/include/rcar-gen2.inc
index 9705877..854ac2c 100644
--- a/conf/distro/include/rcar-gen2.inc
+++ b/conf/distro/include/rcar-gen2.inc
@@ -134,6 +134,6 @@ BBMASK += "\
     dtv-module ssp-module scu-module \
     gles-test-module \
     poky/meta/recipes-graphics/mesa \
-    meta-fsl-arm/recipes-graphics/mesa \
+    meta-freescale/recipes-graphics/mesa \
     meta-rcar-gen2/recipes-devtools/file \
     "
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 1d99d3c..7259c71 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -16,25 +16,25 @@
 
   <project name="poky"
            remote="yocto"
-           revision="fc75bea445bb57e1e942b5049ee2b6e5245649ea"
+           revision="6a1f33cc40bfac33cf030fe41e1a8efd1e5fad6f"
            path="sources/poky"/>
   <project name="meta-openembedded"
            remote="oe-mirror"
-           revision="247b1267bbe95719cd4877d2d3cfbaf2a2f4865a"
+           revision="1efa5d623bc64659b57389e50be2568b1355d5f7"
            path="sources/meta-openembedded"/>
   <project name="meta-qt5"
            remote="qtyocto"
-           revision="0cc8a8a21e1ba7ffa237c64608b2a6678897c096"
+           revision="d1ddf0cc4482b8e8e46f3be66870778ba9a42a13"
            path="sources/meta-qt5"/>
   <project name="meta-mingw"
            remote="qtyocto"
            path="sources/meta-mingw"
-           revision="4a877547146f32f4540664b0c677d99b33d12bfd"/>
+           revision="bfda0f040958b3c533123071ff031037389eed62"/>
 
-  <project name="meta-fsl-arm"
-           remote="yocto"
-           revision="a6b95df4d7ab122f1e5b7632e2273b75f853af4b"
-           path="sources/meta-fsl-arm"
+  <project name="meta-freescale"
+           remote="freescale"
+           revision="ec54f623eee97b75b7ad87503477316495c7fc26"
+           path="sources/meta-freescale"
            groups="notdefault,external,fsl,ti,smx6,renesas"/>
   <project name="meta-ti"
            remote="yocto"
@@ -46,10 +46,10 @@
            revision="2745399f75d7564fcc586d0365ff73be47849d0e"
            path="sources/meta-raspberrypi"
            groups="notdefault,external,rpi"/>
-  <project name="meta-fsl-arm-extra"
+  <project name="meta-freescale-3rdparty"
            remote="freescale"
-           revision="99649b72f60fda4a2cfb2333791fe0f92997fa9e"
-           path="sources/meta-fsl-arm-extra"
+           revision="065228815a7ca5201df1ed4c030b152054a5eda3"
+           path="sources/meta-freescale-3rdparty"
            groups="notdefault,external,fsl,smx6"/>
   <project name="meta-intel"
            remote="intel"
@@ -63,7 +63,7 @@
            groups="notdefault,external,renesas"/>
   <project name="meta-tegra"
            remote="madisongh"
-           revision="9f5ffd3f8320ec3379e63e75e7c47328920751d5"
+           revision="fba09b70a8ac36248e5fcea611e3bb661bb089fc"
            path="sources/meta-tegra"
            groups="notdefault,external,jetson"/>