diff options
author | Scott Murray <scott.murray@konsulko.com> | 2020-01-22 17:00:28 -0500 |
---|---|---|
committer | Scott Murray <scott.murray@konsulko.com> | 2020-01-22 18:14:18 -0500 |
commit | 96bca6489f4193e84e74e93b87d0c7a89ca3d200 (patch) | |
tree | 5417177352ac2138ad910cc863467fa763c97757 | |
parent | b18272900ec4ffff9968d7db998841de86abe2a5 (diff) |
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>
-rw-r--r-- | meta-app-framework/recipes-security/xmlsec1/xmlsec1_1.%.bbappend | 4 | ||||
-rw-r--r-- | meta-security/recipes-security/xmlsec1/xmlsec1_%.bbappend | 3 |
2 files changed, 2 insertions, 5 deletions
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 = "" |