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>

diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 4f1e2dd788fe31a3b8f9da6a8accf54c9d3cf00a..4f57c3ff4dee92f3d18a4762588baaba47662b18 100644 (file)
--- 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 5cf067795738eddc39a70ffd320bafb74cd081d8..e11bdd22186237e0f40c102afc653bfd8c118833 100644 (file)
--- 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:

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 7f64b03aacc79c65016a1114118beb88019b4504..59aa2efea2d69e90b5d96060177066063157892a 100644 (file)
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -119,11 +119,15 @@ DATETIME = "${DATE}${TIME}"
 
 # python-native should be here but python relies on building 
 # its own in staging
+# mercurial-native is required to pull mercurial repositories (hg://...)
+# we don't have it yet in the recipies so let's assume it's provided by
+# the underlying OS
 ASSUME_PROVIDED = "\
     bzip2-native \
     cvs-native \
     grep-native \
     diffstat-native \
+    mercurial-native \
     patch-native \
     perl-native-runtime \
     python-native-runtime \