From be63afc4ecdb29895acf87cb093764db03d55c2d Mon Sep 17 00:00:00 2001 From: Jan Vermaete Date: Thu, 9 Jun 2022 22:41:41 +0200 Subject: [PATCH] netdata: version bump 1.34.1 -> 1.35.0 Do note that some collectors (a.k.a. plugins) moved from Python to Go. And Go is not (yet) part of this recipe. More info at https://github.com/netdata/netdata/releases/tag/v1.35.0 under 'Deprecated in this release' The patch should be handled by recoding upstream. Signed-off-by: Jan Vermaete Signed-off-by: Khem Raj --- ...plicit-typecast-to-enum-rrdset_flags.patch | 39 ------------------- .../{netdata_1.34.1.bb => netdata_1.35.0.bb} | 3 +- 2 files changed, 1 insertion(+), 41 deletions(-) delete mode 100644 meta-webserver/recipes-webadmin/netdata/netdata/0001-Use-explicit-typecast-to-enum-rrdset_flags.patch rename meta-webserver/recipes-webadmin/netdata/{netdata_1.34.1.bb => netdata_1.35.0.bb} (94%) diff --git a/meta-webserver/recipes-webadmin/netdata/netdata/0001-Use-explicit-typecast-to-enum-rrdset_flags.patch b/meta-webserver/recipes-webadmin/netdata/netdata/0001-Use-explicit-typecast-to-enum-rrdset_flags.patch deleted file mode 100644 index e3c7a7cd2b..0000000000 --- a/meta-webserver/recipes-webadmin/netdata/netdata/0001-Use-explicit-typecast-to-enum-rrdset_flags.patch +++ /dev/null @@ -1,39 +0,0 @@ -From e8ec0a0f3a353a8167687a8fdb26773e45927aac Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 24 Apr 2022 09:49:12 -0700 -Subject: [PATCH] Use explicit typecast to enum rrdset_flags - -specifications say -An enumerator can be promoted to an integer value. However, -converting an integer to an enumerator requires an explicit -cast, and the results are not defined. - -Therefore The bitwise OR operation you are performing results -in an int, which you then attempt to assign to a variable of -type rrdset_flags without a cast. - -Fixes -| ml/Host.cc:167:9: error: assigning to 'RRDSET_FLAGS' (aka 'rrdset_flags') from incompatible type 'int' -| rrdset_flag_set(RS, RRDSET_FLAG_ANOMALY_DETECTION); -| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Upstream-Status: Submitted [https://github.com/netdata/netdata/pull/12750] - -Signed-off-by: Khem Raj ---- - database/rrd.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/database/rrd.h -+++ b/database/rrd.h -@@ -489,8 +489,8 @@ typedef enum rrdset_flags { - #define rrdset_flag_clear(st, flag) __atomic_and_fetch(&((st)->flags), ~flag, __ATOMIC_SEQ_CST) - #else - #define rrdset_flag_check(st, flag) ((st)->flags & (flag)) --#define rrdset_flag_set(st, flag) (st)->flags |= (flag) --#define rrdset_flag_clear(st, flag) (st)->flags &= ~(flag) -+#define rrdset_flag_set(st, flag) (st)->flags = (RRDSET_FLAGS)((st)->flags | flag) -+#define rrdset_flag_clear(st, flag) (st)->flags = (RRDSET_FLAGS)((st)->flags & ~(flag)) - #endif - #define rrdset_flag_check_noatomic(st, flag) ((st)->flags & (flag)) - diff --git a/meta-webserver/recipes-webadmin/netdata/netdata_1.34.1.bb b/meta-webserver/recipes-webadmin/netdata/netdata_1.35.0.bb similarity index 94% rename from meta-webserver/recipes-webadmin/netdata/netdata_1.34.1.bb rename to meta-webserver/recipes-webadmin/netdata/netdata_1.35.0.bb index b777d20897..26dc62d297 100644 --- a/meta-webserver/recipes-webadmin/netdata/netdata_1.34.1.bb +++ b/meta-webserver/recipes-webadmin/netdata/netdata_1.35.0.bb @@ -8,9 +8,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=fc9b848046ef54b5eaee6071947abd24" DEPENDS += "libuv util-linux zlib" SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BPN}-v${PV}.tar.gz \ - file://0001-Use-explicit-typecast-to-enum-rrdset_flags.patch \ " -SRC_URI[sha256sum] = "8ea0786df0e952209c14efeb02e25339a0769aa3edc029e12816b8ead24a82d7" +SRC_URI[sha256sum] = "7981103c4ddd452de3a4565fb6c304454dc4c9adcc1954d716102f14df8ad4bb" # default netdata.conf for netdata configuration SRC_URI += "file://netdata.conf"