From 2ae061cbab2d1b648926cc8f8d558c5bebfad674 Mon Sep 17 00:00:00 2001
From: Alex Gonzalez <alex.gonzalez@digi.com>
Date: Fri, 26 Jan 2018 18:47:42 +0100
Subject: [PATCH] meta-digi: Move cryptoauthlib to meta-digi-arm

The MACHINE_EXTRA_RRECOMMENDS for the ccimx6ul in meta-digi-arm contains
cryptoauthlib. If we want to use meta-digi-arm as a standalone BSP layer
we need to move the cryptoauthlib recipe to meta-digi-arm, that or not make it
a machine dependency.

Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
---
 meta-digi-arm/conf/layer.conf                                  | 3 +++
 .../custom-licenses/ATMEL_CRYPTOAUTHLIB_LICENSE                | 0
 .../recipes-digi/cryptoauthlib/cryptoauthlib_git.bb            | 0
 meta-digi-dey/conf/layer.conf                                  | 3 ---
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename {meta-digi-dey => meta-digi-arm}/custom-licenses/ATMEL_CRYPTOAUTHLIB_LICENSE (100%)
 rename {meta-digi-dey => meta-digi-arm}/recipes-digi/cryptoauthlib/cryptoauthlib_git.bb (100%)

diff --git a/meta-digi-arm/conf/layer.conf b/meta-digi-arm/conf/layer.conf
index 2c820d8f6..975faf581 100644
--- a/meta-digi-arm/conf/layer.conf
+++ b/meta-digi-arm/conf/layer.conf
@@ -15,6 +15,9 @@ LAYERDEPENDS_digi-arm = "core freescale-layer"
 DIGI_EULA_FILE = "${LAYERDIR}/DIGI_EULA"
 DIGI_OPEN_EULA_FILE = "${LAYERDIR}/DIGI_OPEN_EULA"
 
+# Additional license directories
+LICENSE_PATH += "${LAYERDIR}/custom-licenses"
+
 DIGI_LOG_GIT ?= "git://log-sln-git.digi.com/"
 DIGI_MTK_GIT ?= "git://stash.digi.com/"
 DIGI_GIT	 ?= "${DIGI_LOG_GIT}"
diff --git a/meta-digi-dey/custom-licenses/ATMEL_CRYPTOAUTHLIB_LICENSE b/meta-digi-arm/custom-licenses/ATMEL_CRYPTOAUTHLIB_LICENSE
similarity index 100%
rename from meta-digi-dey/custom-licenses/ATMEL_CRYPTOAUTHLIB_LICENSE
rename to meta-digi-arm/custom-licenses/ATMEL_CRYPTOAUTHLIB_LICENSE
diff --git a/meta-digi-dey/recipes-digi/cryptoauthlib/cryptoauthlib_git.bb b/meta-digi-arm/recipes-digi/cryptoauthlib/cryptoauthlib_git.bb
similarity index 100%
rename from meta-digi-dey/recipes-digi/cryptoauthlib/cryptoauthlib_git.bb
rename to meta-digi-arm/recipes-digi/cryptoauthlib/cryptoauthlib_git.bb
diff --git a/meta-digi-dey/conf/layer.conf b/meta-digi-dey/conf/layer.conf
index 421d4d2f6..f0737ec43 100644
--- a/meta-digi-dey/conf/layer.conf
+++ b/meta-digi-dey/conf/layer.conf
@@ -21,9 +21,6 @@ LAYERDEPENDS_digi-dey += "openembedded-layer networking-layer webserver qt5-laye
 DIGI_EULA_FILE = "${LAYERDIR}/DIGI_EULA"
 DIGI_OPEN_EULA_FILE = "${LAYERDIR}/DIGI_OPEN_EULA"
 
-# Additional license directories
-LICENSE_PATH += "${LAYERDIR}/custom-licenses"
-
 # Digi mirror for packages vanished upstream
 DIGI_MIRROR ?= "ftp://ftp1.digi.com/support/digiembeddedyocto/mirror/"
 MIRRORS += "\