From ad0fe502677fea556644b6f72918a8fd039b014a Mon Sep 17 00:00:00 2001 From: nbd Date: Tue, 14 Feb 2012 03:34:13 +0000 Subject: [PATCH] samba36: do not patch generated files git-svn-id: svn://svn.openwrt.org/openwrt/packages@30516 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../patches/310-remove_error_strings.patch | 33 ++++++++++++------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/net/samba36/patches/310-remove_error_strings.patch b/net/samba36/patches/310-remove_error_strings.patch index 96f3352a8..2adbc0819 100644 --- a/net/samba36/patches/310-remove_error_strings.patch +++ b/net/samba36/patches/310-remove_error_strings.patch @@ -215,17 +215,6 @@ return NT_STATUS_UNSUCCESSFUL; } ---- a/source3/smbd/build_options.c -+++ b/source3/smbd/build_options.c -@@ -54,7 +54,7 @@ options set at build time for the samba - ****************************************************************************/ - void build_options(bool screen) - { -- if ((DEBUGLEVEL < 4) && (!screen)) { -+ if ((DEBUGLEVEL < 4) || (!screen)) { - return; - } - --- a/lib/tdb/common/tdb_private.h +++ b/lib/tdb/common/tdb_private.h @@ -69,7 +69,11 @@ typedef uint32_t tdb_off_t; @@ -240,3 +229,25 @@ #ifdef TDB_TRACE void tdb_trace(struct tdb_context *tdb, const char *op); +--- a/source3/script/mkbuildoptions.awk ++++ b/source3/script/mkbuildoptions.awk +@@ -55,7 +55,7 @@ BEGIN { + print "****************************************************************************/"; + print "void build_options(bool screen)"; + print "{"; +- print " if ((DEBUGLEVEL < 4) && (!screen)) {"; ++ print " if ((DEBUGLEVEL < 4) || (!screen)) {"; + print " return;"; + print " }"; + print ""; +--- a/source3/script/mkbuildoptions-waf.awk ++++ b/source3/script/mkbuildoptions-waf.awk +@@ -55,7 +55,7 @@ BEGIN { + print "****************************************************************************/"; + print "void build_options(bool screen)"; + print "{"; +- print " if ((DEBUGLEVEL < 4) && (!screen)) {"; ++ print " if ((DEBUGLEVEL < 4) || (!screen)) {"; + print " return;"; + print " }"; + print "";