Revert "patch.bbclass: use param_bool()"
authorChris Larson <chris_larson@mentor.com>
Thu, 27 May 2010 20:07:52 +0000 (13:07 -0700)
committerChris Larson <chris_larson@mentor.com>
Thu, 27 May 2010 20:07:52 +0000 (13:07 -0700)
This reverts commit 7cb990de933f22331cd701ecb45d1e30dd8f3c11.

classes/patch.bbclass

index 09ce781..7b0c444 100644 (file)
@@ -6,7 +6,6 @@ QUILTRCFILE ?= "${STAGING_BINDIR_NATIVE}/quiltrc"
 PATCHDEPENDENCY = "${PATCHTOOL}-native:do_populate_sysroot"
 
 python patch_do_patch() {
-       import oe.utils
        import oe.patch
 
        src_uri = (bb.data.getVar('SRC_URI', d, 1) or '').split()
@@ -47,13 +46,15 @@ python patch_do_patch() {
                        local = os.path.join(workdir, base)
                        ext = os.path.splitext(base)[1]
 
-               is_patch = ext in (".diff", ".patch")
-
-               if not oe.utils.param_bool(parm, 'apply', is_patch):
-                       continue
+               if "apply" in parm:
+                       apply = parm["apply"]
+                       if apply != "yes":
+                               if apply != "no":
+                                       bb.msg.warn(None, "Unsupported value '%s' for 'apply' url param in '%s', please use 'yes' or 'no'" % (apply, url))
+                               continue
                elif "patch" in parm:
                        bb.msg.warn(None, "Deprecated usage of 'patch' url param in '%s', please use 'apply={yes,no}'" % url)
-               elif not is_patch:
+               elif ext not in (".diff", ".patch"):
                        continue
 
                if not local: