From: Stephane Desneux <stephane.desneux@iot.bzh>
Date: Mon, 5 Dec 2016 09:11:26 +0000 (+0100)
Subject: Merge meta-agl-security into meta-agl
X-Git-Tag: chinook_3.0.0~36
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=37e0eaae014fc3f6f498606833d56bbe7db687b0;p=AGL%2Fmeta-agl.git

Merge meta-agl-security into meta-agl

meta-agl-security only contains one recipe for xmlsec so it's not necessary
to maintain a full layer for this

Change-Id: I66b3eeaa0e777fcc0c94bdf562b7188b01641d86
Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh>
---

diff --git a/README.md b/README.md
index b95b54ccf..0193e078a 100644
--- a/README.md
+++ b/README.md
@@ -72,10 +72,6 @@ Distribution and other platforms for In-Vehicle Infotainment system.
 `meta-agl-bsp` is a layer which contains required packages to boot AGL
 distribution on an emulated machine(QEMU).
 
-* `meta-agl/meta-agl-security`
-`meta-agl-security` is a layer which contains dependencies
-required by the security framework(s) - not the framework(s) itself.
-
 * `meta-agl/meta-netboot`
 `meta-netboot` contains the netboot initrd support recipes. This is needed
 in case of booting over the network as NFS does not support the securitylabels.
diff --git a/meta-agl-security/conf/layer.conf b/meta-agl-security/conf/layer.conf
deleted file mode 100644
index 86d435c9d..000000000
--- a/meta-agl-security/conf/layer.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-####################################################
-#
-# This layer, named "meta-agl-security", is intended to host
-# receipes specific to the security framework of AGL.
-#
-# In the case where a choice exist between several security
-# framework, the switch is done using DISTRO_FEATURES in
-# configuration files.
-#
-# This layer will either hold the several framework and their
-# specific common components.
-#
-####################################################
-
-# We have a conf and classes directory, add to BBPATH
-BBPATH =. "${LAYERDIR}:"
-
-# We have recipes-* directories, add to BBFILES
-BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
-            ${LAYERDIR}/recipes-*/*/*.bbappend"
-
-BBFILE_COLLECTIONS += "agl-security"
-BBFILE_PATTERN_agl-security = "^${LAYERDIR}/"
-BBFILE_PRIORITY_agl-security = "9"
diff --git a/meta-agl-security/recipes-core/xmlsec1/xmlsec1_1.2.20.bb b/meta-agl/recipes-core/xmlsec1/xmlsec1_1.2.20.bb
similarity index 100%
rename from meta-agl-security/recipes-core/xmlsec1/xmlsec1_1.2.20.bb
rename to meta-agl/recipes-core/xmlsec1/xmlsec1_1.2.20.bb