[oe-commits] Robert Yang : gnutls: fix sed command

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 51a12be7104bc3925b700597c6d52238c0fc5044
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=51a12be7104bc3925b700597c6d52238c0fc5044

Author: Robert Yang <liezhi.yang at windriver.com>
Date:   Sat Jan 17 09:08:39 2015 -0800

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$//'`"

Signed-off-by: Robert Yang <liezhi.yang at windriver.com>

---

 .../gnutls/configure.ac-fix-sed-command.patch      | 31 ++++++++++++++++++++++
 meta/recipes-support/gnutls/gnutls_3.3.11.bb       |  1 +
 2 files changed, 32 insertions(+)

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 0000000..44a9934
--- /dev/null
+++ b/meta/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch
@@ -0,0 +1,31 @@
+From eb93aa7b986c84da60a3db40afb29d1a70c50223 Mon Sep 17 00:00:00 2001
+From: Robert Yang <liezhi.yang at windriver.com>
+Date: Sat, 17 Jan 2015 17:02:15 +0000
+Subject: [PATCH] configure.ac: 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$//'`"
+
+Upstream-Status: Pending
+
+Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index c6818a0..1c4582d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -466,7 +466,7 @@ if test "$NEED_LIBOPTS_DIR" = "true";then
+ 	dnl replace libopts-generated files with distributed backups, if present
+ 	missing_baks=
+ 	for i in ${srcdir}/src/*-args.c.bak ${srcdir}/src/*-args.h.bak; do
+-		nam=`echo $i|sed 's/.bak//g'`
++		nam=`echo $i|sed 's/\.bak$//'`
+ 		if test -f $i;then
+ 			cp -f $i $nam
+ 		else
+-- 
+2.0.1
+
diff --git a/meta/recipes-support/gnutls/gnutls_3.3.11.bb b/meta/recipes-support/gnutls/gnutls_3.3.11.bb
index 1cf3a74..7ad462a 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
 PR = "r1"
 
 SRC_URI += "file://correct_rpl_gettimeofday_signature.patch \
+            file://configure.ac-fix-sed-command.patch \
            "
 SRC_URI[md5sum] = "b657e3010c10cae2244e7ce79ee3d446"
 SRC_URI[sha256sum] = "aef28d629b6ba824bd435f9b23506525e657e3746d4aa021296b13cbaaa6ae71"