From bf7d0467a0788a7fcc1c96e0dc35a25ae09278a0 Mon Sep 17 00:00:00 2001
From: Chris Larson <chris_larson@mentor.com>
Date: Sun, 23 May 2010 20:23:53 -0700
Subject: Rename url params patch=<ignored>/pnum=<n> to
 apply={yes,no}/striplevel=<n>

I think this makes the behavior rather more clear.

Signed-off-by: Chris Larson <chris_larson@mentor.com>
Acked-by: Denys Dmytriyenko <denis@denix.org>
Acked-by: Khem Raj <raj.khem@gmail.com>
---
 recipes/samba/samba_3.3.0.bb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'recipes/samba/samba_3.3.0.bb')

diff --git a/recipes/samba/samba_3.3.0.bb b/recipes/samba/samba_3.3.0.bb
index 1caf502703..2796152f09 100644
--- a/recipes/samba/samba_3.3.0.bb
+++ b/recipes/samba/samba_3.3.0.bb
@@ -8,10 +8,10 @@ LICENSE = "GPLv3"
 # should there be further issues. Appears to work though :)
 DEFAULT_PREFERENCE = "-1"
 
-SRC_URI += "file://configure-3.3.0.patch;patch=1 \
-            file://config-h.patch;patch=1 \
-            file://mtab.patch;patch=1 \
-            file://tdbheaderfix.patch;patch=1 "
+SRC_URI += "file://configure-3.3.0.patch;apply=yes \
+            file://config-h.patch;apply=yes \
+            file://mtab.patch;apply=yes \
+            file://tdbheaderfix.patch;apply=yes "
 
 PR = "r3"
 
-- 
cgit v1.2.3


From 6fe7cef27069415f2eba36bc640cf59013d4979b Mon Sep 17 00:00:00 2001
From: Chris Larson <chris_larson@mentor.com>
Date: Mon, 24 May 2010 13:01:00 -0700
Subject: Make the do_patch apply=yes param implicit if extension is
 .diff/.patch

For .diff/.patch you need to apply manually, you can specify apply=no.

Signed-off-by: Chris Larson <chris_larson@mentor.com>
Acked-by: Denys Dmytriyenko <denis@denix.org>
Acked-by: Khem Raj <raj.khem@gmail.com>
---
 recipes/samba/samba_3.3.0.bb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'recipes/samba/samba_3.3.0.bb')

diff --git a/recipes/samba/samba_3.3.0.bb b/recipes/samba/samba_3.3.0.bb
index 2796152f09..cebcc178e9 100644
--- a/recipes/samba/samba_3.3.0.bb
+++ b/recipes/samba/samba_3.3.0.bb
@@ -8,10 +8,10 @@ LICENSE = "GPLv3"
 # should there be further issues. Appears to work though :)
 DEFAULT_PREFERENCE = "-1"
 
-SRC_URI += "file://configure-3.3.0.patch;apply=yes \
-            file://config-h.patch;apply=yes \
-            file://mtab.patch;apply=yes \
-            file://tdbheaderfix.patch;apply=yes "
+SRC_URI += "file://configure-3.3.0.patch \
+            file://config-h.patch \
+            file://mtab.patch \
+            file://tdbheaderfix.patch "
 
 PR = "r3"
 
-- 
cgit v1.2.3