summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2015-01-17 09:08:39 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-01-23 11:36:27 +0000
commit32fb1de468341a470c18c609c61c55ddbbc0ee48 (patch)
treeda869e5c5db9cf286bc5c34eb8663a7e67151d1f
parentb2f8367dff8a2db49b9296bd27a2e94a3619884d (diff)
downloadpoky-32fb1de468341a470c18c609c61c55ddbbc0ee48.tar.gz
gnutls: fix sed command
The "sed 's/.bak//g'" matchs "bitbake", which would cause strange errors when the S contains "bitbake", fix to "sed 's/\.bak$//'`" (From OE-Core rev: 51a12be7104bc3925b700597c6d52238c0fc5044) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch31
-rw-r--r--meta/recipes-support/gnutls/gnutls_3.3.11.bb1
2 files changed, 32 insertions, 0 deletions
diff --git a/meta/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch b/meta/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch
new file mode 100644
index 0000000000..44a9934b5d
--- /dev/null
+++ b/meta/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch
@@ -0,0 +1,31 @@
1From eb93aa7b986c84da60a3db40afb29d1a70c50223 Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Sat, 17 Jan 2015 17:02:15 +0000
4Subject: [PATCH] configure.ac: fix sed command
5
6The "sed 's/.bak//g'" matchs "bitbake", which would cause strange errors
7when the S contains "bitbake", fix to "sed 's/\.bak$//'`"
8
9Upstream-Status: Pending
10
11Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
12---
13 configure.ac | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/configure.ac b/configure.ac
17index c6818a0..1c4582d 100644
18--- a/configure.ac
19+++ b/configure.ac
20@@ -466,7 +466,7 @@ if test "$NEED_LIBOPTS_DIR" = "true";then
21 dnl replace libopts-generated files with distributed backups, if present
22 missing_baks=
23 for i in ${srcdir}/src/*-args.c.bak ${srcdir}/src/*-args.h.bak; do
24- nam=`echo $i|sed 's/.bak//g'`
25+ nam=`echo $i|sed 's/\.bak$//'`
26 if test -f $i;then
27 cp -f $i $nam
28 else
29--
302.0.1
31
diff --git a/meta/recipes-support/gnutls/gnutls_3.3.11.bb b/meta/recipes-support/gnutls/gnutls_3.3.11.bb
index 1cf3a747f1..7ad462ae90 100644
--- a/meta/recipes-support/gnutls/gnutls_3.3.11.bb
+++ b/meta/recipes-support/gnutls/gnutls_3.3.11.bb
@@ -3,6 +3,7 @@ require gnutls.inc
3PR = "r1" 3PR = "r1"
4 4
5SRC_URI += "file://correct_rpl_gettimeofday_signature.patch \ 5SRC_URI += "file://correct_rpl_gettimeofday_signature.patch \
6 file://configure.ac-fix-sed-command.patch \
6 " 7 "
7SRC_URI[md5sum] = "b657e3010c10cae2244e7ce79ee3d446" 8SRC_URI[md5sum] = "b657e3010c10cae2244e7ce79ee3d446"
8SRC_URI[sha256sum] = "aef28d629b6ba824bd435f9b23506525e657e3746d4aa021296b13cbaaa6ae71" 9SRC_URI[sha256sum] = "aef28d629b6ba824bd435f9b23506525e657e3746d4aa021296b13cbaaa6ae71"