From 37e0eaae014fc3f6f498606833d56bbe7db687b0 Mon Sep 17 00:00:00 2001
From: Stephane Desneux <stephane.desneux@iot.bzh>
Date: Mon, 5 Dec 2016 10:11:26 +0100
Subject: 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>
---
 README.md                                          |  4 ---
 meta-agl-security/conf/layer.conf                  | 24 -------------
 .../recipes-core/xmlsec1/xmlsec1_1.2.20.bb         | 40 ----------------------
 meta-agl/recipes-core/xmlsec1/xmlsec1_1.2.20.bb    | 40 ++++++++++++++++++++++
 4 files changed, 40 insertions(+), 68 deletions(-)
 delete mode 100644 meta-agl-security/conf/layer.conf
 delete mode 100644 meta-agl-security/recipes-core/xmlsec1/xmlsec1_1.2.20.bb
 create mode 100644 meta-agl/recipes-core/xmlsec1/xmlsec1_1.2.20.bb

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-security/recipes-core/xmlsec1/xmlsec1_1.2.20.bb
deleted file mode 100644
index 7faf7bfd4..000000000
--- a/meta-agl-security/recipes-core/xmlsec1/xmlsec1_1.2.20.bb
+++ /dev/null
@@ -1,40 +0,0 @@
-inherit autotools pkgconfig
-
-SUMMARY = "Library providing support for "XML Signature" and "XML Encryption" standards"
-DESCRIPTION = "XML Security Library is a C library based on LibXML2  and OpenSSL. \ 
-The library was created with a goal to support major XML security \
-standards "XML Digital Signature" and "XML Encryption". \
-"
-
-HOMEPAGE = "https://www.aleksey.com/xmlsec"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://Copyright;md5=32e47e213c77c55d2c666351d7ce16b5"
-
-SRC_URI = "git://git.gnome.org/xmlsec;branch=master;protocol=git"
-SRCREV = "84c8281cf927b1cdcc38f343f61c3aa448a5a10f"
-
-SECTION = "base"
-
-S = "${WORKDIR}/git"
-
-RDEPENDS_${PN} = "openssl libxml2"
-
-# choice is made to use openssl only and to not use xslt
-# nss would be a valuable choice
-EXTRA_OECONF = "\
-	--disable-crypto-dl \
-	--disable-apps-crypto-dl \
-	--enable-shared \
-	--disable-static \
-	--without-gnutls \
-	--without-gcrypt \
-	--without-nss \
-	--without-libxslt \
-"
-
-do_install_append() {
-	# discarding this optional file is good for AGL
-	rm ${D}${libdir}/xmlsec1Conf.sh
-}
-
-
diff --git a/meta-agl/recipes-core/xmlsec1/xmlsec1_1.2.20.bb b/meta-agl/recipes-core/xmlsec1/xmlsec1_1.2.20.bb
new file mode 100644
index 000000000..7faf7bfd4
--- /dev/null
+++ b/meta-agl/recipes-core/xmlsec1/xmlsec1_1.2.20.bb
@@ -0,0 +1,40 @@
+inherit autotools pkgconfig
+
+SUMMARY = "Library providing support for "XML Signature" and "XML Encryption" standards"
+DESCRIPTION = "XML Security Library is a C library based on LibXML2  and OpenSSL. \ 
+The library was created with a goal to support major XML security \
+standards "XML Digital Signature" and "XML Encryption". \
+"
+
+HOMEPAGE = "https://www.aleksey.com/xmlsec"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://Copyright;md5=32e47e213c77c55d2c666351d7ce16b5"
+
+SRC_URI = "git://git.gnome.org/xmlsec;branch=master;protocol=git"
+SRCREV = "84c8281cf927b1cdcc38f343f61c3aa448a5a10f"
+
+SECTION = "base"
+
+S = "${WORKDIR}/git"
+
+RDEPENDS_${PN} = "openssl libxml2"
+
+# choice is made to use openssl only and to not use xslt
+# nss would be a valuable choice
+EXTRA_OECONF = "\
+	--disable-crypto-dl \
+	--disable-apps-crypto-dl \
+	--enable-shared \
+	--disable-static \
+	--without-gnutls \
+	--without-gcrypt \
+	--without-nss \
+	--without-libxslt \
+"
+
+do_install_append() {
+	# discarding this optional file is good for AGL
+	rm ${D}${libdir}/xmlsec1Conf.sh
+}
+
+
-- 
cgit 1.2.3-korg