@cryptotaxi247 / netdata-1 / commits / a817a5c75

Clean up unneeded depencdencies. (#18242)

Austin S. Hemmelgarn committed Jul 30, 2024 at 13:27 UTC a817a5c75b3c114bd0892f5871eb73d240e52ba8
12 files changed +47 -206
packaging/installer/dependencies/alpine.sh
+12 -18
@@ -9,33 +9,27 @@ DONT_WAIT=0
9
10 package_tree="
11 alpine-sdk
12 - coreutils
13 - git
14 - gcc
15 - g++
16 - automake
17 - autoconf
12 cmake
19 - make
20 - libatomic
21 - libtool
22 - pkgconfig
23 - tar
13 + coreutils
14 curl
15 + elfutils-dev
16 + g++
17 + gcc
18 + git
19 gzip
20 + json-c-dev
21 + libatomic
22 + libmnl-dev
23 libuv-dev
24 lz4-dev
25 + make
26 openssl-dev
29 - elfutils-dev
27 + pkgconfig
28 python3
31 - zlib-dev
29 + tar
30 util-linux-dev
33 - libmnl-dev
34 - json-c-dev
35 - musl-fts-dev
36 - bison
37 - flex
31 yaml-dev
32 + zlib-dev
33 "
34
35 usage() {
packaging/installer/dependencies/arch.sh
+12 -19
@@ -8,32 +8,25 @@ NON_INTERACTIVE=0
8 DONT_WAIT=0
9
10 declare -a package_tree=(
11 - gcc
12 - make
13 - autoconf
14 - autoconf-archive
15 - autogen
16 - automake
17 - libtool
11 + binutils
12 cmake
19 - zlib
20 - util-linux
21 - libmnl
13 + curl
14 + gcc
15 + git
16 + gzip
17 json-c
23 - libyaml
18 + libelf
19 + libmnl
20 libuv
21 + libyaml
22 lz4
23 + make
24 openssl
27 - libelf
28 - git
25 pkgconfig
30 - tar
31 - curl
32 - gzip
26 python3
34 - binutils
35 - bison
36 - flex
27 + tar
28 + util-linux
29 + zlib
30 )
31
32 usage() {
packaging/installer/dependencies/centos.sh
-7
@@ -5,15 +5,9 @@
5 set -e
6
7 declare -a package_tree=(
8 - autoconf
9 - autoconf-archive
10 - automake
11 - bison
8 cmake
13 - cmake3
9 curl
10 elfutils-libelf-devel
16 - flex
11 findutils
12 gcc
13 gcc-c++
@@ -22,7 +16,6 @@ declare -a package_tree=(
16 json-c-devel
17 libatomic
18 libmnl-devel
25 - libtool
19 libuuid-devel
20 libuv-devel
21 libyaml-devel
packaging/installer/dependencies/debian.sh
-8
@@ -8,14 +8,8 @@ NON_INTERACTIVE=0
8 DONT_WAIT=0
9
10 package_tree="
11 - autoconf
12 - autoconf-archive
13 - autogen
14 - automake
15 - bison
11 cmake
12 curl
18 - flex
13 g++
14 gcc
15 git
@@ -27,12 +21,10 @@ package_tree="
21 libmnl-dev
22 libssl-dev
23 libsystemd-dev
30 - libtool
24 libuv1-dev
25 libyaml-dev
26 make
27 pkg-config
35 - python
28 python3
29 tar
30 uuid-dev
packaging/installer/dependencies/fedora.sh
-14
@@ -17,23 +17,11 @@ os_version() {
17 fi
18 }
19
20 -if [[ $(os_version) -gt 24 ]]; then
21 - ulogd_pkg=
22 -else
23 - ulogd_pkg=ulogd
24 -fi
25 -
20 declare -a package_tree=(
27 - autoconf
28 - autoconf-archive
29 - autogen
30 - automake
31 - bison
21 cmake
22 curl
23 elfutils-libelf-devel
24 findutils
36 - flex
25 gcc
26 gcc-c++
27 git
@@ -41,7 +29,6 @@ declare -a package_tree=(
29 json-c-devel
30 libatomic
31 libmnl-devel
44 - libtool
32 libuuid-devel
33 libuv-devel
34 libyaml-devel
@@ -53,7 +40,6 @@ declare -a package_tree=(
40 systemd-devel
41 tar
42 zlib-devel
56 - "${ulogd_pkg}"
43 )
44
45 usage() {
packaging/installer/dependencies/freebsd.sh
+6 -13
@@ -8,26 +8,19 @@ NON_INTERACTIVE=0
8 DONT_WAIT=0
9
10 package_tree="
11 - git
12 - autoconf
13 - autoconf-archive
14 - autogen
15 - automake
16 - libtool
17 - pkgconf
11 cmake
12 curl
20 - gzip
21 - lzlib
13 e2fsprogs-libuuid
14 + git
15 + gzip
16 json-c
24 - libyaml
25 - libuv
17 liblz4
18 + libuv
19 + libyaml
20 + lzlib
21 openssl
22 + pkgconf
23 python3
29 - bison
30 - flex
24 "
25
26 prompt() {
packaging/installer/dependencies/gentoo.sh
+14 -20
@@ -8,32 +8,26 @@ NON_INTERACTIVE=0
8 DONT_WAIT=0
9
10 package_tree="
11 + app-alternatives/gzip
12 + app-alternatives/tar
13 + app-arch/lz4
14 + dev-lang/python
15 + dev-libs/json-c
16 + dev-libs/libuv
17 + dev-libs/libyaml
18 + dev-libs/openssl
19 + dev-util/cmake
20 dev-vcs/git
21 + net-libs/libmnl
22 + net-misc/curl
23 sys-apps/findutils
24 + sys-apps/util-linux
25 sys-devel/gcc
26 sys-devel/make
15 - sys-devel/autoconf
16 - sys-devel/autoconf-archive
17 - sys-devel/autogen
18 - sys-devel/automake
19 - virtual/pkgconfig
20 - dev-util/cmake
21 - app-arch/tar
22 - net-misc/curl
23 - app-arch/gzip
24 - sys-apps/util-linux
25 - net-libs/libmnl
26 - dev-libs/json-c
27 - dev-libs/libyaml
28 - dev-libs/libuv
29 - app-arch/lz4
30 - dev-libs/openssl
27 virtual/libelf
32 - dev-lang/python
33 - dev-libs/libuv
34 - sys-devel/bison
35 - sys-devel/flex
28 + virtual/pkgconfig
29 "
30 +
31 usage() {
32 cat << EOF
33 OPTIONS:
packaging/installer/dependencies/ol.sh
-7
@@ -8,15 +8,9 @@ NON_INTERACTIVE=0
8 DONT_WAIT=0
9
10 declare -a package_tree=(
11 - autoconf
12 - autoconf-archive
13 - autogen
14 - automake
15 - bison
11 cmake
12 curl
13 elfutils-libelf-devel
19 - flex
14 gcc
15 gcc-c++
16 git
@@ -24,7 +18,6 @@ declare -a package_tree=(
18 json-c-devel
19 libatomic
20 libmnl-devel
27 - libtool
21 libuuid-devel
22 libuv-devel
23 libyaml-devel
packaging/installer/dependencies/opensuse.sh
-7
@@ -10,14 +10,8 @@ NON_INTERACTIVE=0
10 DONT_WAIT=0
11
12 declare -a package_tree=(
13 - autoconf
14 - autoconf-archive
15 - autogen
16 - automake
17 - bison
13 cmake
14 curl
20 - flex
15 gcc
16 gcc-c++
17 git
@@ -28,7 +22,6 @@ declare -a package_tree=(
22 liblz4-devel
23 libmnl-devel
24 libopenssl-devel
31 - libtool
25 libuuid-devel
26 libuv-devel
27 libyaml-devel
packaging/installer/dependencies/rockylinux.sh
-7
@@ -8,16 +8,10 @@ NON_INTERACTIVE=0
8 DONT_WAIT=0
9
10 declare -a package_tree=(
11 - autoconf
12 - autoconf-archive
13 - autogen
14 - automake
15 - bison
11 cmake
12 curl
13 elfutils-libelf-devel
14 findutils
20 - flex
15 gcc
16 gcc-c++
17 git
@@ -25,7 +19,6 @@ declare -a package_tree=(
19 json-c-devel
20 libatomic
21 libmnl-devel
28 - libtool
22 libuuid-devel
23 libuv-devel
24 libyaml-devel
packaging/installer/dependencies/ubuntu.sh
-7
@@ -8,14 +8,8 @@ NON_INTERACTIVE=0
8 DONT_WAIT=0
9
10 package_tree="
11 - autoconf
12 - autoconf-archive
13 - autogen
14 - automake
15 - bison
11 cmake
12 curl
18 - flex
13 g++
14 gcc
15 git
@@ -27,7 +21,6 @@ package_tree="
21 libmnl-dev
22 libssl-dev
23 libsystemd-dev
30 - libtool
24 libuv1-dev
25 libyaml-dev
26 make
packaging/installer/install-required-packages.sh
+3 -79
@@ -632,74 +632,12 @@ declare -A pkg_coreutils=(
632 ['default']="NOTREQUIRED"
633 )
634
635 -declare -A pkg_autoconf=(
636 - ['gentoo']="sys-devel/autoconf"
637 - ['clearlinux']="c-basic"
638 - ['default']="autoconf"
639 -)
640 -
641 -# required to compile netdata with --enable-sse
642 -# https://github.com/firehol/netdata/pull/450
643 -declare -A pkg_autoconf_archive=(
644 - ['gentoo']="sys-devel/autoconf-archive"
645 - ['clearlinux']="c-basic"
646 - ['alpine']="WARNING|"
647 - ['default']="autoconf-archive"
648 -
649 - # exceptions
650 - ['centos-6']="WARNING|"
651 - ['rhel-6']="WARNING|"
652 - ['rhel-7']="WARNING|"
653 -)
654 -
655 -declare -A pkg_autogen=(
656 - ['gentoo']="sys-devel/autogen"
657 - ['clearlinux']="c-basic"
658 - ['alpine']="WARNING|"
659 - ['default']="autogen"
660 -
661 - # exceptions
662 - ['centos-6']="WARNING|"
663 - ['rhel-6']="WARNING|"
664 - ['centos-9']="NOTREQUIRED|"
665 - ['rhel-9']="NOTREQUIRED|"
666 -)
667 -
668 -declare -A pkg_automake=(
669 - ['gentoo']="sys-devel/automake"
670 - ['clearlinux']="c-basic"
671 - ['default']="automake"
672 -)
673 -
674 -# Required to build libwebsockets and libmosquitto on some systems.
635 declare -A pkg_cmake=(
636 ['gentoo']="dev-util/cmake"
637 ['clearlinux']="c-basic"
638 ['default']="cmake"
639 )
640
681 -# bison and flex are required by Fluent-Bit
682 -declare -A pkg_bison=(
683 - ['default']="bison"
684 -)
685 -
686 -declare -A pkg_flex=(
687 - ['default']="flex"
688 -)
689 -
690 -# fts-dev is required by Fluent-Bit on Alpine
691 -declare -A pkg_fts_dev=(
692 - ['default']="NOTREQUIRED"
693 - ['alpine']="musl-fts-dev"
694 - ['alpine-3.16.9']="fts-dev"
695 -)
696 -
697 -# cmake3 is required by Fluent-Bit on CentOS 7
698 -declare -A pkg_cmake3=(
699 - ['default']="NOTREQUIRED"
700 - ['centos-7']="cmake3"
701 -)
702 -
641 declare -A pkg_json_c_dev=(
642 ['alpine']="json-c-dev"
643 ['arch']="json-c"
@@ -772,13 +710,13 @@ declare -A pkg_curl=(
710 )
711
712 declare -A pkg_gzip=(
775 - ['gentoo']="app-arch/gzip"
713 + ['gentoo']="app-alternatives/gzip"
714 ['macos']="NOTREQUIRED"
715 ['default']="gzip"
716 )
717
718 declare -A pkg_tar=(
781 - ['gentoo']="app-arch/tar"
719 + ['gentoo']="app-alternatives/tar"
720 ['clearlinux']="os-core-update"
721 ['macos']="NOTREQUIRED"
722 ['freebsd']="NOTREQUIRED"
@@ -1249,14 +1187,9 @@ packages() {
1187 require_cmd gcc-multilib || suitable_package gcc
1188 require_cmd g++ || require_cmd clang++ || suitable_package gxx
1189
1252 - require_cmd make || suitable_package make
1253 - require_cmd autoconf || suitable_package autoconf
1254 - suitable_package autoconf-archive
1255 - require_cmd autogen || suitable_package autogen
1256 - require_cmd automake || suitable_package automake
1190 require_cmd pkg-config || suitable_package pkg-config
1191 require_cmd cmake || suitable_package cmake
1259 - require_cmd cmake3 || suitable_package cmake3
1192 + require_cmd make || suitable_package make
1193
1194 # -------------------------------------------------------------------------
1195 # debugging tools for development
@@ -1279,8 +1212,6 @@ packages() {
1212 require_cmd tar || suitable_package tar
1213 require_cmd curl || suitable_package curl
1214 require_cmd gzip || suitable_package gzip
1282 - require_cmd bison || suitable_package bison
1283 - require_cmd flex || suitable_package flex
1215 fi
1216
1217 # -------------------------------------------------------------------------
@@ -1312,7 +1243,6 @@ packages() {
1243 suitable_package libuuid-dev
1244 suitable_package libmnl-dev
1245 suitable_package json-c-dev
1315 - suitable_package fts-dev
1246 suitable_package libyaml-dev
1247 suitable_package libsystemd-dev
1248 suitable_package pcre2
@@ -1348,9 +1278,6 @@ packages() {
1278
1279 if [ "${PACKAGES_NETDATA_PYTHON}" -ne 0 ]; then
1280 require_cmd python || suitable_package python
1351 -
1352 - # suitable_package python-requests
1353 - # suitable_package python-pip
1281 fi
1282
1283 # -------------------------------------------------------------------------
@@ -1358,9 +1285,6 @@ packages() {
1285
1286 if [ "${PACKAGES_NETDATA_PYTHON3}" -ne 0 ]; then
1287 require_cmd python3 || suitable_package python3
1361 -
1362 - # suitable_package python3-requests
1363 - # suitable_package python3-pip
1288 fi
1289
1290 # -------------------------------------------------------------------------