summaryrefslogtreecommitdiff
path: root/meta/classes
diff options
context:
space:
mode:
authorDamien Lespiau <damien.lespiau@intel.com>2009-08-25 15:08:15 +0100
committerDamien Lespiau <damien.lespiau@intel.com>2009-08-26 00:44:41 +0100
commit65bf6c90e63b67732bda8b4a1c786a605f61c611 (patch)
tree2119edad348a3e523c874f92b3d28a85b122ef85 /meta/classes
parentc2b4308119d32c07e9c7a120e06b78afd26ff58c (diff)
downloadopenembedded-core-65bf6c90e63b67732bda8b4a1c786a605f61c611.tar.gz
openembedded-core-65bf6c90e63b67732bda8b4a1c786a605f61c611.tar.bz2
openembedded-core-65bf6c90e63b67732bda8b4a1c786a605f61c611.tar.xz
openembedded-core-65bf6c90e63b67732bda8b4a1c786a605f61c611.zip
base.bbclass: packages pulling a mercurial tree should depend on mercurial
As we don't provide a mercurial-native package (yet) let's assume the build machine has it installed and check (sanity.bbclass) if it's the case. Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/base.bbclass7
-rw-r--r--meta/classes/sanity.bbclass2
2 files changed, 8 insertions, 1 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 4f1e2dd78..4f57c3ff4 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -1008,6 +1008,13 @@ def base_after_parse(d):
depends = depends + " git-native:do_populate_staging"
bb.data.setVarFlag('do_fetch', 'depends', depends, d)
+ # Mercurial packages should DEPEND on mercurial-native
+ srcuri = bb.data.getVar('SRC_URI', d, 1)
+ if "hg://" in srcuri:
+ depends = bb.data.getVarFlag('do_fetch', 'depends', d) or ""
+ depends = depends + " mercurial-native:do_populate_staging"
+ bb.data.setVarFlag('do_fetch', 'depends', depends, d)
+
# OSC packages should DEPEND on osc-native
srcuri = bb.data.getVar('SRC_URI', d, 1)
if "osc://" in srcuri:
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 5cf067795..e11bdd221 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -83,7 +83,7 @@ def check_sanity(e):
if not check_app_exists('${BUILD_PREFIX}g++', e.data):
missing = missing + "C++ Compiler (%sg++)," % data.getVar("BUILD_PREFIX", e.data, True)
- required_utilities = "patch help2man diffstat texi2html makeinfo cvs svn bzip2 tar gzip gawk"
+ required_utilities = "patch help2man diffstat texi2html makeinfo cvs svn bzip2 tar gzip gawk hg"
# qemu-native needs gcc 3.x
if "qemu-native" not in assume_provided and "gcc3-native" in assume_provided: