[meta-oe][PATCH 0/1] mariadb: Add mysql5 to RPROVIDES for backwards compatibility

[meta-oe][PATCH 0/1] mariadb: Add mysql5 to RPROVIDES for backwards compatibility

[Hongxu Jia]

The following changes since commit d79d4b340358168d7ca4b8f2837c9d09c44bd1fe:

  netperf: set _FILE_OFFSET_BITS to 64 to support large files (2013-10-09 09:57:21 -0400)

are available in the git repository at:

  git://git.pokylinux.org/poky-contrib hongxu/fix-mariadb-3
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=hongxu/fix-mariadb-3

Hongxu Jia (1):
  mariadb: Add mysql5 to RPROVIDES for backwards compatibility

 meta-oe/recipes-support/mysql/mariadb_5.1.67.bb | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

-- 
1.8.1.2

[meta-oe][PATCH 1/1] mariadb: Add mysql5 to RPROVIDES for backwards compatibility

[Hongxu Jia]

It failed to build image while IMAGE_INSTALL += "mysql5"
For backwards compatibility:
- Add mysql5 to RPROVIDES_${PN}
- Add mysql5-dbg to RPROVIDES_${PN}-dbg
- Add mysql5-leftovers to RPROVIDES_${PN}-leftovers
- Use "+=" instead of "=" in  RPROVIDES_${PN}-client and
  RPROVIDES_${PN}-server

The same to RREPLACES and RCONFLICTS.

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
 meta-oe/recipes-support/mysql/mariadb_5.1.67.bb | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/meta-oe/recipes-support/mysql/mariadb_5.1.67.bb b/meta-oe/recipes-support/mysql/mariadb_5.1.67.bb
index fdf20dc..fc499d4 100644
--- a/meta-oe/recipes-support/mysql/mariadb_5.1.67.bb
+++ b/meta-oe/recipes-support/mysql/mariadb_5.1.67.bb
@@ -4,11 +4,23 @@ DEPENDS += "mariadb-native"
 
 PROVIDES += "mysql5"
 
-RPROVIDES_${PN}-client = "mysql5-client"
-RREPLACES_${PN}-client = "mysql5-client"
-RCONFLICTS_${PN}-client = "mysql5-client"
+RPROVIDES_${PN} += "mysql5"
+RREPLACES_${PN} += "mysql5"
+RCONFLICTS_${PN} += "mysql5"
 
-RPROVIDES_${PN}-server = "mysql5-server"
-RREPLACES_${PN}-server = "mysql5-server"
-RCONFLICTS_${PN}-server = "mysql5-server"
+RPROVIDES_${PN}-dbg += "mysql5-dbg"
+RREPLACES_${PN}-dbg += "mysql5-dbg"
+RCONFLICTS_${PN}-dbg += "mysql5-dbg"
+
+RPROVIDES_${PN}-leftovers += "mysql5-leftovers"
+RREPLACES_${PN}-leftovers += "mysql5-leftovers"
+RCONFLICTS_${PN}-leftovers += "mysql5-leftovers"
+
+RPROVIDES_${PN}-client += "mysql5-client"
+RREPLACES_${PN}-client += "mysql5-client"
+RCONFLICTS_${PN}-client += "mysql5-client"
+
+RPROVIDES_${PN}-server += "mysql5-server"
+RREPLACES_${PN}-server += "mysql5-server"
+RCONFLICTS_${PN}-server += "mysql5-server"
 
-- 
1.8.1.2

Re: [meta-oe][PATCH 1/1] mariadb: Add mysql5 to RPROVIDES for backwards compatibility

[Hongxu Jia]

Ping

Thanks,
Hongxu

On 10/10/2013 05:21 PM, Hongxu Jia wrote:
> It failed to build image while IMAGE_INSTALL += "mysql5"
> For backwards compatibility:
> - Add mysql5 to RPROVIDES_${PN}
> - Add mysql5-dbg to RPROVIDES_${PN}-dbg
> - Add mysql5-leftovers to RPROVIDES_${PN}-leftovers
> - Use "+=" instead of "=" in  RPROVIDES_${PN}-client and
>    RPROVIDES_${PN}-server
>
> The same to RREPLACES and RCONFLICTS.
>
> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
> ---
>   meta-oe/recipes-support/mysql/mariadb_5.1.67.bb | 24 ++++++++++++++++++------
>   1 file changed, 18 insertions(+), 6 deletions(-)
>
> diff --git a/meta-oe/recipes-support/mysql/mariadb_5.1.67.bb b/meta-oe/recipes-support/mysql/mariadb_5.1.67.bb
> index fdf20dc..fc499d4 100644
> --- a/meta-oe/recipes-support/mysql/mariadb_5.1.67.bb
> +++ b/meta-oe/recipes-support/mysql/mariadb_5.1.67.bb
> @@ -4,11 +4,23 @@ DEPENDS += "mariadb-native"
>   
>   PROVIDES += "mysql5"
>   
> -RPROVIDES_${PN}-client = "mysql5-client"
> -RREPLACES_${PN}-client = "mysql5-client"
> -RCONFLICTS_${PN}-client = "mysql5-client"
> +RPROVIDES_${PN} += "mysql5"
> +RREPLACES_${PN} += "mysql5"
> +RCONFLICTS_${PN} += "mysql5"
>   
> -RPROVIDES_${PN}-server = "mysql5-server"
> -RREPLACES_${PN}-server = "mysql5-server"
> -RCONFLICTS_${PN}-server = "mysql5-server"
> +RPROVIDES_${PN}-dbg += "mysql5-dbg"
> +RREPLACES_${PN}-dbg += "mysql5-dbg"
> +RCONFLICTS_${PN}-dbg += "mysql5-dbg"
> +
> +RPROVIDES_${PN}-leftovers += "mysql5-leftovers"
> +RREPLACES_${PN}-leftovers += "mysql5-leftovers"
> +RCONFLICTS_${PN}-leftovers += "mysql5-leftovers"
> +
> +RPROVIDES_${PN}-client += "mysql5-client"
> +RREPLACES_${PN}-client += "mysql5-client"
> +RCONFLICTS_${PN}-client += "mysql5-client"
> +
> +RPROVIDES_${PN}-server += "mysql5-server"
> +RREPLACES_${PN}-server += "mysql5-server"
> +RCONFLICTS_${PN}-server += "mysql5-server"
>