diff options
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/base.bbclass | 7 | ||||
-rw-r--r-- | meta/classes/sanity.bbclass | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 4f1e2dd788..4f57c3ff4d 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass | |||
@@ -1008,6 +1008,13 @@ def base_after_parse(d): | |||
1008 | depends = depends + " git-native:do_populate_staging" | 1008 | depends = depends + " git-native:do_populate_staging" |
1009 | bb.data.setVarFlag('do_fetch', 'depends', depends, d) | 1009 | bb.data.setVarFlag('do_fetch', 'depends', depends, d) |
1010 | 1010 | ||
1011 | # Mercurial packages should DEPEND on mercurial-native | ||
1012 | srcuri = bb.data.getVar('SRC_URI', d, 1) | ||
1013 | if "hg://" in srcuri: | ||
1014 | depends = bb.data.getVarFlag('do_fetch', 'depends', d) or "" | ||
1015 | depends = depends + " mercurial-native:do_populate_staging" | ||
1016 | bb.data.setVarFlag('do_fetch', 'depends', depends, d) | ||
1017 | |||
1011 | # OSC packages should DEPEND on osc-native | 1018 | # OSC packages should DEPEND on osc-native |
1012 | srcuri = bb.data.getVar('SRC_URI', d, 1) | 1019 | srcuri = bb.data.getVar('SRC_URI', d, 1) |
1013 | if "osc://" in srcuri: | 1020 | if "osc://" in srcuri: |
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index 5cf0677957..e11bdd2218 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass | |||
@@ -83,7 +83,7 @@ def check_sanity(e): | |||
83 | if not check_app_exists('${BUILD_PREFIX}g++', e.data): | 83 | if not check_app_exists('${BUILD_PREFIX}g++', e.data): |
84 | missing = missing + "C++ Compiler (%sg++)," % data.getVar("BUILD_PREFIX", e.data, True) | 84 | missing = missing + "C++ Compiler (%sg++)," % data.getVar("BUILD_PREFIX", e.data, True) |
85 | 85 | ||
86 | required_utilities = "patch help2man diffstat texi2html makeinfo cvs svn bzip2 tar gzip gawk" | 86 | required_utilities = "patch help2man diffstat texi2html makeinfo cvs svn bzip2 tar gzip gawk hg" |
87 | 87 | ||
88 | # qemu-native needs gcc 3.x | 88 | # qemu-native needs gcc 3.x |
89 | if "qemu-native" not in assume_provided and "gcc3-native" in assume_provided: | 89 | if "qemu-native" not in assume_provided and "gcc3-native" in assume_provided: |