From: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Date: Wed, 28 Mar 2018 20:00:59 +0000 (+0000)
Subject: Merge "most: delete bbappend for removing skb_put_data patch"
X-Git-Tag: 5.99.1~41
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=f8fb908ba623a9a705c1e3de336a2f538049ad4a;hp=af5b4d022d6d25c4a0e9b3fbcdfc65167e85b03e;p=AGL%2Fmeta-agl.git

Merge "most: delete bbappend for removing skb_put_data patch"
---

diff --git a/meta-app-framework/recipes-apps/low-level-can-service/low-level-can-service_git.bb b/meta-app-framework/recipes-apps/agl-service-can-low-level/agl-service-can-low-level_git.bb
similarity index 100%
rename from meta-app-framework/recipes-apps/low-level-can-service/low-level-can-service_git.bb
rename to meta-app-framework/recipes-apps/agl-service-can-low-level/agl-service-can-low-level_git.bb
diff --git a/meta-app-framework/recipes-core/af-binder/af-binder_1.0.inc b/meta-app-framework/recipes-core/af-binder/af-binder_1.0.inc
index 48123c0b4..09fb6fd97 100644
--- a/meta-app-framework/recipes-core/af-binder/af-binder_1.0.inc
+++ b/meta-app-framework/recipes-core/af-binder/af-binder_1.0.inc
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
 SRC_URI = "git://gerrit.automotivelinux.org/gerrit/src/app-framework-binder;protocol=https;branch=${AGL_BRANCH}"
 
-SRCREV = "bd10bc4405f3777fe495cb9f62818d67ab584854"
+SRCREV = "5b26086e8e634d1fcd2e65dc164fd3453f43942b"
 PV = "${AGL_BRANCH}+git${SRCPV}"
 
 S = "${WORKDIR}/git"
diff --git a/meta-security/recipes-security/xmlsec1/xmlsec1/remove-4-in-verify3.patch b/meta-security/recipes-security/xmlsec1/xmlsec1/remove-4-in-verify3.patch
new file mode 100644
index 000000000..185ed8f98
--- /dev/null
+++ b/meta-security/recipes-security/xmlsec1/xmlsec1/remove-4-in-verify3.patch
@@ -0,0 +1,11 @@
+diff --git a/examples/verify3.c b/examples/verify3.c
+index 2d26ae7..d36552d 100644
+--- a/examples/verify3.c
++++ b/examples/verify3.c
+@@ -1,4 +1,4 @@
+-4/** 
++/** 
+  * XML Security Library example: Verifying a file signed with X509 certificate
+  *
+  * Verifies a file signed with X509 certificate. 
+
diff --git a/meta-security/recipes-security/xmlsec1/xmlsec1_1.2.25.bbappend b/meta-security/recipes-security/xmlsec1/xmlsec1_1.2.25.bbappend
new file mode 100644
index 000000000..047ab402c
--- /dev/null
+++ b/meta-security/recipes-security/xmlsec1/xmlsec1_1.2.25.bbappend
@@ -0,0 +1,3 @@
+FILESEXTRAPATHS_append := ":${THISDIR}/${PN}"
+SRC_URI += "file://remove-4-in-verify3.patch"
+
diff --git a/templates/feature/agl-sota/50_bblayers.conf.inc b/templates/feature/agl-sota/50_bblayers.conf.inc
index dd64eda24..7510b45be 100644
--- a/templates/feature/agl-sota/50_bblayers.conf.inc
+++ b/templates/feature/agl-sota/50_bblayers.conf.inc
@@ -1,5 +1,6 @@
 BBLAYERS =+ " \
 	${METADIR}/meta-updater \
+	${METADIR}/meta-updater-qemux86-64 \
 	${METADIR}/meta-openembedded/meta-filesystems \
 	${METADIR}/meta-openembedded/meta-python \
 	"