diff options
| author |   Scott Murray <scott.murray@konsulko.com> | 2021-09-10 16:33:45 -0400 |
|---|---|---|
| committer |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2021-09-13 12:50:06 +0000 |
| commit | 83747ed24ad6529865fed99fb027e2fe7ec75034 (patch) | |
| tree | 5802078d1c89a4f31daa5ecb740580fb81c5e4da | |
| parent | 63ee8ba3712eb0e55f3f45a5f1851153b7f4b772 (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: Iba5d2f35a36cd1a99825e165013c9f849cbd054c
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/26629
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Tested-by: Jenkins Job builder account
ci-image-build: Jenkins Job builder account
ci-image-boot-test: Jenkins Job builder account
| -rw-r--r-- | meta-agl-bsp/openembedded-layer/recipes-support/xmlsec1/files/ensure-search-path-non-host.patch | 22 | ||||
| -rw-r--r-- | meta-agl-bsp/openembedded-layer/recipes-support/xmlsec1/xmlsec1_1.2.%.bbappend | 9 |
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 6dde1982a..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" - |