mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-04-02 02:49:12 +00:00
netdata: Upgrade from 1.47.3 to 1.47.5 release
* 0001-Add-check-for-64bit-builtin-atomics.patch applied upstream * removed not longer used systemd service file The service of the netdata is used in previous commit(s) * oelint_adv issues solved Changlog: https://github.com/netdata/netdata/blob/master/CHANGELOG.md#v1475-2024-10-24 Signed-off-by: Jan Vermaete <jan.vermaete@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
parent
6652b031d7
commit
c00b1fcc7c
@ -1,49 +0,0 @@
|
||||
From 555cfa9c4d5b1114d975be5208ab066c7924a171 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Tue, 17 Sep 2024 05:29:13 +0000
|
||||
Subject: [PATCH] Add check for 64bit builtin atomics
|
||||
|
||||
Compilers for some architectures e.g. RISCV32 do not have 64bit atomics
|
||||
therefore, its important to deduce that and use it to pass right flags to
|
||||
compiler to use them, e.g. h2o module
|
||||
|
||||
Fixes
|
||||
nection.c.o): in function `h2o_create_connection':
|
||||
| /usr/src/debug/netdata/1.47.1/src/web/server/h2o/libh2o/include/h2o.h:1917:(.text.create_conn+0x5e): undefined reference to `__sync_add_and_fetch_8'
|
||||
| collect2: error: ld returned 1 exit status
|
||||
|
||||
Upstream-Status: Submitted [https://github.com/netdata/netdata/pull/18565]
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
CMakeLists.txt | 11 +++++++++++
|
||||
1 file changed, 11 insertions(+)
|
||||
|
||||
Index: netdata-v1.47.3/CMakeLists.txt
|
||||
===================================================================
|
||||
--- netdata-v1.47.3.orig/CMakeLists.txt
|
||||
+++ netdata-v1.47.3/CMakeLists.txt
|
||||
@@ -448,6 +448,15 @@ int main() {
|
||||
}
|
||||
" HAVE_BUILTIN_ATOMICS)
|
||||
|
||||
+check_cxx_source_compiles("
|
||||
+#include <stdint.h>
|
||||
+int main(void) {
|
||||
+ uint64_t a;
|
||||
+ __sync_add_and_fetch(&a, 1);
|
||||
+ return 0;
|
||||
+}
|
||||
+" ARCH_SUPPORTS_64BIT_ATOMICS)
|
||||
+
|
||||
check_c_source_compiles("
|
||||
void my_printf(char const *s, ...) __attribute__((format(gnu_printf, 1, 2)));
|
||||
int main() { return 0; }
|
||||
@@ -1528,6 +1537,8 @@ if(ENABLE_H2O)
|
||||
|
||||
target_compile_options(h2o PUBLIC -DH2O_USE_LIBUV=0)
|
||||
target_link_libraries(h2o PRIVATE PkgConfig::TLS)
|
||||
+ target_compile_definitions(h2o PRIVATE
|
||||
+ "$<$<NOT:$<BOOL:${ARCH_SUPPORTS_64BIT_ATOMICS}>>:H2O_NO_64BIT_ATOMICS>")
|
||||
endif()
|
||||
|
||||
#
|
||||
@ -1,15 +0,0 @@
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
[Unit]
|
||||
Description=Real time performance monitoring
|
||||
RequiresMountsFor=/var
|
||||
After=network.target
|
||||
|
||||
[Service]
|
||||
Type=simple
|
||||
ExecStartPre=/bin/mkdir -p /var/log/netdata
|
||||
ExecStartPre=/bin/chown -R netdata:netdata /var/log/netdata
|
||||
ExecStart=/usr/sbin/netdata -D -u netdata
|
||||
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
@ -5,22 +5,28 @@ HOMEPAGE = "https://github.com/netdata/netdata/"
|
||||
LICENSE = "GPL-3.0-only"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=fc9b848046ef54b5eaee6071947abd24"
|
||||
|
||||
DEPENDS += "json-c libuv libyaml util-linux zlib lz4"
|
||||
DEPENDS += "\
|
||||
json-c \
|
||||
libuv \
|
||||
libyaml \
|
||||
lz4 \
|
||||
util-linux \
|
||||
zlib \
|
||||
"
|
||||
|
||||
SRC_URI = " \
|
||||
SRC_URI = "\
|
||||
https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BPN}-v${PV}.tar.gz \
|
||||
file://0001-Add-check-for-64bit-builtin-atomics.patch \
|
||||
file://0002-Do-not-hardcode-systemd-unit-directories.patch \
|
||||
file://netdata.conf \
|
||||
file://netdata-volatiles.conf \
|
||||
${@bb.utils.contains('PACKAGECONFIG', 'go', 'file://go.d.conf', '', d)} \
|
||||
"
|
||||
SRC_URI[sha256sum] = "cf906c304ac49ca335bef8f085664efe4c567d47877a91e0744a7942ba351053"
|
||||
SRC_URI[sha256sum] = "8073eee2392f92daa1f8bb5cf13fb988b8c3b52ff9574b50706ff69bdbdb51ce"
|
||||
|
||||
UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/tags"
|
||||
UPSTREAM_CHECK_REGEX = "${BPN}/releases/tag/v(?P<pver>\d+(?:\.\d+)*)"
|
||||
UPSTREAM_CHECK_REGEX = "${BPN}/releases/tag/v(?P<pver>(?!1\.99)\d+(?:\.\d+)*)"
|
||||
|
||||
S = "${WORKDIR}/${BPN}-v${PV}"
|
||||
S = "${UNPACKDIR}/${BPN}-v${PV}"
|
||||
|
||||
# Stop sending anonymous statistics to Google Analytics
|
||||
NETDATA_ANONYMOUS ??= "enabled"
|
||||
@ -120,7 +126,7 @@ do_install:append() {
|
||||
chown -R netdata:netdata ${D}${datadir}/netdata/web
|
||||
}
|
||||
|
||||
FILES:${PN} += " \
|
||||
FILES:${PN} += "\
|
||||
${localstatedir}/cache/netdata/ \
|
||||
${localstatedir}/lib/netdata/ \
|
||||
${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_unitdir}/journald@netdata.conf.d', '', d)} \
|
||||
Loading…
x
Reference in New Issue
Block a user