diff options
author | Alex Kiernan <alex.kiernan@gmail.com> | 2020-05-02 00:56:26 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-05-07 17:32:09 +0100 |
commit | ebefc69522366487d368df817696e8142fb7bcdc (patch) | |
tree | ae514d5acdb5a1b087e51ed212966bce53e5f228 /meta | |
parent | 887f299ce983eaf4798b44a8808f2731be68cbe3 (diff) | |
download | poky-ebefc69522366487d368df817696e8142fb7bcdc.tar.gz |
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 <alex.kiernan@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-support/gnutls/gnutls/posix-shell.patch | 39 | ||||
-rw-r--r-- | meta/recipes-support/gnutls/gnutls_3.6.11.1.bb (renamed from meta/recipes-support/gnutls/gnutls_3.6.8.bb) | 5 |
2 files changed, 2 insertions, 42 deletions
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 @@ | |||
1 | Don't embed the path to the build-time POSIX shell as this will be | ||
2 | $TMPDIR/hosttools/bash, which is no good on the target. | ||
3 | |||
4 | Instead default to /bin/sh but allow it to be set in the environment. | ||
5 | |||
6 | This isn't really upstreamable but I filed a bug at | ||
7 | https://gitlab.com/gnutls/gnutls/issues/807 and hope a proper fix will be | ||
8 | integrated. | ||
9 | |||
10 | Upstream-Status: Inappropriate | ||
11 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
12 | |||
13 | diff --git a/src/libopts/m4/libopts.m4 b/src/libopts/m4/libopts.m4 | ||
14 | index c6ad738..a62faca 100644 | ||
15 | --- a/src/libopts/m4/libopts.m4 | ||
16 | +++ b/src/libopts/m4/libopts.m4 | ||
17 | @@ -112,21 +112,7 @@ AC_DEFUN([INVOKE_LIBOPTS_MACROS_FIRST],[ | ||
18 | AC_CHECK_FUNCS([mmap canonicalize_file_name snprintf strdup strchr \ | ||
19 | strrchr strsignal fchmod fstat chmod]) | ||
20 | AC_PROG_SED | ||
21 | - [while : | ||
22 | - do | ||
23 | - POSIX_SHELL=`which bash` | ||
24 | - test -x "$POSIX_SHELL" && break | ||
25 | - POSIX_SHELL=`which dash` | ||
26 | - test -x "$POSIX_SHELL" && break | ||
27 | - POSIX_SHELL=/usr/xpg4/bin/sh | ||
28 | - test -x "$POSIX_SHELL" && break | ||
29 | - POSIX_SHELL=`/bin/sh -c ' | ||
30 | - exec 2>/dev/null | ||
31 | - if ! true ; then exit 1 ; fi | ||
32 | - echo /bin/sh'` | ||
33 | - test -x "$POSIX_SHELL" && break | ||
34 | - ]AC_MSG_ERROR([cannot locate a working POSIX shell])[ | ||
35 | - done] | ||
36 | + POSIX_SHELL="${POSIX_SHELL:-/bin/sh}" | ||
37 | AC_DEFINE_UNQUOTED([POSIX_SHELL], ["${POSIX_SHELL}"], | ||
38 | [define to a working POSIX compliant shell]) | ||
39 | AC_SUBST([POSIX_SHELL]) | ||
diff --git a/meta/recipes-support/gnutls/gnutls_3.6.8.bb b/meta/recipes-support/gnutls/gnutls_3.6.11.1.bb index c927063f0a..5b05364c25 100644 --- a/meta/recipes-support/gnutls/gnutls_3.6.8.bb +++ b/meta/recipes-support/gnutls/gnutls_3.6.11.1.bb | |||
@@ -19,11 +19,10 @@ SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" | |||
19 | 19 | ||
20 | SRC_URI = "https://www.gnupg.org/ftp/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar.xz \ | 20 | SRC_URI = "https://www.gnupg.org/ftp/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar.xz \ |
21 | file://arm_eabi.patch \ | 21 | file://arm_eabi.patch \ |
22 | file://posix-shell.patch \ | ||
23 | " | 22 | " |
24 | 23 | ||
25 | SRC_URI[md5sum] = "9dcf0aa45d1a42e1b3ca5d39ec7c61a8" | 24 | SRC_URI[md5sum] = "3670ee0b0d95b3dee185eff2dc910ee7" |
26 | SRC_URI[sha256sum] = "aa81944e5635de981171772857e72be231a7e0f559ae0292d2737de475383e83" | 25 | SRC_URI[sha256sum] = "fbba12f3db9a55dbf027e14111755817ec44b57eabec3e8089aac8ac6f533cf8" |
27 | 26 | ||
28 | inherit autotools texinfo pkgconfig gettext lib_package gtk-doc | 27 | inherit autotools texinfo pkgconfig gettext lib_package gtk-doc |
29 | 28 | ||