[OE-core] [CONSOLIDATED PULL 20/21] bitbake.conf: Update ASSUME_PROVIDED

Saul Wold sgw at linux.intel.com
Mon Nov 14 04:28:10 UTC 2011


* Remove an obsolete comment about mercurial
* Remove cvs-native since we have removed cvs SRC_URIs
* Fix svn-native -> subversion since that's the correct dependency name
* Add git-native since it's a core functionality and gnu-config requires it
  and can cause a circular dependency.

Signed-off-by: Saul Wold <sgw at linux.intel.com>
---
 meta/conf/bitbake.conf |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 0d6b3b8..ffd7a85 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -146,18 +146,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 \
+    git-native \
     patch-native \
     perl-native-runtime \
     python-native-runtime \
-    svn-native \
+    subversion-native \
     tar-native \
     texinfo-native \
     virtual/libintl-native \
-- 
1.7.6.4





More information about the Openembedded-core mailing list