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

login
register
mail settings
Submitter Hongxu Jia
Date Oct. 10, 2013, 9:21 a.m.
Message ID <cb7c8ef452b8ffb463de5b396594a056efac74b2.1381396778.git.hongxu.jia@windriver.com>
Download mbox | patch
Permalink /patch/59599/
State Accepted, archived
Commit 0933085d534099ef7b355a3617bc8c220aa4b475
Headers show

Comments

Hongxu Jia - Oct. 10, 2013, 9:21 a.m.
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(-)
Hongxu Jia - Oct. 12, 2013, 1:32 a.m.
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"
>

Patch

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"