From: Richard Purdie <rpurdie@rpsys.net>
Date: Sat, 24 May 2008 17:13:14 +0000 (+0000)
Subject: patch.bbclass: Simplify patch task dependency handling and allow packages to override... 
X-Git-Tag: Release-2010-05/1~6867
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=02390759c9a372ce6946abd89de0cd3936f8ef24;p=openembedded.git

patch.bbclass: Simplify patch task dependency handling and allow packages to override the dependency more easily (from poky)
---

diff --git a/classes/patch.bbclass b/classes/patch.bbclass
index 6f83d9c88b..075e826523 100644
--- a/classes/patch.bbclass
+++ b/classes/patch.bbclass
@@ -425,15 +425,8 @@ def patch_init(d):
 addtask patch after do_unpack
 do_patch[dirs] = "${WORKDIR}"
 
-python () {
-    import bb
-    # do_patch tasks require PATCHTOOL-native to have staged
-    patchdeps = bb.data.getVar("PATCHTOOL", d, True)
-    if patchdeps:
-        patchdeps = "%s-native" % patchdeps
-        if not patchdeps in bb.data.getVar("PROVIDES", d, True):
-            bb.data.setVarFlag('do_patch', 'depends', patchdeps + ":do_populate_staging", d)
-}
+PATCHDEPENDENCY = "${PATCHTOOL}-native:do_populate_staging"
+do_patch[depends] = "${PATCHDEPENDENCY}"
 
 python patch_do_patch() {
 	import re