diff options
-rw-r--r-- | meta-webserver/recipes-webadmin/netdata/netdata/0001-Stream-Compression-Bug-fix-12043-lz4.h-compilation-e.patch | 26 | ||||
-rw-r--r-- | meta-webserver/recipes-webadmin/netdata/netdata_1.33.1.bb (renamed from meta-webserver/recipes-webadmin/netdata/netdata_1.33.0.bb) | 12 |
2 files changed, 5 insertions, 33 deletions
diff --git a/meta-webserver/recipes-webadmin/netdata/netdata/0001-Stream-Compression-Bug-fix-12043-lz4.h-compilation-e.patch b/meta-webserver/recipes-webadmin/netdata/netdata/0001-Stream-Compression-Bug-fix-12043-lz4.h-compilation-e.patch deleted file mode 100644 index c699f956d6..0000000000 --- a/meta-webserver/recipes-webadmin/netdata/netdata/0001-Stream-Compression-Bug-fix-12043-lz4.h-compilation-e.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 85e59be1c656b946a1fcd19404cb0df6095e7dfb Mon Sep 17 00:00:00 2001 -From: odynik <odynik.ee@gmail.com> -Date: Fri, 28 Jan 2022 12:15:41 +0200 -Subject: [PATCH 1/4] [Stream Compression] - Bug fix #12043 - lz4.h compilation - error - compile from source (#12049) - ---- - streaming/compression.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/streaming/compression.c b/streaming/compression.c -index 917f05bd6..93810aaed 100644 ---- a/streaming/compression.c -+++ b/streaming/compression.c -@@ -1,7 +1,7 @@ - #include "rrdpush.h" --#include "lz4.h" - - #ifdef ENABLE_COMPRESSION -+#include "lz4.h" - - #define LZ4_MAX_MSG_SIZE 0x4000 - #define LZ4_STREAM_BUFFER_SIZE (0x10000 + LZ4_MAX_MSG_SIZE) --- -2.25.1 - diff --git a/meta-webserver/recipes-webadmin/netdata/netdata_1.33.0.bb b/meta-webserver/recipes-webadmin/netdata/netdata_1.33.1.bb index 8b6432cec1..2004670f62 100644 --- a/meta-webserver/recipes-webadmin/netdata/netdata_1.33.0.bb +++ b/meta-webserver/recipes-webadmin/netdata/netdata_1.33.1.bb @@ -5,13 +5,10 @@ DESCRIPTION = "Netdata is high-fidelity infrastructure monitoring and troublesho LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://LICENSE;md5=fc9b848046ef54b5eaee6071947abd24" -DEPENDS += "libuv openssl util-linux zlib" +DEPENDS += "libuv util-linux zlib" -SRC_URI = "\ - https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BPN}-v${PV}.tar.gz \ - file://0001-Stream-Compression-Bug-fix-12043-lz4.h-compilation-e.patch \ -" -SRC_URI[sha256sum] = "d167d4b2d8529119fa4047ae40d22833dac9d360a6ed07c314ba313807c027eb" +SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BPN}-v${PV}.tar.gz" +SRC_URI[sha256sum] = "20ba8695d87187787b27128ac3aab9b09aa29ca6b508c48542e0f7d50ec9322b" # default netdata.conf for netdata configuration SRC_URI += "file://netdata.conf" @@ -43,8 +40,9 @@ SYSTEMD_AUTO_ENABLE:${PN} = "enable" USERADD_PACKAGES = "${PN}" USERADD_PARAM:${PN} = "--system --no-create-home --home-dir ${localstatedir}/run/netdata --user-group netdata" -PACKAGECONFIG ??= "" +PACKAGECONFIG ??= "https" PACKAGECONFIG[compression] = "--enable-compression, --disable-compression, lz4" +PACKAGECONFIG[https] = "--enable-https, --disable-https, openssl" # ebpf doesn't compile (or detect) the cross compilation well EXTRA_OECONF += "--disable-ebpf" |