From ea0e706a226b0a95bd3e6b076bd9ced027a38efd Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Thu, 17 Aug 2017 17:28:28 +0800 Subject: mariadb: 5.5.55 -> 5.5.57 Upgrade mariadb from 5.5.55 to 5.5.57. * update SRC_URI that mariadb.com doesn't provides source tarball of 5.5.57 * remove gcc7.patch which is not needed any more Signed-off-by: Kai Kang Signed-off-by: Martin Jansa --- .../recipes-support/mysql/mariadb-native_5.5.55.bb | 19 --------------- .../recipes-support/mysql/mariadb-native_5.5.57.bb | 19 +++++++++++++++ meta-oe/recipes-support/mysql/mariadb.inc | 8 +++---- meta-oe/recipes-support/mysql/mariadb/gcc7.patch | 13 ----------- meta-oe/recipes-support/mysql/mariadb_5.5.55.bb | 27 ---------------------- meta-oe/recipes-support/mysql/mariadb_5.5.57.bb | 27 ++++++++++++++++++++++ 6 files changed, 50 insertions(+), 63 deletions(-) delete mode 100644 meta-oe/recipes-support/mysql/mariadb-native_5.5.55.bb create mode 100644 meta-oe/recipes-support/mysql/mariadb-native_5.5.57.bb delete mode 100644 meta-oe/recipes-support/mysql/mariadb/gcc7.patch delete mode 100644 meta-oe/recipes-support/mysql/mariadb_5.5.55.bb create mode 100644 meta-oe/recipes-support/mysql/mariadb_5.5.57.bb (limited to 'meta-oe') diff --git a/meta-oe/recipes-support/mysql/mariadb-native_5.5.55.bb b/meta-oe/recipes-support/mysql/mariadb-native_5.5.55.bb deleted file mode 100644 index 4ce960d7da..0000000000 --- a/meta-oe/recipes-support/mysql/mariadb-native_5.5.55.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-support/mysql/mariadb-native_5.5.57.bb b/meta-oe/recipes-support/mysql/mariadb-native_5.5.57.bb new file mode 100644 index 0000000000..4ce960d7da --- /dev/null +++ b/meta-oe/recipes-support/mysql/mariadb-native_5.5.57.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-support/mysql/mariadb.inc b/meta-oe/recipes-support/mysql/mariadb.inc index fd9dcbd1ab..32e3eaa6d4 100644 --- a/meta-oe/recipes-support/mysql/mariadb.inc +++ b/meta-oe/recipes-support/mysql/mariadb.inc @@ -4,7 +4,7 @@ SECTION = "libs" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -SRC_URI = "http://downloads.mariadb.com/MariaDB/mariadb-${PV}/source/mariadb-${PV}.tar.gz \ +SRC_URI = "https://downloads.mariadb.org/f/${BP}/source/${BP}.tar.gz \ file://fix-cmake-module-path.patch \ file://remove-bad-path.patch \ file://fix-mysqlclient-r-version.patch \ @@ -17,10 +17,10 @@ SRC_URI = "http://downloads.mariadb.com/MariaDB/mariadb-${PV}/source/mariadb-${P file://fix-a-building-failure.patch \ file://change-cc-to-cc-version.patch \ file://0001-disable-ucontext-on-musl.patch \ - file://gcc7.patch \ " -SRC_URI[md5sum] = "54a0bbbc9b67308e7c076622d02f0fcd" -SRC_URI[sha256sum] = "cb94e315d0fc90c62db5a6c7829c9966f674285d99b3ba3ffa575fb4a26edc86" + +SRC_URI[md5sum] = "2d4104aae0b9e5efa8878918bd329cb4" +SRC_URI[sha256sum] = "5dbde98d7e4a5a1721b6cbed7898b2549a88866247951cf586057975c6cea641" S = "${WORKDIR}/mariadb-${PV}" diff --git a/meta-oe/recipes-support/mysql/mariadb/gcc7.patch b/meta-oe/recipes-support/mysql/mariadb/gcc7.patch deleted file mode 100644 index 3e75b26c76..0000000000 --- a/meta-oe/recipes-support/mysql/mariadb/gcc7.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: mariadb-5.5.55/client/mysql.cc -=================================================================== ---- mariadb-5.5.55.orig/client/mysql.cc -+++ mariadb-5.5.55/client/mysql.cc -@@ -2850,7 +2850,7 @@ You can turn off this feature to get a q - mysql_free_result(fields); - break; - } -- field_names[i][num_fields*2]= '\0'; -+ field_names[i][num_fields*2][0]= '\0'; - j=0; - while ((sql_field=mysql_fetch_field(fields))) - { diff --git a/meta-oe/recipes-support/mysql/mariadb_5.5.55.bb b/meta-oe/recipes-support/mysql/mariadb_5.5.55.bb deleted file mode 100644 index d7895732a6..0000000000 --- a/meta-oe/recipes-support/mysql/mariadb_5.5.55.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-support/mysql/mariadb_5.5.57.bb b/meta-oe/recipes-support/mysql/mariadb_5.5.57.bb new file mode 100644 index 0000000000..d7895732a6 --- /dev/null +++ b/meta-oe/recipes-support/mysql/mariadb_5.5.57.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 v1.2.3-54-g00ecf