summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-02 20:17:54 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-04 14:48:13 +0100
commit024d587555195f8d26666e9d8659aec0a5d03796 (patch)
treeaae1fd7982a6801e1116e0adddb27b563e6783f2
parentbc6c98555a62f4c7c4bc0e4c00b2b27cc56bbea3 (diff)
downloadpoky-024d587555195f8d26666e9d8659aec0a5d03796.tar.gz
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. (From OE-Core rev: ac0aa35ba6d7a21636bdd23d45ae0bf8112bdaa8) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/bitbake.conf1
-rw-r--r--meta/recipes-devtools/subversion/subversion_1.7.2.bb4
2 files changed, 0 insertions, 5 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index f6d6f7dc3b..1ca885fe3f 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -157,7 +157,6 @@ ASSUME_PROVIDED = "\
157 patch-native \ 157 patch-native \
158 perl-native-runtime \ 158 perl-native-runtime \
159 python-native-runtime \ 159 python-native-runtime \
160 subversion-native \
161 tar-native \ 160 tar-native \
162 virtual/libintl-native \ 161 virtual/libintl-native \
163 " 162 "
diff --git a/meta/recipes-devtools/subversion/subversion_1.7.2.bb b/meta/recipes-devtools/subversion/subversion_1.7.2.bb
index a8d4f2226e..d4d56d051d 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"
9 9
10PR = "r1" 10PR = "r1"
11 11
12# negative, because of new checkout format in 1.7.0
13# and distro PREMIRRORs need to be in sync with users
14DEFAULT_PREFERENCE = "-1"
15
16SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ 12SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
17 file://libtool2.patch \ 13 file://libtool2.patch \
18" 14"