summaryrefslogtreecommitdiff
path: root/meta-openembedded/meta-webserver
diff options
context:
space:
mode:
authorAndrew Geissler <geissonator@yahoo.com>2020-06-27 08:16:32 +0300
committerAndrew Geissler <geissonator@yahoo.com>2020-06-27 08:21:12 +0300
commitc87764fefff10735006a31fab72d76c243a3eb40 (patch)
treea1536c529ff12a4cd591ef528e4857d4f2fe9572 /meta-openembedded/meta-webserver
parent064f75b35a14f3bd6e99ce65a7f7609b973036d5 (diff)
downloadopenbmc-c87764fefff10735006a31fab72d76c243a3eb40.tar.xz
meta-openembedded: subtree update:fe77eaab8f..629696b64b
Alex Kiernan (4): zstd: Upgrade 1.4.4 -> 1.4.5 libxmlb: Add recipe libjcat: Add recipe gcab: Add recipe Andreas Müller (14): libdvdcss: upgrade 1.3.0 -> 1.4.2 vlc: upgrade 3.0.10 -> 3.0.11 netdata: upgrade 1.17.0 -> 1.22.1 libsass: upgrade 3.6.3 -> 3.6.4 / rename recipe gnome-desktop3: upgrade 3.36.2 -> 3.36.3.1 evince: upgrade 3.36.3 -> 3.36.5 gnome-control-center: upgrade 3.36.2 -> 3.36.3 redis: upgrade 5.0.9 -> 6.0.4 squid: upgrade 4.9 -> 4.12 libgit2: upgrade 1.0.0 -> 1.0.1 openh264: upgrade 2.1.0 -> 2.1.1 tcpreplay: upgrade 4.3.2 -> 4.3.3 asio: upgrade 1.12.2 -> 1.16.1 Revert "packagegroup-xfce-base: add RDEPEND packagegroup-core-x11" Anuj Mittal (2): opencl: move headers and loader recipe to common directory opencl-clhpp: add recipe Armin Kuster (9): python3-configobj: Add package python3-croniter: add package python3-flask-versioned: Add package python3-huey: Add package python3-sqlsoup: add package python3-smpplib: add package python3-pyrad: add package libuv: pkg now in core, remove ntp: update 4.2.8p15 Christian Eggers (1): linuxptp: Fix segmentation fault on 32 bit platforms with 64 bit time_t Konrad Weihmann (1): libtalloc: fix upstream url Leon Anavi (82): python3-packaging: Consolidate in a single file python3-packaging: Upgrade 20.3 -> 20.4 python3-parse-type: Consolidate in a single file python3-parse-type: Upgrade 0.4.2 -> 0.5.2 python3-javaobj-py3: Consolidate in a single file python3-jsonpointer: Consolidate in a single file python3-kconfiglib: Consolidate in a single file python3-twisted: Consolidate in a single file python3-twisted: Upgrade 19.10.0 -> 20.3.0 protobuf: Upgrade 3.11.4 -> 3.12.3 xscreensaver: Upgrade 5.39 -> 5.44 python3-iso8601: Consolidate in a single file python3-isodate: Consolidate in a single file python3-incremental: Consolidate in a single file python3-itsdangerous: Consolidate in a single file python3-importlib-metadata: Consolidate in a single file python3-importlib-metadata: Upgrade 1.5.2 -> 1.6.1 python3-can: Upgrade 3.3.2 -> 3.3.3 python3-psutil: Consolidate in a single file python3-protobuf: Consolidate in a single file python3-protobuf: Upgrade 3.11.3 -> 3.12.2 python-kconfiglib.inc: Remove sip3: Consolidate in a single file sip3: Upgrade 4.19.19 -> 4.19.23 python3-pexpect: Consolidate in a single file python3-periphery: Consolidate in a single file python3-periphery: Upgrade 2.0.1 -> 2.1.0 python3-pocketsphinx: Inherit features_check python3-parse: Consolidate in a single file python3-passlib: Consolidate in a single file python3-pathlib2: Consolidate in a single file python3-pretend: Consolidate in a single file python3-prompt-toolkit: Consolidate in a single file python3-prompt-toolkit: Upgrade 2.0.10 -> 3.0.5 python3-ptyprocess: Consolidate in a single file python3-booleanpy: Upgrade 3.7 to 3.8 python3-toml: Upgrade 0.10.0 -> 0.10.1 python3-msgpack: Upgrade 0.6.2 -> 1.0.0 lirc: Add python3 to the run-time dependencies python3-sqlalchemy: Upgrade 1.3.12 -> 1.3.17 python3-sh: Upgrade 1.12.14 -> 1.13.1 python3-certifi: Upgrade 2019.11.28 -> 2020.6.20 python3-setuptools-scm: Upgrade 3.5.0 -> 4.1.2 python3-more-itertools: Upgrade 8.3.0 -> 8.4.0 python3-configparser: Upgrade 4.0.2 -> 5.0.0 python3-pytest-timeout: Upgrade 1.3.4 -> 1.4.1 python3-semver: Upgrade 2.8.1 -> 2.10.2 python3-spidev: Upgrade 3.4 -> 3.5 python3-pint: Upgrade 0.12 -> 0.13 python3-xxhash: Upgrade 1.4.3 -> 1.4.4 python3-networkx: Consolidate in a single file python3-netifaces: Consolidate in a single file python3-netaddr: Consolidate in a single file python3-netaddr: Upgrade 0.7.19 -> 0.7.20 python3-ndg-httpsclient: Consolidate in a single file python3-lazy-object-proxy: Consolidate in a single file python3-lazy-object-proxy: Upgrade 1.4.3 -> 1.5.0 python3-license-expression: Consolidate in a single file python3-license-expression: Upgrade 1.0 -> 1.2 python3-wcwidth: Upgrade 0.2.4 -> 0.2.5 python3-ordered-set: Upgrade 3.1.1 -> 4.0.2 python3-cheetah: Upgrade 3.2.4 -> 3.2.5 python3-cmd2: Upgrade 0.9.23 -> 1.1.0 python3-pyrsistent: Upgrade 0.15.7 -> 0.16.0 python3-requests-file: Upgrade 1.4.3 -> 1.5.1 python3-msk: Upgrade 0.3.13 -> 0.3.15 python3-pyperf: Upgrade 1.7.1 -> 2.0.0 python3-padatious: Upgrade 0.4.7 -> 0.4.8 python3-croniter: Upgrade 0.3.33 -> 0.3.34 python3-lrparsing: Consolidate in a single file python3-pytun: Consolidate in a single file python3-jsonpatch: Upgrade 1.25 -> 1.26 python3-socketio: Upgrade 4.5.1 -> 4.6.0 python3-twine: Upgrade 3.1.1 -> 3.2.0 python3-pyexpect: Upgrade 1.0.19 -> 1.0.20 python3-pyjks: Upgrade 19.0.0 -> 20.0.0 python3-ruamel-yaml: Upgrade 0.16.5 0> 0.16.10 python3-pandas: Upgrade 1.0.3 -> 1.0.5 python3-matplotlib: Upgrade 3.2.1 -> 3.2.2 python3-coverage: Upgrade 5.0.2 -> 5.1 python3-coloredlogs: Upgrade 10.0 -> 14.0 python3-astroid: Upgrade 2.3.3 -> 2.4.2 Liwei Song (1): pm-graph: add flags support for RT kernel Madhavan Krishnan (1): libcamera: Bumped to latest source revision Martin Jansa (1): ace: fix installation paths when usrmerge is used Mingli Yu (1): opencv: make ts module external Ovidiu Panait (1): freediameter: upgrade 1.3.2 -> 1.4.0 Paul Eggleton (1): protobuf-c: disable parallelism to avoid race condition Peace Lee (1): Update commit for version 3.9.7 Pierre-Jean Texier (3): rsnapshot: upgrade 1.4.2 -> 1.4.3 libzip: upgrade 1.7.0 -> 1.7.1 fuse3: upgrade 3.9.1 -> 3.9.2 Ryan Rowe (3): python3-typeguard: Upgrade 2.7.1 -> 2.9.1 add python3-dynamic-dispatch add python3-argexec Sakib Sajal (1): python3-requests-toolbelt: add recipe for v0.9.1 Trevor Gamblin (1): python3-django: upgrade 2.2.7 -> 2.2.13 Wang Mingyu (4): openipmi: upgrade 2.0.28 -> 2.0.29 twm: upgrade 1.0.10 -> 1.0.11 python3-wtforms: upgrade 2.2.1 -> 2.3.1 python3-py: upgrade 1.8.1 -> 1.8.2 Zang Ruochen (6): python3-geojson: Enable ptest python3-intervals: Enable ptest python3-ipy: Enable ptest python3-iso3166: Enable ptest python-html2text: Enable ptest python3-gunicorn: Enable ptest Zheng Ruoqin (3): python3-cachetools: Enable ptest python3-dnspython: Enable ptest python3-dominate: Enable ptest lumag (1): lmsensors: do not depend on lmsensors-isatools on non-x86 Signed-off-by: Andrew Geissler <geissonator@yahoo.com> Change-Id: I66b8b206b1f74dab49ef7c266e145127ba27869b
Diffstat (limited to 'meta-openembedded/meta-webserver')
-rw-r--r--meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/0001-Correct-timeout-issue.patch42
-rw-r--r--meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/0002-Makefiles-does-not-build-contrib-dir.patch24
-rw-r--r--meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_git.bb15
3 files changed, 4 insertions, 77 deletions
diff --git a/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/0001-Correct-timeout-issue.patch b/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/0001-Correct-timeout-issue.patch
deleted file mode 100644
index c4be8270c..000000000
--- a/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/0001-Correct-timeout-issue.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From ccaf4225239c3092a51cf44f2ab0a2141b8a5fa6 Mon Sep 17 00:00:00 2001
-From: Luca Palano <github@lpzone.it>
-Date: Wed, 5 Dec 2018 10:36:52 +0100
-Subject: [PATCH 1/2] Correct of timeout issue
-
-The timeout issue has been disabled
-
-Signed-off-by: Luca Palano <github@lpzone.it>
----
- collectors/charts.d.plugin/charts.d.plugin.in | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/collectors/charts.d.plugin/charts.d.plugin.in b/collectors/charts.d.plugin/charts.d.plugin.in
-index 0df6c30c..63ea4506 100755
---- a/collectors/charts.d.plugin/charts.d.plugin.in
-+++ b/collectors/charts.d.plugin/charts.d.plugin.in
-@@ -156,7 +156,7 @@ restart_timeout=$((3600 * 4))
- dryrunner=0
-
- # check for timeout command
--check_for_timeout=1
-+check_for_timeout=0
-
- # the default enable/disable value for all charts
- enable_all_charts="yes"
-@@ -251,9 +251,10 @@ time_divisor=$((time_divisor))
- # timeout command we use, providing a function that
- # can emulate the timeout command we need:
- # > timeout SECONDS command ...
--if [ $check_for_timeout -eq 1 ]; then
-- require_cmd timeout || exit 1
--fi
-+#if [ $check_for_timeout -eq 1 ]
-+# then
-+# require_cmd timeout || exit 1
-+#fi
-
- # -----------------------------------------------------------------------------
- # internal checks
---
-2.20.1 (Apple Git-117)
-
diff --git a/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/0002-Makefiles-does-not-build-contrib-dir.patch b/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/0002-Makefiles-does-not-build-contrib-dir.patch
deleted file mode 100644
index f0887fed0..000000000
--- a/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/0002-Makefiles-does-not-build-contrib-dir.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 95e1da77de80e38068bb2739faeaad49105700cf Mon Sep 17 00:00:00 2001
-From: Luca Palano <github@lpzone.it>
-Date: Mon, 15 Jul 2019 10:16:32 +0200
-Subject: [PATCH 2/2] Makefiles does not build contrib
-
-Signed-off-by: Luca Palano <github@lpzone.it>
----
- Makefile.am | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index bc928bba..ba9edc6b 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -54,7 +54,6 @@ dist_noinst_DATA= \
- CHANGELOG.md \
- cppcheck.sh \
- configs.signatures \
-- contrib \
- netdata.cppcheck \
- netdata.spec \
- package.json \
---
-2.20.1 (Apple Git-117)
diff --git a/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_git.bb b/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_git.bb
index d6a5ce066..ee4a7c1e3 100644
--- a/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_git.bb
+++ b/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_git.bb
@@ -3,15 +3,9 @@ SUMMARY = "Real-time performance monitoring"
LICENSE = "GPLv3"
LIC_FILES_CHKSUM = "file://LICENSE;md5=fc9b848046ef54b5eaee6071947abd24"
-SRC_URI = "git://github.com/firehol/netdata.git;protocol=https \
- file://0002-Makefiles-does-not-build-contrib-dir.patch \
-"
-SRCREV = "588ce5a7b18999dfa66698cd3a2f005f7a3c31cf"
-PV = "1.17.0"
-
-# patch to disable timeout because timeout are not available with actual version
-# of core-utils
-SRC_URI += "file://0001-Correct-timeout-issue.patch"
+SRC_URI = "git://github.com/firehol/netdata.git;protocol=https"
+SRCREV = "1be9200ba8e11dc81a2101d85a2725137d43f766"
+PV = "1.22.1"
# default netdata.conf for netdata configuration
SRC_URI += "file://netdata.conf"
@@ -21,7 +15,7 @@ SRC_URI += "file://netdata.service"
S = "${WORKDIR}/git"
-DEPENDS += "zlib util-linux"
+DEPENDS += "zlib util-linux libuv"
inherit pkgconfig autotools-brokensep useradd systemd
@@ -58,5 +52,4 @@ do_install_append() {
sed -i -e 's,@@datadir,${datadir},g' ${D}${sysconfdir}/netdata/netdata.conf
}
-FILES_${PN}-dbg += "${libexecdir}/netdata/plugins.d/.debug"
RDEPENDS_${PN} = "bash zlib"