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/hal/hal_0.5.11.bb     | 6 +++---
 recipes/hal/hal_0.5.14+git.bb | 2 +-
 recipes/hal/hal_0.5.9.1.bb    | 4 ++--
 recipes/hal/ohm_git.bb        | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'recipes/hal')

diff --git a/recipes/hal/hal_0.5.11.bb b/recipes/hal/hal_0.5.11.bb
index 613a066a43..315570bf07 100644
--- a/recipes/hal/hal_0.5.11.bb
+++ b/recipes/hal/hal_0.5.11.bb
@@ -2,9 +2,9 @@ require hal.inc
 
 PR = "r6"
 
-SRC_URI += " file://hal-right-input-h.patch;apply=yes \
-             file://fix-configure.diff;apply=yes \
-             file://wifi-2.6.27.diff;apply=yes"
+SRC_URI += " file://hal-right-input-h.patch \
+             file://fix-configure.diff \
+             file://wifi-2.6.27.diff"
 
 # The following code finds the right linux/input.h,
 # which also works with external-toolchain/SDK
diff --git a/recipes/hal/hal_0.5.14+git.bb b/recipes/hal/hal_0.5.14+git.bb
index f61ad02743..36d5b3b779 100644
--- a/recipes/hal/hal_0.5.14+git.bb
+++ b/recipes/hal/hal_0.5.14+git.bb
@@ -4,7 +4,7 @@ DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_angstrom = "1"
 
 SRC_URI = "git://anongit.freedesktop.org/hal/;protocol=git \
-        file://0001-Add-touchscreen-option.patch;apply=yes \
+        file://0001-Add-touchscreen-option.patch \
         file://20hal \
         file://99_hal"
 
diff --git a/recipes/hal/hal_0.5.9.1.bb b/recipes/hal/hal_0.5.9.1.bb
index 595605332b..ef4b0446bb 100644
--- a/recipes/hal/hal_0.5.9.1.bb
+++ b/recipes/hal/hal_0.5.9.1.bb
@@ -9,8 +9,8 @@ RDEPENDS_${PN} += "udev-utils hal-info"
 PR = "r10"
 
 SRC_URI = "http://freedesktop.org/~david/dist/hal-${PV}.tar.gz \
-           file://configure_fix.patch;apply=yes \
-           file://sg-inhibit.patch;apply=yes \
+           file://configure_fix.patch \
+           file://sg-inhibit.patch \
            file://20hal \
            file://99_hal"
 
diff --git a/recipes/hal/ohm_git.bb b/recipes/hal/ohm_git.bb
index c79d7b4dfa..64a0a7ebef 100644
--- a/recipes/hal/ohm_git.bb
+++ b/recipes/hal/ohm_git.bb
@@ -5,7 +5,7 @@ LICENSE = "LGPL"
 DEPENDS = "gtk+ dbus-glib intltool-native hal"
 RDEPENDS_${PN} += "udev hal-info"
 SRC_URI = "git://anongit.freedesktop.org/git/ohm/;protocol=git \
-           file://fix_configure.patch;apply=yes"
+           file://fix_configure.patch"
 
 SRCREV = "edfe25d49d67884bf004de7ae0724c162bb5e65e"
 PV = "0.1.2+${PR}+gitr${SRCREV}"
-- 
cgit 1.2.3-korg