Drop mercurial-native from the initial ASSUME_PROVIDED list and instead only add it if we find 'hg' is installed.
Signed-off-by: Tom Rini <[email protected]> --- meta/classes/sanity.bbclass | 6 +++++- meta/conf/bitbake.conf | 1 - 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index c9d37c9..2bc3fca 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass @@ -209,7 +209,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 hg chrpath wget cpio" + required_utilities = "patch help2man diffstat texi2html makeinfo cvs svn bzip2 tar gzip gawk chrpath wget cpio" # qemu-native needs gcc 3.x if "qemu-native" not in assume_provided and "gcc3-native" in assume_provided: @@ -243,6 +243,10 @@ def check_sanity(e): if not check_app_exists( util, e.data ): missing = missing + "%s," % util + # If we've found 'hg', add mercurial-native to ASSUME_PROVIDED. + if check_app_exists( "hg", e.data ): + bb.data.setVar('ASSUME_PROVIDED', data.getVar('ASSUME_PROVIDED', e.data , True) + "mercurial-native", e.data) + if missing != "": missing = missing.rstrip(',') messages = messages + "Please install following missing utilities: %s\n" % missing diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 463991d..15fd97e 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -132,7 +132,6 @@ ASSUME_PROVIDED = "\ cvs-native \ grep-native \ diffstat-native \ - mercurial-native \ patch-native \ perl-native-runtime \ python-native-runtime \ -- 1.7.0.4 _______________________________________________ Openembedded-core mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
