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 --- .../ifplugd/ifplugd/Fix-build-with-musl.patch | 12 ++-- ...-Avoid-redirection-of-input-and-output-fi.patch | 40 +++++++++++ .../meta-oe/recipes-connectivity/iwd/iwd_0.23.bb | 37 ---------- .../meta-oe/recipes-connectivity/iwd/iwd_1.0.bb | 39 +++++++++++ .../recipes-connectivity/libev/libev_4.27.bb | 2 + .../recipes-connectivity/zabbix/zabbix_4.2.7.bb | 79 ---------------------- .../recipes-connectivity/zabbix/zabbix_4.2.8.bb | 79 ++++++++++++++++++++++ 7 files changed, 165 insertions(+), 123 deletions(-) create mode 100644 meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd/0001-Makefile.am-Avoid-redirection-of-input-and-output-fi.patch delete mode 100644 meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_0.23.bb create mode 100644 meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-connectivity/zabbix/zabbix_4.2.7.bb create mode 100644 meta-openembedded/meta-oe/recipes-connectivity/zabbix/zabbix_4.2.8.bb (limited to 'meta-openembedded/meta-oe/recipes-connectivity') diff --git a/meta-openembedded/meta-oe/recipes-connectivity/ifplugd/ifplugd/Fix-build-with-musl.patch b/meta-openembedded/meta-oe/recipes-connectivity/ifplugd/ifplugd/Fix-build-with-musl.patch index 4bd40606b..35665bd3f 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/ifplugd/ifplugd/Fix-build-with-musl.patch +++ b/meta-openembedded/meta-oe/recipes-connectivity/ifplugd/ifplugd/Fix-build-with-musl.patch @@ -9,13 +9,14 @@ Signed-off-by: Fabio Berton src/ethtool-local.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -diff --git a/src/ethtool-local.h b/src/ethtool-local.h -index 200476b..0edc7a9 100644 --- a/src/ethtool-local.h +++ b/src/ethtool-local.h -@@ -22,9 +22,9 @@ +@@ -20,11 +20,11 @@ + * along with ifplugd; if not, write to the Free Software Foundation, + * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ - +- ++#include typedef unsigned long long u64; -typedef __uint32_t u32; -typedef __uint16_t u16; @@ -26,6 +27,3 @@ index 200476b..0edc7a9 100644 #include "ethtool-kernel.h" --- -2.20.1 - diff --git a/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd/0001-Makefile.am-Avoid-redirection-of-input-and-output-fi.patch b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd/0001-Makefile.am-Avoid-redirection-of-input-and-output-fi.patch new file mode 100644 index 000000000..93ef007f8 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd/0001-Makefile.am-Avoid-redirection-of-input-and-output-fi.patch @@ -0,0 +1,40 @@ +From f2a2b9f445ab1e31fbb27a74744e9a2ededfce17 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 4 Nov 2019 16:38:04 -0800 +Subject: [PATCH] Makefile.am: Avoid redirection of input and output files + +Ensure that directory is created before its written to + +This can cause a build race in a highly parallelised build where a directory is not yet created but +output file is being written using redirection e.g. + +rst2man.py --strict --no-raw --no-generator --no-datestamp < ../git/monitor/iwmon.rst > monitor/iwmon.1 +/bin/sh: monitor/iwmon.1: No such file or directory +make[1]: *** [Makefile:3544: monitor/iwmon.1] Error 1 + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + Makefile.am | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 823b7d02..1bd0005c 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -626,8 +626,9 @@ SED_PROCESS = $(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(SED) \ + < $< > $@ + + if RUN_RST2MAN +-RST2MAN_PROCESS = $(AM_V_GEN)$(RST2MAN) --strict --no-raw --no-generator \ +- --no-datestamp < $< > $@ ++RST2MAN_PROCESS = $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ ++ $(AM_V_GEN)$(RST2MAN) --strict --no-raw \ ++ --no-generator --no-datestamp $< $@ + else + RST2MAN_PROCESS = $(AM_V_GEN)test -f $@ || \ + { echo "Generated manual page $@ does not exist"; false; } +-- +2.24.0 + diff --git a/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_0.23.bb b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_0.23.bb deleted file mode 100644 index 20c6d04f7..000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_0.23.bb +++ /dev/null @@ -1,37 +0,0 @@ -DESCRIPTION = "Wireless daemon for Linux" -LICENSE = "LGPL-2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09" - -inherit autotools pkgconfig systemd python3native - -DEPENDS = "ell readline dbus python3-docutils-native" - -SRC_URI = "git://git.kernel.org/pub/scm/network/wireless/iwd.git" -SRCREV = "77f16ae26fc013477f6362a0c33f0e52e82863e0" -S = "${WORKDIR}/git" - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" -PACKAGECONFIG[wired] = "--enable-wired,--disable-wired" -PACKAGECONFIG[ofono] = "--enable-ofono,--disable-ofono" -PACKAGECONFIG[systemd] = "--with-systemd-unitdir=${systemd_system_unitdir},--disable-systemd-service,systemd" - -EXTRA_OECONF += "--enable-external-ell" - -do_configure_prepend () { - mkdir -p ${S}/build-aux -} - -do_install_append() { - mkdir --parents ${D}${docdir}/${BPN} - install -m644 ${S}/doc/*.txt ${D}${docdir}/${BPN} -} - -FILES_${PN} += "${datadir}/dbus-1 ${libdir}/modules-load.d" - -SYSTEMD_SERVICE_${PN} = "iwd.service ${@bb.utils.contains('PACKAGECONFIG', 'wired', 'ead.service', '', d)}" - -RRECOMMENDS_${PN} = "\ - kernel-module-pkcs7-message \ - kernel-module-pkcs8-key-parser \ - kernel-module-x509-key-parser \ -" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.0.bb new file mode 100644 index 000000000..d11e0d4ae --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.0.bb @@ -0,0 +1,39 @@ +DESCRIPTION = "Wireless daemon for Linux" +LICENSE = "LGPL-2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09" + +inherit autotools pkgconfig systemd python3native + +DEPENDS = "ell readline dbus python3-docutils-native" + +SRC_URI = "git://git.kernel.org/pub/scm/network/wireless/iwd.git \ + file://0001-Makefile.am-Avoid-redirection-of-input-and-output-fi.patch \ + " +SRCREV = "971e1d2038a203ad43bd2278a811a9e5ec8d52db" +S = "${WORKDIR}/git" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +PACKAGECONFIG[wired] = "--enable-wired,--disable-wired" +PACKAGECONFIG[ofono] = "--enable-ofono,--disable-ofono" +PACKAGECONFIG[systemd] = "--with-systemd-unitdir=${systemd_system_unitdir},--disable-systemd-service,systemd" + +EXTRA_OECONF += "--enable-external-ell" + +do_configure_prepend () { + mkdir -p ${S}/build-aux +} + +do_install_append() { + mkdir --parents ${D}${docdir}/${BPN} + install -m644 ${S}/doc/*.txt ${D}${docdir}/${BPN} +} + +FILES_${PN} += "${datadir}/dbus-1 ${libdir}/modules-load.d ${systemd_unitdir}/network/" + +SYSTEMD_SERVICE_${PN} = "iwd.service ${@bb.utils.contains('PACKAGECONFIG', 'wired', 'ead.service', '', d)}" + +RRECOMMENDS_${PN} = "\ + kernel-module-pkcs7-message \ + kernel-module-pkcs8-key-parser \ + kernel-module-x509-key-parser \ +" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libev/libev_4.27.bb b/meta-openembedded/meta-oe/recipes-connectivity/libev/libev_4.27.bb index b72b7af4f..be4536b9c 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libev/libev_4.27.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/libev/libev_4.27.bb @@ -17,3 +17,5 @@ do_install_append() { # still basic so drop it for now. rm ${D}${includedir}/event.h } + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/zabbix/zabbix_4.2.7.bb b/meta-openembedded/meta-oe/recipes-connectivity/zabbix/zabbix_4.2.7.bb deleted file mode 100644 index ed6c55bba..000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/zabbix/zabbix_4.2.7.bb +++ /dev/null @@ -1,79 +0,0 @@ -SUMMARY = "Open-source monitoring solution for your IT infrastructure" -DESCRIPTION = "\ -ZABBIX is software that monitors numerous parameters of a network and the \ -health and integrity of servers. ZABBIX uses a flexible notification \ -mechanism that allows users to configure e-mail based alerts for virtually \ -any event. This allows a fast reaction to server problems. ZABBIX offers \ -excellent reporting and data visualisation features based on the stored \ -data. This makes ZABBIX ideal for capacity planning. \ -\ -ZABBIX supports both polling and trapping. All ZABBIX reports and \ -statistics, as well as configuration parameters are accessed through a \ -web-based front end. A web-based front end ensures that the status of \ -your network and the health of your servers can be assessed from any \ -location. Properly configured, ZABBIX can play an important role in \ -monitoring IT infrastructure. This is equally true for small \ -organisations with a few servers and for large companies with a \ -multitude of servers." -HOMEPAGE = "http://www.zabbix.com/" -SECTION = "Applications/Internet" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=300e938ad303147fede2294ed78fe02e" -DEPENDS = "libevent libpcre openldap virtual/libiconv zlib" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -SRC_URI = "http://jaist.dl.sourceforge.net/project/zabbix/ZABBIX%20Latest%20Stable/${PV}/${BPN}-${PV}.tar.gz \ - file://0001-Fix-configure.ac.patch \ - file://zabbix-agent.service \ -" - -SRC_URI[md5sum] = "601d3c29322c720c72018950ed969d0a" -SRC_URI[sha256sum] = "9d9bdf1d858048d72811de04269a429aba257fac2e4b6e782d5a2b1d3a82f627" - -inherit autotools-brokensep linux-kernel-base pkgconfig systemd useradd - -SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "zabbix-agent.service" -SYSTEMD_AUTO_ENABLE = "enable" - -USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN} = "-r zabbix" -USERADD_PARAM_${PN} = "-r -g zabbix -d /var/lib/zabbix \ - -s /sbin/nologin -c \"Zabbix Monitoring System\" zabbix \ -" - -KERNEL_VERSION = "${@get_kernelversion_headers('${STAGING_KERNEL_DIR}')}" - -EXTRA_OECONF = " \ - --enable-dependency-tracking \ - --enable-agent \ - --enable-ipv6 \ - --with-net-snmp \ - --with-ldap=${STAGING_EXECPREFIXDIR} \ - --with-jabber \ - --with-unixodbc \ - --with-ssh2 \ - --with-sqlite3 \ - --with-zlib \ - --with-libpthread \ - --with-libevent \ - --with-libpcre \ -" -CFLAGS_append = " -lldap -llber -pthread" - -do_configure_prepend() { - export KERNEL_VERSION="${KERNEL_VERSION}" -} - -do_install_append() { - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/zabbix-agent.service ${D}${systemd_unitdir}/system/ - sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/zabbix-agent.service - fi -} - -FILES_${PN} += "${libdir}" - -RDEPENDS_${PN} = "logrotate" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/zabbix/zabbix_4.2.8.bb b/meta-openembedded/meta-oe/recipes-connectivity/zabbix/zabbix_4.2.8.bb new file mode 100644 index 000000000..489ab0b63 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/zabbix/zabbix_4.2.8.bb @@ -0,0 +1,79 @@ +SUMMARY = "Open-source monitoring solution for your IT infrastructure" +DESCRIPTION = "\ +ZABBIX is software that monitors numerous parameters of a network and the \ +health and integrity of servers. ZABBIX uses a flexible notification \ +mechanism that allows users to configure e-mail based alerts for virtually \ +any event. This allows a fast reaction to server problems. ZABBIX offers \ +excellent reporting and data visualisation features based on the stored \ +data. This makes ZABBIX ideal for capacity planning. \ +\ +ZABBIX supports both polling and trapping. All ZABBIX reports and \ +statistics, as well as configuration parameters are accessed through a \ +web-based front end. A web-based front end ensures that the status of \ +your network and the health of your servers can be assessed from any \ +location. Properly configured, ZABBIX can play an important role in \ +monitoring IT infrastructure. This is equally true for small \ +organisations with a few servers and for large companies with a \ +multitude of servers." +HOMEPAGE = "http://www.zabbix.com/" +SECTION = "Applications/Internet" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=300e938ad303147fede2294ed78fe02e" +DEPENDS = "libevent libpcre openldap virtual/libiconv zlib" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +SRC_URI = "http://jaist.dl.sourceforge.net/project/zabbix/ZABBIX%20Latest%20Stable/${PV}/${BPN}-${PV}.tar.gz \ + file://0001-Fix-configure.ac.patch \ + file://zabbix-agent.service \ +" + +SRC_URI[md5sum] = "9a816afd4f7984a841bed64a25ba523c" +SRC_URI[sha256sum] = "57dbc2a95a09581b5196d2abc86ee1aaf65f3c909d6b4bc53d260dc4dd69b9c6" + +inherit autotools-brokensep linux-kernel-base pkgconfig systemd useradd + +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE_${PN} = "zabbix-agent.service" +SYSTEMD_AUTO_ENABLE = "enable" + +USERADD_PACKAGES = "${PN}" +GROUPADD_PARAM_${PN} = "-r zabbix" +USERADD_PARAM_${PN} = "-r -g zabbix -d /var/lib/zabbix \ + -s /sbin/nologin -c \"Zabbix Monitoring System\" zabbix \ +" + +KERNEL_VERSION = "${@get_kernelversion_headers('${STAGING_KERNEL_DIR}')}" + +EXTRA_OECONF = " \ + --enable-dependency-tracking \ + --enable-agent \ + --enable-ipv6 \ + --with-net-snmp \ + --with-ldap=${STAGING_EXECPREFIXDIR} \ + --with-jabber \ + --with-unixodbc \ + --with-ssh2 \ + --with-sqlite3 \ + --with-zlib \ + --with-libpthread \ + --with-libevent \ + --with-libpcre \ +" +CFLAGS_append = " -lldap -llber -pthread" + +do_configure_prepend() { + export KERNEL_VERSION="${KERNEL_VERSION}" +} + +do_install_append() { + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/zabbix-agent.service ${D}${systemd_unitdir}/system/ + sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/zabbix-agent.service + fi +} + +FILES_${PN} += "${libdir}" + +RDEPENDS_${PN} = "logrotate" -- cgit v1.2.3