From 0933085d534099ef7b355a3617bc8c220aa4b475 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Thu, 10 Oct 2013 09:21:22 +0000 Subject: mariadb: Add mysql5 to RPROVIDES for backwards compatibility 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 Signed-off-by: Martin Jansa --- meta-oe/recipes-support/mysql/mariadb_5.1.67.bb | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) (limited to 'meta-oe/recipes-support/mysql') 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 fdf20dcceb..fc499d434b 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" -- cgit 1.2.3-korg