diff options
author | Chris Larson <kergoth@openedhand.com> | 2006-08-28 20:36:36 +0000 |
---|---|---|
committer | Chris Larson <kergoth@openedhand.com> | 2006-08-28 20:36:36 +0000 |
commit | ecb32bdee770c3ff6c73ac2a57e612872b13910f (patch) | |
tree | a97c3bb8b6fa3402c90510dab06f0f712667303e /meta/classes/base.bbclass | |
parent | 01056cdbea9ebe38b589f74120f5fab39452bbf0 (diff) | |
download | openembedded-core-ecb32bdee770c3ff6c73ac2a57e612872b13910f.tar.gz openembedded-core-ecb32bdee770c3ff6c73ac2a57e612872b13910f.tar.bz2 openembedded-core-ecb32bdee770c3ff6c73ac2a57e612872b13910f.tar.xz openembedded-core-ecb32bdee770c3ff6c73ac2a57e612872b13910f.zip |
Patch failure handling updates, added a 'patch' concrete class, so we can apply patches to quilt-native itself.
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@670 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/classes/base.bbclass')
-rw-r--r-- | meta/classes/base.bbclass | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 546992e71..940e7ac7a 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -13,9 +13,11 @@ def base_dep_prepend(d): # INHIBIT_DEFAULT_DEPS doesn't apply to the patch command. Whether or not # we need that built is the responsibility of the patch function / class, not # the application. - patchdeps = bb.data.getVar("PATCH_DEPENDS", d, 1) - if patchdeps and not patchdeps in bb.data.getVar("PROVIDES", d, 1): - deps = patchdeps + patchdeps = bb.data.getVar("PATCHTOOL", d, 1) + if patchdeps: + patchdeps = "%s-native" % patchdeps + if not patchdeps in bb.data.getVar("PROVIDES", d, 1): + deps = patchdeps if not bb.data.getVar('INHIBIT_DEFAULT_DEPS', d): if (bb.data.getVar('HOST_SYS', d, 1) != @@ -685,7 +687,7 @@ python () { # Patch handling inherit patch -EXPORT_FUNCTIONS do_clean do_mrproper do_fetch do_unpack do_configure do_compile do_install do_package do_patch do_populate_pkgs do_stage +EXPORT_FUNCTIONS do_clean do_mrproper do_fetch do_unpack do_configure do_compile do_install do_package do_populate_pkgs do_stage MIRRORS[func] = "0" MIRRORS () { |