[oe-commits] Robert Yang : syslog-ng: update configure.patch for older patch tool

git at git.openembedded.org git at git.openembedded.org
Wed Aug 6 10:20:38 UTC 2014


Module: meta-openembedded.git
Branch: master-next
Commit: fe4af3c3fbef698c2759047c6595b4ee72ce7806
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=fe4af3c3fbef698c2759047c6595b4ee72ce7806

Author: Robert Yang <liezhi.yang at windriver.com>
Date:   Tue Aug  5 18:36:48 2014 -0700

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 at windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 meta-oe/recipes-support/syslog-ng/files/configure.patch | 12 ++----------
 1 file 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 136bb5e..109f58c 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
  



More information about the Openembedded-commits mailing list