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>
This commit is contained in:
parent
c2b4308119
commit
65bf6c90e6
|
@ -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:
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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 \
|
||||
|
|
Loading…
Reference in New Issue