From 96bca6489f4193e84e74e93b87d0c7a89ca3d200 Mon Sep 17 00:00:00 2001
From: Scott Murray <scott.murray@konsulko.com>
Date: Wed, 22 Jan 2020 17:00:28 -0500
Subject: [PATCH] meta-security meta-app-framework: handle xmlsec1 upgrade

Remove now unneeded meta-security xmlsec1 bbappend, and update the
bbappend in meta-app-framework to work with the new xmlsec1 1.2.28
recipe in oe-core.

Bug-AGL: SPEC-2932

Change-Id: If57b7c9fa2a4d2b8f9470dd67e95b4579d1210c7
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
---
 meta-app-framework/recipes-security/xmlsec1/xmlsec1_1.%.bbappend | 4 ++--
 meta-security/recipes-security/xmlsec1/xmlsec1_%.bbappend        | 3 ---
 2 files changed, 2 insertions(+), 5 deletions(-)
 delete mode 100644 meta-security/recipes-security/xmlsec1/xmlsec1_%.bbappend

diff --git a/meta-app-framework/recipes-security/xmlsec1/xmlsec1_1.%.bbappend b/meta-app-framework/recipes-security/xmlsec1/xmlsec1_1.%.bbappend
index 08d2a3dd0..09820be2f 100644
--- a/meta-app-framework/recipes-security/xmlsec1/xmlsec1_1.%.bbappend
+++ b/meta-app-framework/recipes-security/xmlsec1/xmlsec1_1.%.bbappend
@@ -1,4 +1,4 @@
-
-DEPENDS = "libtool libxml2 libxslt openssl gnutls libgcrypt"
+# Disable nss to avoid build issues on native
+PACKAGECONFIG = "gnutls libgcrypt openssl des"
 
 BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-security/recipes-security/xmlsec1/xmlsec1_%.bbappend b/meta-security/recipes-security/xmlsec1/xmlsec1_%.bbappend
deleted file mode 100644
index 9c6080fcf..000000000
--- a/meta-security/recipes-security/xmlsec1/xmlsec1_%.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
-# remove the EXTRA_OECONF from the recipe to
-# avoid an build error in >= YP SUMO
-EXTRA_OECONF = ""
-- 
2.16.6