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

login
register
mail settings
Submitter Richard Purdie
Date July 2, 2012, 8:23 p.m.
Message ID <1341260636.23146.266.camel@ted>
Download mbox | patch
Permalink /patch/30993/
State Accepted
Commit ac0aa35ba6d7a21636bdd23d45ae0bf8112bdaa8
Headers show

Comments

Richard Purdie - July 2, 2012, 8:23 p.m.
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>
---
Martin Jansa - July 3, 2012, 6:01 p.m.
On Mon, Jul 02, 2012 at 09:23:56PM +0100, Richard Purdie wrote:
> 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.

One less change I had to keep in shr branch for quite some time

Acked-by: Martin Jansa <Martin.Jansa@gmail.com>

> 
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
> diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
> index 9377ee6..36caff0 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 a8d4f22..d4d56d0 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 \
>  "
> 
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Patch

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 9377ee6..36caff0 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 a8d4f22..d4d56d0 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 \
 "