aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2014-08-05 18:36:48 -0700
committerMartin Jansa <Martin.Jansa@gmail.com>2014-08-11 11:00:41 +0200
commit80310a34807fd952135c11d15fa245b4d39c0e02 (patch)
tree48b8d5884b4f34cdca64366657cb2b4e4b51b552
parentb96dffeee66869f2fcf660edd536c27f0c5f8892 (diff)
downloadmeta-openembedded-contrib-80310a34807fd952135c11d15fa245b4d39c0e02.tar.gz
meta-openembedded-contrib-80310a34807fd952135c11d15fa245b4d39c0e02.tar.bz2
meta-openembedded-contrib-80310a34807fd952135c11d15fa245b4d39c0e02.zip
syslog-ng: update configure.patch for older patch tool
The previous configure.patch can't be applied by older "patch" tool since the line number is incorrect, for example, the "patch 2.5.4" on CentOS 5.10. Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--meta-oe/recipes-support/syslog-ng/files/configure.patch12
1 files changed, 2 insertions, 10 deletions
diff --git a/meta-oe/recipes-support/syslog-ng/files/configure.patch b/meta-oe/recipes-support/syslog-ng/files/configure.patch
index 136bb5eb1d..109f58cf72 100644
--- a/meta-oe/recipes-support/syslog-ng/files/configure.patch
+++ b/meta-oe/recipes-support/syslog-ng/files/configure.patch
@@ -2,7 +2,7 @@ Index: syslog-ng-3.5.4.1/configure.ac
===================================================================
--- syslog-ng-3.5.4.1.orig/configure.ac 2014-07-18 13:49:36.794141441 +0000
+++ syslog-ng-3.5.4.1/configure.ac 2014-07-18 14:23:57.738197606 +0000
-@@ -8,15 +8,16 @@
+@@ -8,7 +8,8 @@ dnl SNAPSHOT_VERSION - snapshot version to add to version number
dnl BINARY_BRANCH - the value is added to all source/binary packages
dnl SOURCE_REVISION - Revision of the source-tree, will added to the version string
dnl
@@ -12,15 +12,7 @@ Index: syslog-ng-3.5.4.1/configure.ac
AC_CONFIG_MACRO_DIR([m4])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
- dnl ***************************************************************************
- dnl definitions
-
- PACKAGE="syslog-ng"
- VERSION="`cat $srcdir/VERSION`"
-
- dnl ***************************************************************************
- dnl dependencies
-@@ -53,7 +56,7 @@
+@@ -53,7 +54,7 @@ else
CURRDATE=`date +"%a, %d %b %Y %H:%M:%S %Z"`
fi