Patchwork [meta-oe] syslog-ng: update configure.patch for older patch tool

login
register
mail settings
Submitter Robert Yang
Date Aug. 6, 2014, 1:36 a.m.
Message ID <1407289008-6759-1-git-send-email-liezhi.yang@windriver.com>
Download mbox | patch
Permalink /patch/77341/
State Accepted, archived
Headers show

Comments

Robert Yang - Aug. 6, 2014, 1:36 a.m.
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>
---
 .../syslog-ng/files/configure.patch                |   12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

Patch

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