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/olsrd/olsrd_0.5.3.bb | 2 +-
 recipes/olsrd/olsrd_0.5.5.bb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'recipes/olsrd')

diff --git a/recipes/olsrd/olsrd_0.5.3.bb b/recipes/olsrd/olsrd_0.5.3.bb
index 27f8508b43..e9c6d387cf 100644
--- a/recipes/olsrd/olsrd_0.5.3.bb
+++ b/recipes/olsrd/olsrd_0.5.3.bb
@@ -2,7 +2,7 @@ require olsrd.inc
 
 PR = "r1"
 
-SRC_URI += "file://unbreak-makefile.patch;patch=1"
+SRC_URI += "file://unbreak-makefile.patch;apply=yes"
 
 
 SRC_URI[md5sum] = "786fdf52adeb0d421905332312e5b75f"
diff --git a/recipes/olsrd/olsrd_0.5.5.bb b/recipes/olsrd/olsrd_0.5.5.bb
index afc7bc9506..b44e235868 100644
--- a/recipes/olsrd/olsrd_0.5.5.bb
+++ b/recipes/olsrd/olsrd_0.5.5.bb
@@ -4,7 +4,7 @@ PR = "r0"
 # Oddity in the 0.5.5 source tarball.
 S = "${WORKDIR}/olsrd-a5b9cf969979"
 
-SRC_URI += "file://olsrd-0.5.5-unbreak-makefile.patch;patch=1"
+SRC_URI += "file://olsrd-0.5.5-unbreak-makefile.patch;apply=yes"
 
 SRC_URI[md5sum] = "bd1cd216c318c1359ab6e832adbb1962"
 SRC_URI[sha256sum] = "2fab4646166cc887a87933f52e51ce07c23f4e0395d380ee2f8557805c4884bc"
-- 
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/olsrd/olsrd_0.5.3.bb | 2 +-
 recipes/olsrd/olsrd_0.5.5.bb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'recipes/olsrd')

diff --git a/recipes/olsrd/olsrd_0.5.3.bb b/recipes/olsrd/olsrd_0.5.3.bb
index e9c6d387cf..7c2f676e8a 100644
--- a/recipes/olsrd/olsrd_0.5.3.bb
+++ b/recipes/olsrd/olsrd_0.5.3.bb
@@ -2,7 +2,7 @@ require olsrd.inc
 
 PR = "r1"
 
-SRC_URI += "file://unbreak-makefile.patch;apply=yes"
+SRC_URI += "file://unbreak-makefile.patch"
 
 
 SRC_URI[md5sum] = "786fdf52adeb0d421905332312e5b75f"
diff --git a/recipes/olsrd/olsrd_0.5.5.bb b/recipes/olsrd/olsrd_0.5.5.bb
index b44e235868..bd6efee2f9 100644
--- a/recipes/olsrd/olsrd_0.5.5.bb
+++ b/recipes/olsrd/olsrd_0.5.5.bb
@@ -4,7 +4,7 @@ PR = "r0"
 # Oddity in the 0.5.5 source tarball.
 S = "${WORKDIR}/olsrd-a5b9cf969979"
 
-SRC_URI += "file://olsrd-0.5.5-unbreak-makefile.patch;apply=yes"
+SRC_URI += "file://olsrd-0.5.5-unbreak-makefile.patch"
 
 SRC_URI[md5sum] = "bd1cd216c318c1359ab6e832adbb1962"
 SRC_URI[sha256sum] = "2fab4646166cc887a87933f52e51ce07c23f4e0395d380ee2f8557805c4884bc"
-- 
cgit v1.2.3