diff options
author | Tom Rini <tom_rini@mentor.com> | 2011-07-15 11:16:02 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-07-20 15:27:36 +0100 |
commit | 4e774836a4ad9b832aa594167fd97023c1b6870c (patch) | |
tree | b40c0af9a12a8bbce94ba671ca2c6a7f041db146 /meta | |
parent | ef2c0ef14cecc0962a7e3d7170aa252721ba88c0 (diff) | |
download | poky-4e774836a4ad9b832aa594167fd97023c1b6870c.tar.gz |
bitbake.conf, sanity.bbclass: Drop mercurial-native
We have no hg URIs in the metadata, so don't require and don't
ASSUME_PROVIDED it either. meta-oe has a mercurial-native recipe
if hg URIs are added in a recipe later.
(From OE-Core rev: 6473c9096bf4995c21147e737322d800219c89ab)
Signed-off-by: Tom Rini <tom_rini@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/sanity.bbclass | 2 | ||||
-rw-r--r-- | meta/conf/bitbake.conf | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index 716b15864e..28c9ecd901 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass | |||
@@ -209,7 +209,7 @@ def check_sanity(e): | |||
209 | if not check_app_exists('${BUILD_PREFIX}g++', e.data): | 209 | if not check_app_exists('${BUILD_PREFIX}g++', e.data): |
210 | missing = missing + "C++ Compiler (%sg++)," % data.getVar("BUILD_PREFIX", e.data, True) | 210 | missing = missing + "C++ Compiler (%sg++)," % data.getVar("BUILD_PREFIX", e.data, True) |
211 | 211 | ||
212 | required_utilities = "patch help2man diffstat texi2html makeinfo cvs svn bzip2 tar gzip gawk hg chrpath wget cpio" | 212 | required_utilities = "patch help2man diffstat texi2html makeinfo cvs svn bzip2 tar gzip gawk chrpath wget cpio" |
213 | 213 | ||
214 | if "qemu-native" in assume_provided: | 214 | if "qemu-native" in assume_provided: |
215 | if not check_app_exists("qemu-arm", e.data): | 215 | if not check_app_exists("qemu-arm", e.data): |
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 128b0b66bb..975e24c071 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf | |||
@@ -132,7 +132,6 @@ ASSUME_PROVIDED = "\ | |||
132 | cvs-native \ | 132 | cvs-native \ |
133 | grep-native \ | 133 | grep-native \ |
134 | diffstat-native \ | 134 | diffstat-native \ |
135 | mercurial-native \ | ||
136 | patch-native \ | 135 | patch-native \ |
137 | perl-native-runtime \ | 136 | perl-native-runtime \ |
138 | python-native-runtime \ | 137 | python-native-runtime \ |