diff options
Diffstat (limited to 'meta-openembedded/meta-webserver/recipes-webadmin')
10 files changed, 128 insertions, 115 deletions
diff --git a/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/0001-cmake-Add-check-for-64bit-builtin-atomics.patch b/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/0001-cmake-Add-check-for-64bit-builtin-atomics.patch new file mode 100644 index 0000000000..d8ad69ceca --- /dev/null +++ b/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/0001-cmake-Add-check-for-64bit-builtin-atomics.patch @@ -0,0 +1,51 @@ +From 1e8fbb6da4e5ee44fe24c078aae1930d759f0ba3 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] cmake: 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 | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +Index: netdata-v1.47.1/CMakeLists.txt +=================================================================== +--- netdata-v1.47.1.orig/CMakeLists.txt ++++ netdata-v1.47.1/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; } +@@ -523,6 +532,10 @@ if(OS_FREEBSD OR OS_MACOS) + set(HAVE_BUILTIN_ATOMICS True) + endif() + ++if (ENABLE_H2O AND NOT ARCH_SUPPORTS_64BIT_ATOMICS) ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DH2O_NO_64BIT_ATOMICS") ++endif (NOT ARCH_SUPPORTS_64BIT_ATOMICS) ++ + # openssl/crypto + set(ENABLE_OPENSSL True) + pkg_check_modules(TLS IMPORTED_TARGET openssl) diff --git a/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/netdata-volatiles.conf b/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/netdata-volatiles.conf new file mode 100644 index 0000000000..f342542077 --- /dev/null +++ b/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/netdata-volatiles.conf @@ -0,0 +1,5 @@ +d /run/netdata 0755 netdata netdata - +d /var/cache/netdata 0755 netdata netdata - +d /var/lib/netdata/cloud.d 0755 netdata netdata - +d /var/lib/netdata/registry 0755 netdata netdata - +d /var/log/netdata 0755 netdata netdata - diff --git a/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_1.44.3.bb b/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_1.47.1.bb index b06a5df314..5b38d401cd 100644 --- a/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_1.44.3.bb +++ b/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_1.47.1.bb @@ -5,15 +5,16 @@ 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 " +DEPENDS += "json-c libuv libyaml util-linux zlib lz4" SRC_URI = "\ https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BPN}-v${PV}.tar.gz \ + file://0001-cmake-Add-check-for-64bit-builtin-atomics.patch \ file://netdata.conf \ file://netdata.service \ + file://netdata-volatiles.conf \ " - -SRC_URI[sha256sum] = "50df30a9aaf60d550eb8e607230d982827e04194f7df3eba0e83ff7919270ad2" +SRC_URI[sha256sum] = "fb970a4b571ffd542b7d24220ef806a4c1b56c535e0f549a9978860a9f1dcc9c" UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/tags" UPSTREAM_CHECK_REGEX = "${BPN}/releases/tag/v(?P<pver>\d+(?:\.\d+)*)" @@ -23,7 +24,9 @@ S = "${WORKDIR}/${BPN}-v${PV}" # Stop sending anonymous statistics to Google Analytics NETDATA_ANONYMOUS ??= "enabled" -inherit pkgconfig autotools-brokensep useradd systemd +inherit pkgconfig cmake useradd systemd + +TARGET_CC_ARCH:append:libc-musl = " -D_LARGEFILE64_SOURCE" LIBS:toolchain-clang:x86 = "-latomic" LIBS:riscv64 = "-latomic" @@ -40,23 +43,32 @@ SYSTEMD_AUTO_ENABLE:${PN} = "enable" USERADD_PACKAGES = "${PN}" USERADD_PARAM:${PN} = "--system --no-create-home --home-dir ${localstatedir}/run/netdata --user-group netdata" -PACKAGECONFIG ??= "openssl" -PACKAGECONFIG[cloud] = "--enable-cloud, --disable-cloud," -PACKAGECONFIG[lz4] = "--enable-lz4, --disable-lz4, lz4" -PACKAGECONFIG[openssl] = "--enable-openssl, --disable-openssl, openssl" +PACKAGECONFIG ??= "openssl freeipmi ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +PACKAGECONFIG[brotli] = ",,brotli" +PACKAGECONFIG[cloud] = "-DENABLE_CLOUD=ON,-DENABLE_CLOUD=OFF," +PACKAGECONFIG[openssl] = "-DENABLE_OPENSSL=ON,-DENABLE_OPENSSL=OFF,openssl" +PACKAGECONFIG[freeipmi] = "-DENABLE_PLUGIN_FREEIPMI=ON,-DENABLE_PLUGIN_FREEIPMI=OFF,freeipmi" +PACKAGECONFIG[nfacct] = "-DENABLE_PLUGIN_NFACCT=ON,-DENABLE_PLUGIN_NFACCT=OFF,libmnl" +# needs meta-virtualization +PACKAGECONFIG[xenstat] = "-DENABLE_PLUGIN_XENSTAT=ON,-DENABLE_PLUGIN_XENSTAT=OFF,xen-tools" +PACKAGECONFIG[cups] = "-DENABLE_PLUGIN_CUPS=ON,-DENABLE_PLUGIN_CUPS=OFF,cups" +PACKAGECONFIG[systemd] = "-DENABLE_PLUGIN_SYSTEMD_JOURNAL=ON,-DENABLE_PLUGIN_SYSTEMD_JOURNAL=OFF,systemd" # ebpf doesn't compile (or detect) the cross compilation well -EXTRA_OECONF += "--disable-ebpf" +EXTRA_OECMAKE += "-DENABLE_PLUGIN_EBPF=OFF -DENABLE_PLUGIN_GO=OFF \ + -DENABLE_ACLK=OFF -DENABLE_EXPORTER_PROMETHEUS_REMOTE_WRITE=OFF -DCMAKE_INSTALL_PREFIX='${base_prefix}'" do_install:append() { #set S UID for plugins chmod 4755 ${D}${libexecdir}/netdata/plugins.d/apps.plugin + rm -rf ${D}/${localstatedir}/ if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then # Install systemd unit files install -d ${D}${systemd_unitdir}/system install -m 0644 ${UNPACKDIR}/netdata.service ${D}${systemd_unitdir}/system sed -i -e 's,@@datadir,${datadir_native},g' ${D}${systemd_unitdir}/system/netdata.service + install -Dm 0644 ${UNPACKDIR}/netdata-volatiles.conf ${D}${sysconfdir}/tmpfiles.d/netdata.conf fi # Install default netdata.conf diff --git a/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/disable-version-check.patch b/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/disable-version-check.patch index 1ca26ca0dd..46b1f7c7b8 100644 --- a/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/disable-version-check.patch +++ b/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/disable-version-check.patch @@ -7,58 +7,44 @@ Upstream-Status: Inappropriate Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> -Index: webmin-1.850/webmin/webmin-lib.pl -=================================================================== ---- webmin-1.850.orig/webmin/webmin-lib.pl -+++ webmin-1.850/webmin/webmin-lib.pl -@@ -1112,28 +1112,28 @@ my %miniserv; +--- a/webmin/webmin-lib.pl ++++ b/webmin/webmin-lib.pl +@@ -1170,38 +1170,6 @@ my %miniserv; + &get_miniserv_config(\%miniserv); &load_theme_library(); # So that UI functions work - # Need OS upgrade --my %realos = &detect_operating_system(undef, 1); --if (($realos{'os_version'} ne $gconfig{'os_version'} || -- $realos{'os_type'} ne $gconfig{'os_type'}) && -- $realos{'os_version'} && $realos{'os_type'} && -- &foreign_available("webmin")) { -- my ($realminor) = split(/\./, $realos{'os_version'}); -- my ($minor) = split(/\./, $gconfig{'os_version'}); -- if ($realos{'os_type'} eq $gconfig{'os_type'} && -- $realminor == $minor) { -- # Only the minor version number changed - no need to apply -- &apply_new_os_version(\%realos); +-# Need OS upgrade, but only once per day or if the system was rebooted +-my $now = time(); +-my $uptime = &get_system_uptime(); +-if (&foreign_available("webmin")) { +- my %realos; +- my @st = stat($realos_cache_file); +- if (!@st || $now - $st[9] > 24*60*60 || +- $uptime && $now - $st[9] > $uptime) { +- %realos = &detect_operating_system(undef, 1); +- &write_file($realos_cache_file, \%realos); - } - else { -- # Large enough change to tell the user -- push(@notifs, -- &ui_form_start("$gconfig{'webprefix'}/webmin/fix_os.cgi"). -- &text('os_incorrect', $realos{'real_os_type'}, -- $realos{'real_os_version'})."<p>\n". +- &read_file($realos_cache_file, \%realos); +- } +- if (($realos{'os_version'} ne $gconfig{'os_version'} || +- $realos{'real_os_version'} ne $gconfig{'real_os_version'} || +- $realos{'os_type'} ne $gconfig{'os_type'}) && +- $realos{'os_version'} && $realos{'os_type'} && +- &foreign_available("webmin")) { +- # Tell the user that OS version was updated +- push(@notifs, +- &ui_form_start("@{[&get_webprefix()]}/webmin/fix_os.cgi"). +- &text('os_incorrect', +- $realos{'real_os_type'}, +- $realos{'real_os_version'}). +- &show_os_release_notes($realos{'real_os_version'}). +- "<p>\n". - &ui_form_end([ [ undef, $text{'os_fix'} ] ]) - ); - } - } -+#my %realos = &detect_operating_system(undef, 1); -+#if (($realos{'os_version'} ne $gconfig{'os_version'} || -+# $realos{'os_type'} ne $gconfig{'os_type'}) && -+# $realos{'os_version'} && $realos{'os_type'} && -+# &foreign_available("webmin")) { -+# my ($realminor) = split(/\./, $realos{'os_version'}); -+# my ($minor) = split(/\./, $gconfig{'os_version'}); -+# if ($realos{'os_type'} eq $gconfig{'os_type'} && -+# $realminor == $minor) { -+# # Only the minor version number changed - no need to apply -+# &apply_new_os_version(\%realos); -+# } -+# else { -+# # Large enough change to tell the user -+# push(@notifs, -+# &ui_form_start("$gconfig{'webprefix'}/webmin/fix_os.cgi"). -+# &text('os_incorrect', $realos{'real_os_type'}, -+# $realos{'real_os_version'})."<p>\n". -+# &ui_form_end([ [ undef, $text{'os_fix'} ] ]) -+# ); -+# } -+# } - +- # Password close to expiry my $warn_days = $config{'warn_days'}; + if (&foreign_check("acl")) { diff --git a/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/mount-excludefs.patch b/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/mount-excludefs.patch index 787bd8c69b..7d6a2275f9 100644 --- a/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/mount-excludefs.patch +++ b/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/mount-excludefs.patch @@ -8,9 +8,9 @@ Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Upstream-Status: Pending ---- webmin-1.570.orig/mount/index.cgi -+++ webmin-1.570/mount/index.cgi -@@ -33,10 +33,12 @@ elsif ($config{'sort_mode'} == 1) { +--- a/mount/index.cgi ++++ b/mount/index.cgi +@@ -34,9 +34,11 @@ elsif ($config{'sort_mode'} == 1) { } # Build visible filesystems list @@ -18,7 +18,6 @@ Upstream-Status: Pending foreach $m (@all) { @minfo = @$m; $p = &simplify_mount_path($minfo[0], $minfo[2]); - next if ($ignore{$minfo[2]}); + next if (grep {$_ eq $minfo[2]} @excludefs); @mmodes = &mount_modes($minfo[2], $minfo[0], $minfo[1]); $canedit = $can_edit{$minfo[2]} && !$mmodes[4] && diff --git a/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/mysql-config-fix.patch b/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/mysql-config-fix.patch index c6c1f0df79..d62353592e 100644 --- a/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/mysql-config-fix.patch +++ b/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/mysql-config-fix.patch @@ -10,8 +10,6 @@ Signed-off-by: Diego Rondini <diego.ml@zoho.com> mysql/config | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) -diff --git a/mysql/config b/mysql/config -index e5b6fb3..77bfe69 100644 --- a/mysql/config +++ b/mysql/config @@ -1,13 +1,13 @@ @@ -33,7 +31,7 @@ index e5b6fb3..77bfe69 100644 -mysqladmin=/usr/local/mysql/bin/mysqladmin +mysql_libs=/usr/lib +mysqladmin=/usr/bin/mysqladmin - style=0 + style=1 add_mode=1 nodbi=0 @@ -15,7 +15,7 @@ access=*: * @@ -45,6 +43,3 @@ index e5b6fb3..77bfe69 100644 max_dbs=50 my_cnf=/etc/my.cnf max_text=1000 --- -2.5.0 - diff --git a/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/net-generic.patch b/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/net-generic.patch index 6ae3dced72..f1965a7887 100644 --- a/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/net-generic.patch +++ b/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/net-generic.patch @@ -3,23 +3,19 @@ Add support for configuring network interfaces on a generic linux system Upstream-Status: Inappropriate [config] Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> -Index: webmin-1.850/net/module.info -=================================================================== ---- webmin-1.850.orig/net/module.info -+++ webmin-1.850/net/module.info -@@ -14,7 +14,7 @@ desc_ko_KR.UTF-8=네트워크 구성 +--- a/net/module.info ++++ b/net/module.info +@@ -1,7 +1,7 @@ + version=2.202 + longdesc=Configure boot time and active interfaces, DNS, routing and /etc/hosts. name=Networking - desc_tr=A Yaplandrmas - desc_de=Netzwerkkonfiguration -os_support=solaris coherent-linux redhat-linux/5.0-* mandrake-linux united-linux suse-linux/6.0-* open-linux unixware turbo-linux/4.0 freebsd/3.2-* openbsd debian-linux/2.2-* cobalt-linux/2.2-* msc-linux gentoo-linux macos/1.5-* trustix-linux slackware-linux/8.0-* openmamba-linux cygwin windows pardus-linux +os_support=generic-linux solaris coherent-linux redhat-linux/5.0-* mandrake-linux united-linux suse-linux/6.0-* open-linux unixware turbo-linux/4.0 freebsd/3.2-* openbsd debian-linux/2.2-* cobalt-linux/2.2-* msc-linux gentoo-linux macos/1.5-* trustix-linux slackware-linux/8.0-* openmamba-linux cygwin windows pardus-linux - desc_sk=Konfigurcia siete - desc_zh_CN= - risk=low medium high -Index: webmin-1.850/net/generic-linux-lib.pl -=================================================================== + readonly=1 + desc=Network Configuration + category=net --- /dev/null -+++ webmin-1.850/net/generic-linux-lib.pl ++++ b/net/generic-linux-lib.pl @@ -0,0 +1,2 @@ +do 'linux-lib.pl'; + diff --git a/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/net-lib.pl.patch b/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/net-lib.pl.patch index bdba5e73f8..949525dfd7 100644 --- a/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/net-lib.pl.patch +++ b/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/net-lib.pl.patch @@ -4,16 +4,14 @@ XXX: need to work out a better fix. Signed-off-by: Dexuan Cui <dexuan.cui@intel.com> -diff -Nru webmin-1.570.orig//net/net-lib.pl webmin-1.570/net/net-lib.pl ---- webmin-1.570.orig//net/net-lib.pl 2011-10-03 09:01:48.000000000 +0800 -+++ webmin-1.570/net/net-lib.pl 2011-10-28 13:52:56.138873664 +0800 -@@ -21,7 +21,8 @@ - do "$gconfig{'os_type'}-9.1-ALL-lib.pl"; +--- a/net/net-lib.pl ++++ b/net/net-lib.pl +@@ -38,7 +38,7 @@ elsif ($gconfig{'os_type'} eq 'debian-li + $net_mode = "netplan"; } else { - do "$gconfig{'os_type'}-lib.pl"; -+ #do "$gconfig{'os_type'}-lib.pl"; + do "debian-linux-lib.pl"; + $net_mode = $gconfig{'os_type'}; } - # list_hosts() diff --git a/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/remove-python2.3.patch b/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/remove-python2.3.patch deleted file mode 100644 index 75e5bd1eaf..0000000000 --- a/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/remove-python2.3.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 6f04699d5d417122b67e8118fd1955c769f17e76 Mon Sep 17 00:00:00 2001 -From: Robert Yang <liezhi.yang@windriver.com> -Date: Tue, 2 Sep 2014 00:11:05 -0700 -Subject: [PATCH] ajaxterm/ajaxterm/qweb.py: fix hardcode of python2.3 - -Upstream-Status: Pending - -Signed-off-by: Robert Yang <liezhi.yang@windriver.com> ---- - ajaxterm/ajaxterm/qweb.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ajaxterm/ajaxterm/qweb.py b/ajaxterm/ajaxterm/qweb.py -index 20c5092..c658a6b 100644 ---- a/ajaxterm/ajaxterm/qweb.py -+++ b/ajaxterm/ajaxterm/qweb.py -@@ -1,4 +1,4 @@ --#!/usr/bin/python2.3 -+#!/usr/bin/env python - # - # vim:set et ts=4 fdc=0 fdn=2 fdl=0: - # --- -1.7.9.5 - diff --git a/meta-openembedded/meta-webserver/recipes-webadmin/webmin/webmin_1.850.bb b/meta-openembedded/meta-webserver/recipes-webadmin/webmin/webmin_2.202.bb index bbc59443c7..18082149b6 100644 --- a/meta-openembedded/meta-webserver/recipes-webadmin/webmin/webmin_1.850.bb +++ b/meta-openembedded/meta-webserver/recipes-webadmin/webmin/webmin_2.202.bb @@ -1,7 +1,7 @@ SUMMARY = "Web-based administration interface" HOMEPAGE = "http://www.webmin.com" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENCE;md5=0373ac9f611e542ddebe1ec6394afc3c" +LIC_FILES_CHKSUM = "file://LICENCE;md5=0a6446108c96d0819d21e40b48109507" SRC_URI = "${SOURCEFORGE_MIRROR}/webadmin/webmin-${PV}.tar.gz \ file://setup.sh \ @@ -16,14 +16,10 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/webadmin/webmin-${PV}.tar.gz \ file://proftpd-config-fix.patch \ file://net-lib.pl.patch \ file://media-tomb.patch \ - file://remove-python2.3.patch \ file://mysql-config-fix.patch \ file://webmin.service \ " - -SRC_URI[md5sum] = "cd6ee98f73f9418562197675b952d81b" -SRC_URI[sha256sum] = "c66caa9e4cb50d5447bc8aceb7989d2284dde060278f404b13e171c7ce1690e1" - +SRC_URI[sha256sum] = "4f1c467aeda0ded546e69f332c768665b6a0537d6a69e609221f9465121f775e" UPSTREAM_CHECK_URI = "http://www.webmin.com/download.html" UPSTREAM_CHECK_REGEX = "webmin-(?P<pver>\d+(\.\d+)+).tar.gz" |