From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Mon, 2 Jul 2012 20:17:54 +0000 (+0000)
Subject: subversion-native: Enable subversion-native 1.7 and remove it from ASSUME_PROVIDED
X-Git-Tag: yocto-4.0~36532
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ac0aa35ba6d7a21636bdd23d45ae0bf8112bdaa8;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

subversion-native: Enable subversion-native 1.7 and remove it from ASSUME_PROVIDED

This enables a switch to subversion 1.7 now bitbake is able to cope with
upgrading existing working copies. The impact of this change should be
minimal since we don't have many subversion recipes now.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index f6d6f7dc3b3..1ca885fe3f0 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -157,7 +157,6 @@ ASSUME_PROVIDED = "\
     patch-native \
     perl-native-runtime \
     python-native-runtime \
-    subversion-native \
     tar-native \
     virtual/libintl-native \
     "
diff --git a/meta/recipes-devtools/subversion/subversion_1.7.2.bb b/meta/recipes-devtools/subversion/subversion_1.7.2.bb
index a8d4f2226e6..d4d56d051d5 100644
--- a/meta/recipes-devtools/subversion/subversion_1.7.2.bb
+++ b/meta/recipes-devtools/subversion/subversion_1.7.2.bb
@@ -9,10 +9,6 @@ BBCLASSEXTEND = "native"
 
 PR = "r1"
 
-# negative, because of new checkout format in 1.7.0 
-# and distro PREMIRRORs need to be in sync with users
-DEFAULT_PREFERENCE = "-1"
-
 SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
            file://libtool2.patch \
 "