From dcdab4608021c8f23d409ed9e6cc19c6ca5a8d1a Mon Sep 17 00:00:00 2001
From: Javier Viguera <javier.viguera@digi.com>
Date: Mon, 13 Feb 2017 18:02:21 +0100
Subject: [PATCH] morty migration: meta-digi: update FSL layer name

meta-fsl-arm is no longer used for Morty release. Now the community
support is implemented in 'meta-freescale' layer.

https://jira.digi.com/browse/DEL-3451

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
 meta-digi-arm/README                            | 2 +-
 meta-digi-arm/conf/layer.conf                   | 2 +-
 meta-digi-dey/README                            | 2 +-
 sdk/config/ccardimx28js/bblayers.conf.sample    | 2 +-
 sdk/config/ccimx6sbc/bblayers.conf.sample       | 2 +-
 sdk/config/ccimx6ulsbc/bblayers.conf.sample     | 2 +-
 sdk/config/ccimx6ulstarter/bblayers.conf.sample | 2 +-
 sdk/mkproject.sh                                | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/meta-digi-arm/README b/meta-digi-arm/README
index caf755dc3..42ccfa3a8 100644
--- a/meta-digi-arm/README
+++ b/meta-digi-arm/README
@@ -8,7 +8,7 @@ This layer depends on:
 
 git://git.yoctoproject.org/poky.git
 git://git.openembedded.org/meta-openembedded.git
-git://git.yoctoproject.org/meta-fsl-arm.git
+git://git.yoctoproject.org/meta-freescale.git
 
 Digi's license agreements
 -------------------------
diff --git a/meta-digi-arm/conf/layer.conf b/meta-digi-arm/conf/layer.conf
index 8be9b22cb..2c820d8f6 100644
--- a/meta-digi-arm/conf/layer.conf
+++ b/meta-digi-arm/conf/layer.conf
@@ -9,7 +9,7 @@ BBFILE_COLLECTIONS += "digi-arm"
 BBFILE_PATTERN_digi-arm := "^${LAYERDIR}/"
 BBFILE_PRIORITY_digi-arm = "5"
 
-LAYERDEPENDS_digi-arm = "core fsl-arm"
+LAYERDEPENDS_digi-arm = "core freescale-layer"
 
 # Digi's General and Open Source license agreements
 DIGI_EULA_FILE = "${LAYERDIR}/DIGI_EULA"
diff --git a/meta-digi-dey/README b/meta-digi-dey/README
index 85d3d700e..51f44149f 100644
--- a/meta-digi-dey/README
+++ b/meta-digi-dey/README
@@ -7,7 +7,7 @@ This layer depends on:
 
 git://git.yoctoproject.org/poky.git
 git://git.openembedded.org/meta-openembedded.git
-git://git.yoctoproject.org/meta-fsl-arm.git
+git://git.yoctoproject.org/meta-freescale.git
 git://github.com/Freescale/meta-fsl-demos.git
 
 Digi's license agreements
diff --git a/sdk/config/ccardimx28js/bblayers.conf.sample b/sdk/config/ccardimx28js/bblayers.conf.sample
index 0647c0d8d..69afda123 100644
--- a/sdk/config/ccardimx28js/bblayers.conf.sample
+++ b/sdk/config/ccardimx28js/bblayers.conf.sample
@@ -14,7 +14,7 @@ BBLAYERS ?= " \
   ##DIGIBASE##/meta-openembedded/meta-networking \
   ##DIGIBASE##/meta-openembedded/meta-webserver \
   ##DIGIBASE##/meta-qt5 \
-  ##DIGIBASE##/meta-fsl-arm \
+  ##DIGIBASE##/meta-freescale \
   ##DIGIBASE##/meta-fsl-demos \
   ##DIGIBASE##/meta-digi/meta-digi-arm \
   ##DIGIBASE##/meta-digi/meta-digi-dey \
diff --git a/sdk/config/ccimx6sbc/bblayers.conf.sample b/sdk/config/ccimx6sbc/bblayers.conf.sample
index 5d78bd456..a6dfc3e99 100644
--- a/sdk/config/ccimx6sbc/bblayers.conf.sample
+++ b/sdk/config/ccimx6sbc/bblayers.conf.sample
@@ -15,7 +15,7 @@ BBLAYERS ?= " \
   ##DIGIBASE##/meta-openembedded/meta-webserver \
   ##DIGIBASE##/meta-qt5 \
   ##DIGIBASE##/meta-swupdate \
-  ##DIGIBASE##/meta-fsl-arm \
+  ##DIGIBASE##/meta-freescale \
   ##DIGIBASE##/meta-fsl-demos \
   ##DIGIBASE##/meta-digi/meta-digi-arm \
   ##DIGIBASE##/meta-digi/meta-digi-dey \
diff --git a/sdk/config/ccimx6ulsbc/bblayers.conf.sample b/sdk/config/ccimx6ulsbc/bblayers.conf.sample
index 5d78bd456..a6dfc3e99 100644
--- a/sdk/config/ccimx6ulsbc/bblayers.conf.sample
+++ b/sdk/config/ccimx6ulsbc/bblayers.conf.sample
@@ -15,7 +15,7 @@ BBLAYERS ?= " \
   ##DIGIBASE##/meta-openembedded/meta-webserver \
   ##DIGIBASE##/meta-qt5 \
   ##DIGIBASE##/meta-swupdate \
-  ##DIGIBASE##/meta-fsl-arm \
+  ##DIGIBASE##/meta-freescale \
   ##DIGIBASE##/meta-fsl-demos \
   ##DIGIBASE##/meta-digi/meta-digi-arm \
   ##DIGIBASE##/meta-digi/meta-digi-dey \
diff --git a/sdk/config/ccimx6ulstarter/bblayers.conf.sample b/sdk/config/ccimx6ulstarter/bblayers.conf.sample
index 5d78bd456..a6dfc3e99 100644
--- a/sdk/config/ccimx6ulstarter/bblayers.conf.sample
+++ b/sdk/config/ccimx6ulstarter/bblayers.conf.sample
@@ -15,7 +15,7 @@ BBLAYERS ?= " \
   ##DIGIBASE##/meta-openembedded/meta-webserver \
   ##DIGIBASE##/meta-qt5 \
   ##DIGIBASE##/meta-swupdate \
-  ##DIGIBASE##/meta-fsl-arm \
+  ##DIGIBASE##/meta-freescale \
   ##DIGIBASE##/meta-fsl-demos \
   ##DIGIBASE##/meta-digi/meta-digi-arm \
   ##DIGIBASE##/meta-digi/meta-digi-dey \
diff --git a/sdk/mkproject.sh b/sdk/mkproject.sh
index aff70c3ad..b53ff3eb2 100755
--- a/sdk/mkproject.sh
+++ b/sdk/mkproject.sh
@@ -86,7 +86,7 @@ do_license() {
 	local MKP_LICENSE_FILES=" \
 		${MKP_SCRIPTPATH}/sources/meta-digi/meta-digi-arm/DIGI_EULA \
 		${MKP_SCRIPTPATH}/sources/meta-digi/meta-digi-arm/DIGI_OPEN_EULA \
-		${MKP_SCRIPTPATH}/sources/meta-fsl-arm/EULA \
+		${MKP_SCRIPTPATH}/sources/meta-freescale/EULA \
 	"
 	[ -z "${MKP_PAGER+x}" ] && MKP_PAGER="| more"
 	eval cat - "${MKP_LICENSE_FILES}" <<-_EOF_ ${MKP_PAGER}; printf "\n"