From ebefc69522366487d368df817696e8142fb7bcdc Mon Sep 17 00:00:00 2001 From: Alex Kiernan Date: Sat, 2 May 2020 00:56:26 +0300 Subject: gnutls: upgrade 3.6.8 -> 3.6.11.1 Drop patch from 81485be19b18 ("gnutls: don't use HOSTTOOLS_DIR/bash as a shell on target") as upstream now honours POSIX_SHELL when set as the primary target shell. (From OE-Core rev: bc487ced3be40569157fb40c99bfa68871f74744) (From OE-Core rev: f4f933297a77f99783f9a5fb571503e1f45ad259) Signed-off-by: Alex Kiernan Signed-off-by: Ross Burton Signed-off-by: Richard Purdie Signed-off-by: Adrian Bunk Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- .../gnutls/gnutls/posix-shell.patch | 39 ---------------------- 1 file changed, 39 deletions(-) delete mode 100644 meta/recipes-support/gnutls/gnutls/posix-shell.patch (limited to 'meta/recipes-support/gnutls/gnutls/posix-shell.patch') diff --git a/meta/recipes-support/gnutls/gnutls/posix-shell.patch b/meta/recipes-support/gnutls/gnutls/posix-shell.patch deleted file mode 100644 index 938e2d1e18..0000000000 --- a/meta/recipes-support/gnutls/gnutls/posix-shell.patch +++ /dev/null @@ -1,39 +0,0 @@ -Don't embed the path to the build-time POSIX shell as this will be -$TMPDIR/hosttools/bash, which is no good on the target. - -Instead default to /bin/sh but allow it to be set in the environment. - -This isn't really upstreamable but I filed a bug at -https://gitlab.com/gnutls/gnutls/issues/807 and hope a proper fix will be -integrated. - -Upstream-Status: Inappropriate -Signed-off-by: Ross Burton - -diff --git a/src/libopts/m4/libopts.m4 b/src/libopts/m4/libopts.m4 -index c6ad738..a62faca 100644 ---- a/src/libopts/m4/libopts.m4 -+++ b/src/libopts/m4/libopts.m4 -@@ -112,21 +112,7 @@ AC_DEFUN([INVOKE_LIBOPTS_MACROS_FIRST],[ - AC_CHECK_FUNCS([mmap canonicalize_file_name snprintf strdup strchr \ - strrchr strsignal fchmod fstat chmod]) - AC_PROG_SED -- [while : -- do -- POSIX_SHELL=`which bash` -- test -x "$POSIX_SHELL" && break -- POSIX_SHELL=`which dash` -- test -x "$POSIX_SHELL" && break -- POSIX_SHELL=/usr/xpg4/bin/sh -- test -x "$POSIX_SHELL" && break -- POSIX_SHELL=`/bin/sh -c ' -- exec 2>/dev/null -- if ! true ; then exit 1 ; fi -- echo /bin/sh'` -- test -x "$POSIX_SHELL" && break -- ]AC_MSG_ERROR([cannot locate a working POSIX shell])[ -- done] -+ POSIX_SHELL="${POSIX_SHELL:-/bin/sh}" - AC_DEFINE_UNQUOTED([POSIX_SHELL], ["${POSIX_SHELL}"], - [define to a working POSIX compliant shell]) - AC_SUBST([POSIX_SHELL]) -- cgit v1.2.3-54-g00ecf