Re: [PATCH] mariadb: update to 5.5.40

[Kang Kai <Kai.Kang@windriver.com>]

On 2014年11月03日 09:38, Kai Kang wrote:
> Update mariadb from version 5.5.39 to 5.5.40
>
> * rename mariadb_5.5.39.inc -> mariadb.inc
> * add dependency bision-native for mariadb-native

Hi Martin,

I notice you have stage this commit to master-next for a well, but there 
some updates:

1 upstream commit revno: 4300 fails to build modphp, need revert it.
2 libedit should be a package config
|-- I think it is better to squash them in this commit.

3 some configure files should split into sub-packages, rather than 
mariadb-leftover


So would you like to drop this commit in master-next? Thanks. I'll send 
V2 soon.

--Kai



>
> Signed-off-by: Kai Kang <kai.kang@windriver.com>
> ---
>   .../mysql/{mariadb-native_5.5.39.bb => mariadb-native_5.5.40.bb}      | 4 ++--
>   meta-oe/recipes-support/mysql/{mariadb_5.5.39.inc => mariadb.inc}     | 4 ++--
>   .../recipes-support/mysql/{mariadb_5.5.39.bb => mariadb_5.5.40.bb}    | 3 +--
>   3 files changed, 5 insertions(+), 6 deletions(-)
>   rename meta-oe/recipes-support/mysql/{mariadb-native_5.5.39.bb => mariadb-native_5.5.40.bb} (82%)
>   rename meta-oe/recipes-support/mysql/{mariadb_5.5.39.inc => mariadb.inc} (98%)
>   rename meta-oe/recipes-support/mysql/{mariadb_5.5.39.bb => mariadb_5.5.40.bb} (96%)
>
> diff --git a/meta-oe/recipes-support/mysql/mariadb-native_5.5.39.bb b/meta-oe/recipes-support/mysql/mariadb-native_5.5.40.bb
> similarity index 82%
> rename from meta-oe/recipes-support/mysql/mariadb-native_5.5.39.bb
> rename to meta-oe/recipes-support/mysql/mariadb-native_5.5.40.bb
> index 9148dee..4ce960d 100644
> --- a/meta-oe/recipes-support/mysql/mariadb-native_5.5.39.bb
> +++ b/meta-oe/recipes-support/mysql/mariadb-native_5.5.40.bb
> @@ -1,8 +1,8 @@
> -require mariadb_${PV}.inc
> +require mariadb.inc
>   inherit native
>   
>   PROVIDES += "mysql5-native"
> -DEPENDS = "ncurses-native zlib-native"
> +DEPENDS = "ncurses-native zlib-native bison-native"
>   
>   RDEPENDS_${PN} = ""
>   PACKAGES = ""
> diff --git a/meta-oe/recipes-support/mysql/mariadb_5.5.39.inc b/meta-oe/recipes-support/mysql/mariadb.inc
> similarity index 98%
> rename from meta-oe/recipes-support/mysql/mariadb_5.5.39.inc
> rename to meta-oe/recipes-support/mysql/mariadb.inc
> index ae2e92b..20f5de2 100644
> --- a/meta-oe/recipes-support/mysql/mariadb_5.5.39.inc
> +++ b/meta-oe/recipes-support/mysql/mariadb.inc
> @@ -12,8 +12,8 @@ SRC_URI = "http://mirror.stshosting.co.uk/mariadb/mariadb-${PV}/source/mariadb-$
>              file://mysqld.service \
>             "
>   
> -SRC_URI[md5sum] = "917a807d8cf2c8ef9deedd2a89b6decd"
> -SRC_URI[sha256sum] = "cb850865ab55ce5f01c99a612cc75b76ead5d75adfa75a606f453d32f9089d14"
> +SRC_URI[md5sum] = "561bede89a8bd19c374dad2d8f24fdfe"
> +SRC_URI[sha256sum] = "cbde17f4a31483143490def6fcce33310ebae49eafe92dc4ada0e7227202415a"
>   
>   S = "${WORKDIR}/mariadb-${PV}"
>   
> diff --git a/meta-oe/recipes-support/mysql/mariadb_5.5.39.bb b/meta-oe/recipes-support/mysql/mariadb_5.5.40.bb
> similarity index 96%
> rename from meta-oe/recipes-support/mysql/mariadb_5.5.39.bb
> rename to meta-oe/recipes-support/mysql/mariadb_5.5.40.bb
> index fee5b62..f24cb43 100644
> --- a/meta-oe/recipes-support/mysql/mariadb_5.5.39.bb
> +++ b/meta-oe/recipes-support/mysql/mariadb_5.5.40.bb
> @@ -1,4 +1,4 @@
> -require ${PN}_${PV}.inc
> +require mariadb.inc
>   
>   EXTRA_OECMAKE += "-DSTACK_DIRECTION=-1"
>   
> @@ -25,4 +25,3 @@ RCONFLICTS_${PN}-client += "mysql5-client"
>   RPROVIDES_${PN}-server += "mysql5-server"
>   RREPLACES_${PN}-server += "mysql5-server"
>   RCONFLICTS_${PN}-server += "mysql5-server"
> -


-- 
Regards,
Neil | Kai Kang