From 2f9739240bcb1cfd0675bbe77c02b5f7c32219b1 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Mon, 11 Nov 2019 07:58:48 -0500 Subject: meta-openembedded: subtree update:e0daf6f8e0..3a9262866d MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adrian Bunk (1): xfce-polkit: Upgrade 0.2 -> 0.3 Alex Kiernan (2): ostree: Add support for ptest ostree: Upgrade 2019.4 -> 2019.5 Alistair Francis (1): openocd: Update to latest git version Anders Roxell (1): s-suite: install missing create_config.sh Andreas Müller (6): mm-common: upgrade 0.9.12 -> 1.0.0 / meson build / add SUMMARY mm-common: do really build with meson libpeas: upgrade 1.22.0 -> 1.24.1 xfce4-screenshooter: upgrade 1.9.6 -> 1.9.7 xfce4-time-out-plugin: upgrade 1.0.3 -> 1.1.0 xfce4-whiskermenu-plugin: upgrade 2.3.3 -> 2.3.4 Andreas Oberritter (4): haveged: Fix missing initscript when both systemd and sysvinit are enabled samba: fix installation for minimal build autofs: set some paths for configure script autofs: install sysvinit script manually if systemd is enabled André Draszik (8): jansson: allow to build a -native package cunit: allow to build a -native package libev: allow to build a -native package nghttp2: fix UPSTREAM_CHECK_URI nghttp2: update to 1.39.2 nghttp2: build more of this & fix packaging nghttp2: allow to build a -native package nodejs: allow use of system nghttp2 Hongxu Jia (10): python-pluggy: add python-importlib-metadata to RDEPENDS python-more-itertools.inc: fix python2 package not incorrectly generated python-more-itertools: downgrade 7.2.0 -> 5.0.0 python-importlib-metadata: add missing runtime depends python-pathlib2: add python-scandir and python-misc to runtime depends python-scandir: add version 1.10.0 python-contextlib2/python3-contextlib2: add version 0.6.0 python3-importlib-metadata: add python3-misc to runtime depends python-importlib-metadata: add python-compression to runtime depends python-configparser: add python-pkgutil to runtime depends Kai Kang (4): xfce4-genmon-plugin: 4.0.1 -> 4.0.2 xfce-panel-plugin.bbclass: correct SRC_URI with xfce_verdir xfce4-weather-plugin: 0.9.1 -> 0.10.0 xfce4-screensaver: 0.1.5 -> 0.1.8 Khem Raj (8): iwd: Fix installed-vs-shipped QA errors on systemd units iwd: Fix build race during documentation build ifplugd: Include stdint.h for uintXX_t netkit-rwho: Include stdint.h for int32_t libowfat: Fix parallel build grpc: Add dep on libnsl gtkwave: Upgrade to 3.3.102 syslog-ng: Do not install non-existing systemd file Ming Liu (2): python-jsonschema: RDEPENDS on python-importlib-metadata ostree: fix some invalid condition checking Oleksandr Kravchuk (1): iwd: update to 1.0 Stefan Agner (2): zstd: Upgrade 1.4.3 -> 1.4.4 zstd: move recipe to oe-core Yi Zhao (2): libldb: upgrade 1.5.5 -> 1.5.6 samba: upgrade 4.10.8 -> 4.10.10 Zang Ruochen (20): python-pyjks: upgrade 17.1.1 -> 19.0.0 python-pyjwt: upgrade 1.6.4 -> 1.7.1 python-pymisp: upgrade 2.4.93 -> 2.4.117.2 xorriso: upgrade 1.5.0 -> 1.5.3 python-cython: upgrade 0.29.13 -> 0.29.14 python-decorator: upgrade 4.4.0 -> 4.4.1 python-dominate: upgrade 2.3.1 -> 2.4.0 python-flask-babel: upgrade 0.11.2 -> 0.12.2 python-flask-migrate: upgrade 2.2.1 -> 2.5.2 python-flask-restful: upgrade 0.3.6 -> 0.3.7 python-flask-socketio: upgrade 3.3.2 -> 4.2.1 python-flask-sqlalchemy: upgrade 2.3.2 -> 2.4.1 python-paho-mqtt: upgrade 1.4.0 -> 1.5.0 python-pyroute2: upgrade 0.5.2 -> 0.5.7 python-pyrsistent: upgrade 0.15.4 -> 0.15.5 python-pysmi: upgrade 0.2.2 -> 0.3.4 python-pytest: upgrade 5.2.1 -> 5.2.2 python-serpent: upgrade 1.25 -> 1.28 python-smbus: upgrade 4.0 -> 4.1 python-snimpy: upgrade 0.8.12 -> 0.8.13 Zheng Ruoqin (19): mdns: upgrade 878.200.35 -> 878.260.1 ledmon: Modify the Upstream-Status to Submitted. byacc: upgrade 20190617 -> 20191103 ccid: upgrade 1.4.30 -> 1.4.31 dialog: upgrade 1.3-20190728 -> 1.3-20190808 cryptsetup: upgrade 2.2.1 -> 2.2.2 lvm2/libdevmapper: 2.03.05 -> 2.03.06 libssh2: upgrade 1.8.2 -> 1.9.0 mariadb: upgrade 10.3.16 -> 10.3.18 mcelog: upgrade 164 -> 165 mce-test: Update to latest git version postgresql: upgrade 11.5 -> 12.0 protobuf: upgrade 3.10.0 -> 3.10.1 sshfs-fuse: upgrade 3.5.2 -> 3.6.0 syslog-ng: upgrade 3.19.1 -> 3.24.1 tslib: upgrade 1.16 -> 1.21 xkbprint: upgrade 1.0.4 -> 1.0.5 xterm: upgrade 349 -> 350 zabbix: upgrade 4.2.7 -> 4.2.8 Zhixiong Chi (1): gtkwave: add the libtirpc dependence and config Change-Id: I7dd3609b2d3166e5ba2f977e26026f2b675dc108 Signed-off-by: Brad Bishop --- .../recipes-dbs/mysql/mariadb-native_10.3.16.bb | 20 ---------------- .../recipes-dbs/mysql/mariadb-native_10.3.18.bb | 20 ++++++++++++++++ .../meta-oe/recipes-dbs/mysql/mariadb.inc | 4 ++-- .../meta-oe/recipes-dbs/mysql/mariadb_10.3.16.bb | 27 ---------------------- .../meta-oe/recipes-dbs/mysql/mariadb_10.3.18.bb | 27 ++++++++++++++++++++++ ...0001-Use-pkg-config-for-libxml2-detection.patch | 14 +++++++---- .../recipes-dbs/postgresql/postgresql_11.5.bb | 12 ---------- .../recipes-dbs/postgresql/postgresql_12.0.bb | 12 ++++++++++ 8 files changed, 70 insertions(+), 66 deletions(-) delete mode 100644 meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.3.16.bb create mode 100644 meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.3.18.bb delete mode 100644 meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.3.16.bb create mode 100644 meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.3.18.bb delete mode 100644 meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_11.5.bb create mode 100644 meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_12.0.bb (limited to 'meta-openembedded/meta-oe/recipes-dbs') diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.3.16.bb b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.3.16.bb deleted file mode 100644 index e1a038dfa3..0000000000 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.3.16.bb +++ /dev/null @@ -1,20 +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 sql/gen_lex_token ${D}${bindir}/ - install -m 0755 extra/comp_err ${D}${bindir}/ - install -m 0755 scripts/comp_sql ${D}${bindir}/ -} - diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.3.18.bb b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.3.18.bb new file mode 100644 index 0000000000..e1a038dfa3 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.3.18.bb @@ -0,0 +1,20 @@ +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 sql/gen_lex_token ${D}${bindir}/ + install -m 0755 extra/comp_err ${D}${bindir}/ + install -m 0755 scripts/comp_sql ${D}${bindir}/ +} + diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc index f1c71feebe..e1ae58ae7a 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -19,8 +19,8 @@ SRC_URI = "http://archive.mariadb.org/${BP}/source/${BP}.tar.gz \ file://clang_version_header_conflict.patch \ file://fix-arm-atomic.patch \ " -SRC_URI[md5sum] = "11220d0b94c5c24caa2e1e9eaba38e31" -SRC_URI[sha256sum] = "39e9723eaf620afd99b0925b2c2a5a50a89110ba50040adf14cce7cf89e5e21b" +SRC_URI[md5sum] = "b3524c0825c3a1c255496daea38304a0" +SRC_URI[sha256sum] = "69456ca85bf9d96c6d28b4ade2a9f6787d79a602e27ef941f9ba4e0b55dddedc" UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases" diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.3.16.bb b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.3.16.bb deleted file mode 100644 index de24c920f0..0000000000 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.3.16.bb +++ /dev/null @@ -1,27 +0,0 @@ -require mariadb.inc - -EXTRA_OECMAKE += "-DSTACK_DIRECTION=-1" - -DEPENDS += "mariadb-native bison-native openssl ncurses zlib readline libaio libevent libxml2" - -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-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.3.18.bb b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.3.18.bb new file mode 100644 index 0000000000..de24c920f0 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.3.18.bb @@ -0,0 +1,27 @@ +require mariadb.inc + +EXTRA_OECMAKE += "-DSTACK_DIRECTION=-1" + +DEPENDS += "mariadb-native bison-native openssl ncurses zlib readline libaio libevent libxml2" + +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-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-Use-pkg-config-for-libxml2-detection.patch b/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-Use-pkg-config-for-libxml2-detection.patch index f14da06d91..84cd5c1579 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-Use-pkg-config-for-libxml2-detection.patch +++ b/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-Use-pkg-config-for-libxml2-detection.patch @@ -9,21 +9,25 @@ xml2-config does not work. Use pkgconfig to set CPPFLAGS and LIBS. Signed-off-by: Philip Balister -upate to version 10.4 +update to version 10.4 Signed-off-by: Changqing Li + +Update for version 12.0 +Signed-off-by: Zheng Ruoqin --- - configure.in | 15 ++------------- - 1 file changed, 2 insertions(+), 13 deletions(-) + configure.in | 16 ++-------------- + 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/configure.in b/configure.in -index d9fe56e..3e2cd3a 100644 +index 6942f81..7fd3e78 100644 --- a/configure.in +++ b/configure.in -@@ -816,19 +816,8 @@ PGAC_ARG_BOOL(with, libxml, no, [build with XML support], +@@ -923,20 +923,8 @@ PGAC_ARG_BOOL(with, libxml, no, [build with XML support], [AC_DEFINE([USE_LIBXML], 1, [Define to 1 to build with XML support. (--with-libxml)])]) if test "$with_libxml" = yes ; then - PGAC_PATH_PROGS(XML2_CONFIG, xml2-config) +- AC_ARG_VAR(XML2_CONFIG, [path to xml2-config utility])dnl - if test -n "$XML2_CONFIG"; then - for pgac_option in `$XML2_CONFIG --cflags`; do - case $pgac_option in diff --git a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_11.5.bb b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_11.5.bb deleted file mode 100644 index fd4200a733..0000000000 --- a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_11.5.bb +++ /dev/null @@ -1,12 +0,0 @@ -require postgresql.inc - -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=87da2b84884860b71f5f24ab37e7da78" - -SRC_URI += "\ - file://not-check-libperl.patch \ - file://0001-Add-support-for-RISC-V.patch \ - file://0001-Improve-reproducibility.patch \ -" - -SRC_URI[md5sum] = "580da94f6d85046ff2a228785ab2cc89" -SRC_URI[sha256sum] = "7fdf23060bfc715144cbf2696cf05b0fa284ad3eb21f0c378591c6bca99ad180" diff --git a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_12.0.bb b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_12.0.bb new file mode 100644 index 0000000000..d5b1ebdb5e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_12.0.bb @@ -0,0 +1,12 @@ +require postgresql.inc + +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=87da2b84884860b71f5f24ab37e7da78" + +SRC_URI += "\ + file://not-check-libperl.patch \ + file://0001-Add-support-for-RISC-V.patch \ + file://0001-Improve-reproducibility.patch \ +" + +SRC_URI[md5sum] = "87545416ef021eee8621d31a93fcc899" +SRC_URI[sha256sum] = "cda2397215f758b793f741c86be05468257b0e6bcb1a6113882ab5d0df0855c6" -- cgit v1.2.3