diff options
author | Andre McCurdy <armccurdy@gmail.com> | 2018-08-21 17:43:29 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-08-23 07:50:01 +0100 |
commit | 57191c57c28e7b73647fea62d79331451a9a7609 (patch) | |
tree | f98124b8cbf7c73e45c15a8dd10c4c515818f251 /meta/recipes-support/gnutls | |
parent | 48e3b5fa99dee7d0f762f74f57fe441c33bbfb44 (diff) | |
download | poky-57191c57c28e7b73647fea62d79331451a9a7609.tar.gz |
gnutls: drop obsolete configure.ac patch
>From gnutls 3.5.8 onwards, the code in configure.ac has been passing
"basename $i" to sed, rather than "echo $i". Since the full ${srcdir}
path is not being processed, there's no risk of unexpected matches.
https://gitlab.com/armcc/gnutls/commit/478179316bc815e1ad518ae318f46e94a13b0e1f
(From OE-Core rev: bce938174d1207685c67c40e341a36ab1158e6eb)
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/gnutls')
-rw-r--r-- | meta/recipes-support/gnutls/gnutls/0001-configure.ac-fix-sed-command.patch | 29 | ||||
-rw-r--r-- | meta/recipes-support/gnutls/gnutls_3.6.3.bb | 1 |
2 files changed, 0 insertions, 30 deletions
diff --git a/meta/recipes-support/gnutls/gnutls/0001-configure.ac-fix-sed-command.patch b/meta/recipes-support/gnutls/gnutls/0001-configure.ac-fix-sed-command.patch deleted file mode 100644 index b6e7bc9650..0000000000 --- a/meta/recipes-support/gnutls/gnutls/0001-configure.ac-fix-sed-command.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | From eaab55bb6d48643163eebbc9ca575a9ca2a8e03f Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Tue, 21 Feb 2017 17:10:07 +0200 | ||
4 | Subject: [PATCH] configure.ac: fix sed command | ||
5 | |||
6 | The "sed 's/.bak//g'" matchs "bitbake", which would cause strange errors | ||
7 | when the S contains "bitbake", fix to "sed 's/\.bak$//'`" | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | |||
11 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
12 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
13 | --- | ||
14 | configure.ac | 2 +- | ||
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
16 | |||
17 | Index: gnutls-3.5.16/configure.ac | ||
18 | =================================================================== | ||
19 | --- gnutls-3.5.16.orig/configure.ac | ||
20 | +++ gnutls-3.5.16/configure.ac | ||
21 | @@ -955,7 +955,7 @@ YEAR=`date +%Y` | ||
22 | AC_SUBST([YEAR], $YEAR) | ||
23 | |||
24 | for i in ${srcdir}/src/*-args.c.bak ${srcdir}/src/*-args.h.bak; do | ||
25 | - nam=$(basename $i|sed 's/.bak//g') | ||
26 | + nam=$(basename $i|sed 's/\.bak$//') | ||
27 | if test "$create_libopts_links" = "yes";then | ||
28 | rm -f "src/$nam.stamp" | ||
29 | rm -f "src/$nam" | ||
diff --git a/meta/recipes-support/gnutls/gnutls_3.6.3.bb b/meta/recipes-support/gnutls/gnutls_3.6.3.bb index dcb211e8e0..629fcd8043 100644 --- a/meta/recipes-support/gnutls/gnutls_3.6.3.bb +++ b/meta/recipes-support/gnutls/gnutls_3.6.3.bb | |||
@@ -18,7 +18,6 @@ DEPENDS_append_libc-musl = " argp-standalone" | |||
18 | SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" | 18 | 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://0001-configure.ac-fix-sed-command.patch \ | ||
22 | file://arm_eabi.patch \ | 21 | file://arm_eabi.patch \ |
23 | " | 22 | " |
24 | 23 | ||