patch.bbclass: Simplify patch task dependency handling and allow packages to override...

diff --git a/classes/patch.bbclass b/classes/patch.bbclass
index 6f83d9c..075e826 100644 (file)
--- 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