From 455785f758005712b6e59a8ebf0cf0056cab9cf1 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 20 May 2018 09:35:05 -0700 Subject: mariadb: Upgrade to 5.5.60 Signed-off-by: Khem Raj Signed-off-by: Armin Kuster --- meta-oe/recipes-dbs/mysql/mariadb-native_5.5.59.bb | 19 --------------- meta-oe/recipes-dbs/mysql/mariadb-native_5.5.60.bb | 19 +++++++++++++++ meta-oe/recipes-dbs/mysql/mariadb.inc | 5 ++-- meta-oe/recipes-dbs/mysql/mariadb_5.5.59.bb | 27 ---------------------- meta-oe/recipes-dbs/mysql/mariadb_5.5.60.bb | 27 ++++++++++++++++++++++ 5 files changed, 48 insertions(+), 49 deletions(-) delete mode 100644 meta-oe/recipes-dbs/mysql/mariadb-native_5.5.59.bb create mode 100644 meta-oe/recipes-dbs/mysql/mariadb-native_5.5.60.bb delete mode 100644 meta-oe/recipes-dbs/mysql/mariadb_5.5.59.bb create mode 100644 meta-oe/recipes-dbs/mysql/mariadb_5.5.60.bb diff --git a/meta-oe/recipes-dbs/mysql/mariadb-native_5.5.59.bb b/meta-oe/recipes-dbs/mysql/mariadb-native_5.5.59.bb deleted file mode 100644 index 4ce960d7da..0000000000 --- a/meta-oe/recipes-dbs/mysql/mariadb-native_5.5.59.bb +++ /dev/null @@ -1,19 +0,0 @@ -require mariadb.inc -inherit native - -PROVIDES += "mysql5-native" -DEPENDS = "ncurses-native zlib-native bison-native" - -RDEPENDS_${PN} = "" -PACKAGES = "" -EXTRA_OEMAKE = "" - -do_install() { - oe_runmake 'DESTDIR=${D}' install - - install -d ${D}${bindir} - install -m 0755 sql/gen_lex_hash ${D}${bindir}/ - install -m 0755 extra/comp_err ${D}${bindir}/ - install -m 0755 scripts/comp_sql ${D}${bindir}/ -} - diff --git a/meta-oe/recipes-dbs/mysql/mariadb-native_5.5.60.bb b/meta-oe/recipes-dbs/mysql/mariadb-native_5.5.60.bb new file mode 100644 index 0000000000..4ce960d7da --- /dev/null +++ b/meta-oe/recipes-dbs/mysql/mariadb-native_5.5.60.bb @@ -0,0 +1,19 @@ +require mariadb.inc +inherit native + +PROVIDES += "mysql5-native" +DEPENDS = "ncurses-native zlib-native bison-native" + +RDEPENDS_${PN} = "" +PACKAGES = "" +EXTRA_OEMAKE = "" + +do_install() { + oe_runmake 'DESTDIR=${D}' install + + install -d ${D}${bindir} + install -m 0755 sql/gen_lex_hash ${D}${bindir}/ + install -m 0755 extra/comp_err ${D}${bindir}/ + install -m 0755 scripts/comp_sql ${D}${bindir}/ +} + diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc index 99e7050945..8e0e252421 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -18,9 +18,8 @@ SRC_URI = "https://downloads.mariadb.org/f/${BP}/source/${BP}.tar.gz \ file://change-cc-to-cc-version.patch \ file://0001-disable-ucontext-on-musl.patch \ " - -SRC_URI[md5sum] = "3cec4afc06b468687ef576c90148d10d" -SRC_URI[sha256sum] = "c3269ce20b45b177239fd1e3d6d9428a94131711f12758ebf5f65222278bb110" +SRC_URI[md5sum] = "afbadcf2980ad5aa205084dd401f1b7f" +SRC_URI[sha256sum] = "4d3d444555416028ce39d3fb4cdc9cf6a658fcd4b0d2d0c45a73f9bf01d07929" S = "${WORKDIR}/mariadb-${PV}" diff --git a/meta-oe/recipes-dbs/mysql/mariadb_5.5.59.bb b/meta-oe/recipes-dbs/mysql/mariadb_5.5.59.bb deleted file mode 100644 index d7895732a6..0000000000 --- a/meta-oe/recipes-dbs/mysql/mariadb_5.5.59.bb +++ /dev/null @@ -1,27 +0,0 @@ -require mariadb.inc - -EXTRA_OECMAKE += "-DSTACK_DIRECTION=-1" - -DEPENDS += "mariadb-native ncurses zlib readline libaio libevent" - -PROVIDES += "mysql5 libmysqlclient" - -RPROVIDES_${PN} += "mysql5" -RREPLACES_${PN} += "mysql5" -RCONFLICTS_${PN} += "mysql5" - -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" diff --git a/meta-oe/recipes-dbs/mysql/mariadb_5.5.60.bb b/meta-oe/recipes-dbs/mysql/mariadb_5.5.60.bb new file mode 100644 index 0000000000..d7895732a6 --- /dev/null +++ b/meta-oe/recipes-dbs/mysql/mariadb_5.5.60.bb @@ -0,0 +1,27 @@ +require mariadb.inc + +EXTRA_OECMAKE += "-DSTACK_DIRECTION=-1" + +DEPENDS += "mariadb-native ncurses zlib readline libaio libevent" + +PROVIDES += "mysql5 libmysqlclient" + +RPROVIDES_${PN} += "mysql5" +RREPLACES_${PN} += "mysql5" +RCONFLICTS_${PN} += "mysql5" + +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