From 6cab35d83bda92540ca7b24ef874d871542a37c2 Mon Sep 17 00:00:00 2001 From: Jan-Simon Möller Date: Tue, 5 Nov 2019 12:17:23 +0100 Subject: Declare layer compatibility with zeus MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For the uprev to YP 3.0 zeus we need to update the layer compatibility. Change-Id: Ib762915305588c39400c3c8343152b4ecbfa4556 Signed-off-by: Jan-Simon Möller --- meta-app-framework/conf/layer.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-app-framework') diff --git a/meta-app-framework/conf/layer.conf b/meta-app-framework/conf/layer.conf index 4af5354a6..61a5a968e 100644 --- a/meta-app-framework/conf/layer.conf +++ b/meta-app-framework/conf/layer.conf @@ -9,4 +9,4 @@ BBFILE_COLLECTIONS += "app-framework" BBFILE_PATTERN_app-framework = "^${LAYERDIR}/" BBFILE_PRIORITY_app-framework = "70" -LAYERSERIES_COMPAT_app-framework = "thud" +LAYERSERIES_COMPAT_app-framework = "zeus" -- cgit 1.2.3-korg From b11090e106630bf72bf6c7fe8aeb7da453367eff Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Wed, 22 Jan 2020 13:20:56 -0500 Subject: meta-app-framework: remove libzip recipe Remove libzip 1.1.1 recipe since meta-oe has a newer 1.5.2 recipe now, and add a bbappend to enable required native and nativesdk building with BBCLASSEXTEND. Bug-AGL: SPEC-2932 Change-Id: I224ba96ffce78c07590d7f791d4ab3b64c7febda Signed-off-by: Scott Murray --- .../recipes-support/libzip/libzip_%.bbappend | 1 + .../recipes-support/libzip/libzip_1.1.1.bb | 32 ---------------------- 2 files changed, 1 insertion(+), 32 deletions(-) create mode 100644 meta-app-framework/recipes-support/libzip/libzip_%.bbappend delete mode 100644 meta-app-framework/recipes-support/libzip/libzip_1.1.1.bb (limited to 'meta-app-framework') diff --git a/meta-app-framework/recipes-support/libzip/libzip_%.bbappend b/meta-app-framework/recipes-support/libzip/libzip_%.bbappend new file mode 100644 index 000000000..5174650b1 --- /dev/null +++ b/meta-app-framework/recipes-support/libzip/libzip_%.bbappend @@ -0,0 +1 @@ +BBCLASSEXTEND += "native nativesdk" diff --git a/meta-app-framework/recipes-support/libzip/libzip_1.1.1.bb b/meta-app-framework/recipes-support/libzip/libzip_1.1.1.bb deleted file mode 100644 index 450971176..000000000 --- a/meta-app-framework/recipes-support/libzip/libzip_1.1.1.bb +++ /dev/null @@ -1,32 +0,0 @@ -inherit autotools - -SUMMARY = "Library providing support for handling zip files" -DESCRIPTION = "\ - This library is wrapping zlib and allows \ - to easily create, browse, inflate of deflate \ - the zip files. \ - It also provides tools for zip comparing, merging or browsing.\ -" - -HOMEPAGE = "http://nih.at/libzip/index.html" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=23ebf7ca347ed9703b4ef40824d0ef66" - -SRC_URI = "http://nih.at/libzip/libzip-1.1.1.tar.xz;md5sum=0c86a1a94fbc3ec6724801036726ae1f" - -#SRC_URI = "hg://hg.nih.at/libzip;module=libzip;protocol=http" -#SRCREV = "5895e34af7f9" -#S = "${HGDIR}" - -SECTION = "base" - -DEPENDS = "zlib" - -RDEPENDS_${PN} = "zlib" - -PROVIDES += "${PN}-tools" -RDEPENDS_${PN}-tools = "${PN}" -FILES_${PN}-tools = "${bindir}/zipcmp ${bindir}/zipmerge ${bindir}/ziptool" - -BBCLASSEXTEND = "native nativesdk" - -- cgit 1.2.3-korg From 96bca6489f4193e84e74e93b87d0c7a89ca3d200 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Wed, 22 Jan 2020 17:00:28 -0500 Subject: 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 --- 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 (limited to 'meta-app-framework') 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 = "" -- cgit 1.2.3-korg From 01582dd6c3f39ac5f38ef38eb2a7555e3d4c18af Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Thu, 30 Jan 2020 11:51:43 +0100 Subject: Fix nss-localuser post install -post install script need to have ${sysconfdir}/nsswitch.conf available. This file is provides by base-files. Change-Id: I4767341c442ab8242afa9fb7ed75c2ad8c6a6cc0 Signed-off-by: Ronan Le Martret --- meta-app-framework/recipes-core/nss-localuser/nss-localuser_0.1.bb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'meta-app-framework') diff --git a/meta-app-framework/recipes-core/nss-localuser/nss-localuser_0.1.bb b/meta-app-framework/recipes-core/nss-localuser/nss-localuser_0.1.bb index 62e163f97..38f37f14c 100644 --- a/meta-app-framework/recipes-core/nss-localuser/nss-localuser_0.1.bb +++ b/meta-app-framework/recipes-core/nss-localuser/nss-localuser_0.1.bb @@ -13,6 +13,8 @@ SRC_URI = "git://gerrit.automotivelinux.org/gerrit/src/nss-localuser;protocol=ht SRCREV = "66803c6fdb609ed83a78b9194ecb23e9c1b773e7" PV = "${AGL_BRANCH}+git${SRCPV}" +RDEPENDS_${PN} = "base-files" + S = "${WORKDIR}/git" do_compile() { -- cgit 1.2.3-korg