aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2021-09-10 16:38:55 -0400
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2021-09-13 22:47:21 +0000
commit7ba1d202999022f2fa6fa74471581e7eadaf0a85 (patch)
treecedb0f75f274752672d5d8e22aaf68dd8fc49c44
parent1b6d5c8ecfdce6c90ed2c2570f892385c123619e (diff)
xmlsec1: remove backported patch
The backported host contamination fix for xmlsec1 can now be removed since meta-oe now includes it. Bug-AGL: SPEC-4051 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: I2b41872f67c25cdbd4e250a399293afde2284a27 Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/26630 Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
-rw-r--r--meta-agl-bsp/openembedded-layer/recipes-support/xmlsec1/files/ensure-search-path-non-host.patch22
-rw-r--r--meta-agl-bsp/openembedded-layer/recipes-support/xmlsec1/xmlsec1_1.2.%.bbappend9
2 files changed, 0 insertions, 31 deletions
diff --git a/meta-agl-bsp/openembedded-layer/recipes-support/xmlsec1/files/ensure-search-path-non-host.patch b/meta-agl-bsp/openembedded-layer/recipes-support/xmlsec1/files/ensure-search-path-non-host.patch
deleted file mode 100644
index a5a298af0..000000000
--- a/meta-agl-bsp/openembedded-layer/recipes-support/xmlsec1/files/ensure-search-path-non-host.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-xmlsec1: Fix configure QA error caused by host lookup path
-
-ERROR: mc:my-sdk:xmlsec1-1.2.30-r0 do_configure: QA Issue: This autoconf log indicates errors, it looked at host include and/or library paths while determining system capabilities.
-
-It will eventually arise after the configure QA as the configure script should only look at the staging sysroot dir, not at the host.
-
-Upstream-Status: Inappropriate [embedded specific]
-Signed-off-by: Anatol Belski <anbelski@linux.microsoft.com>
-
---- a/configure.ac.orig 2021-01-13 14:37:42.254991177 +0000
-+++ b/configure.ac 2021-01-13 14:40:56.546269330 +0000
-@@ -250,8 +250,8 @@
- dnl ==========================================================================
- dnl Common installation locations
- dnl ==========================================================================
--COMMON_INCLUDE_DIR="/usr/include /usr/local/include"
--COMMON_LIB_DIR="/usr/lib /usr/lib64 /usr/local/lib"
-+COMMON_INCLUDE_DIR="${STAGING_INCDIR}"
-+COMMON_LIB_DIR="${STAGING_LIBDIR}"
- case $host in
- i*86-*-linux-gnu) COMMON_LIB_DIR="$COMMON_LIB_DIR /usr/lib/i386-linux-gnu" ;;
- x86_64-*-linux-gnu) COMMON_LIB_DIR="$COMMON_LIB_DIR /usr/lib/x86_64-linux-gnu" ;;
diff --git a/meta-agl-bsp/openembedded-layer/recipes-support/xmlsec1/xmlsec1_1.2.%.bbappend b/meta-agl-bsp/openembedded-layer/recipes-support/xmlsec1/xmlsec1_1.2.%.bbappend
deleted file mode 100644
index 2d5dccdfe..000000000
--- a/meta-agl-bsp/openembedded-layer/recipes-support/xmlsec1/xmlsec1_1.2.%.bbappend
+++ /dev/null
@@ -1,9 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-# 2021-08-15:
-# Fix a host contamination
-# Submitted upstream as backport from meta-oe-master
-# https://lists.openembedded.org/g/openembedded-devel/message/92583
-
-SRC_URI += "file://ensure-search-path-non-host.patch"
-