From 81581f9719bc56f01d5aa08952671d65fda9867a Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Mon, 8 May 2023 18:27:08 +0200
Subject: Merging upstream version 1.39.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 packaging/installer/dependencies/alpine.sh     | 1 +
 packaging/installer/dependencies/arch.sh       | 1 +
 packaging/installer/dependencies/centos.sh     | 3 ++-
 packaging/installer/dependencies/clearlinux.sh | 1 +
 packaging/installer/dependencies/debian.sh     | 1 +
 packaging/installer/dependencies/fedora.sh     | 1 +
 packaging/installer/dependencies/freebsd.sh    | 1 +
 packaging/installer/dependencies/gentoo.sh     | 1 +
 packaging/installer/dependencies/ol.sh         | 1 +
 packaging/installer/dependencies/opensuse.sh   | 1 +
 packaging/installer/dependencies/rockylinux.sh | 1 +
 packaging/installer/dependencies/ubuntu.sh     | 1 +
 12 files changed, 13 insertions(+), 1 deletion(-)

(limited to 'packaging/installer/dependencies')

diff --git a/packaging/installer/dependencies/alpine.sh b/packaging/installer/dependencies/alpine.sh
index 65999dc3b..321d57707 100755
--- a/packaging/installer/dependencies/alpine.sh
+++ b/packaging/installer/dependencies/alpine.sh
@@ -31,6 +31,7 @@ package_tree="
   util-linux-dev
   libmnl-dev
   json-c-dev
+  yaml-dev
   "
 
 usage() {
diff --git a/packaging/installer/dependencies/arch.sh b/packaging/installer/dependencies/arch.sh
index cdda52733..c0890d925 100755
--- a/packaging/installer/dependencies/arch.sh
+++ b/packaging/installer/dependencies/arch.sh
@@ -20,6 +20,7 @@ declare -a package_tree=(
   util-linux
   libmnl
   json-c
+  libyaml
   libuv
   lz4
   openssl
diff --git a/packaging/installer/dependencies/centos.sh b/packaging/installer/dependencies/centos.sh
index a05bce8f0..845f1113a 100755
--- a/packaging/installer/dependencies/centos.sh
+++ b/packaging/installer/dependencies/centos.sh
@@ -19,6 +19,7 @@ declare -a package_tree=(
   libuuid-devel
   libmnl-devel
   json-c-devel
+  libyaml-devel
   libuv-devel
   lz4-devel
   openssl-devel
@@ -96,7 +97,7 @@ check_flags() {
 
 validate_tree_centos() {
   local opts=
-  export local package_manager=
+  package_manager=
   if [[ "${NON_INTERACTIVE}" == "1" ]]; then
     echo >&2 "Running in non-interactive mode"
     opts="-y"
diff --git a/packaging/installer/dependencies/clearlinux.sh b/packaging/installer/dependencies/clearlinux.sh
index 832dac55a..f6f616d66 100755
--- a/packaging/installer/dependencies/clearlinux.sh
+++ b/packaging/installer/dependencies/clearlinux.sh
@@ -15,6 +15,7 @@ declare -a package_tree=(
   devpkg-util-linux
   devpkg-libmnl
   devpkg-json-c
+  yaml-dev
   devpkg-libuv
   devpkg-lz4
   devpkg-openssl
diff --git a/packaging/installer/dependencies/debian.sh b/packaging/installer/dependencies/debian.sh
index a2c421a92..8186940e5 100755
--- a/packaging/installer/dependencies/debian.sh
+++ b/packaging/installer/dependencies/debian.sh
@@ -31,6 +31,7 @@ package_tree="
   liblz4-dev
   libssl-dev
   libelf-dev
+  libyaml-dev
   python
   python3
   "
diff --git a/packaging/installer/dependencies/fedora.sh b/packaging/installer/dependencies/fedora.sh
index a1c3a1df6..589122882 100755
--- a/packaging/installer/dependencies/fedora.sh
+++ b/packaging/installer/dependencies/fedora.sh
@@ -39,6 +39,7 @@ declare -a package_tree=(
   libuuid-devel
   libmnl-devel
   json-c-devel
+  libyaml-devel
   libuv-devel
   lz4-devel
   openssl-devel
diff --git a/packaging/installer/dependencies/freebsd.sh b/packaging/installer/dependencies/freebsd.sh
index 914513563..69a650a6e 100755
--- a/packaging/installer/dependencies/freebsd.sh
+++ b/packaging/installer/dependencies/freebsd.sh
@@ -21,6 +21,7 @@ package_tree="
   lzlib
   e2fsprogs-libuuid
   json-c
+  libyaml
   libuv
   liblz4
   openssl
diff --git a/packaging/installer/dependencies/gentoo.sh b/packaging/installer/dependencies/gentoo.sh
index e7ed64455..cbe8c8e51 100755
--- a/packaging/installer/dependencies/gentoo.sh
+++ b/packaging/installer/dependencies/gentoo.sh
@@ -24,6 +24,7 @@ package_tree="
   sys-apps/util-linux
   net-libs/libmnl
   dev-libs/json-c
+  dev-libs/libyaml
   dev-libs/libuv
   app-arch/lz4
   dev-libs/openssl
diff --git a/packaging/installer/dependencies/ol.sh b/packaging/installer/dependencies/ol.sh
index 0f1f90e67..2166bcc50 100755
--- a/packaging/installer/dependencies/ol.sh
+++ b/packaging/installer/dependencies/ol.sh
@@ -24,6 +24,7 @@ declare -a package_tree=(
   libuuid-devel
   libmnl-devel
   json-c-devel
+  libyaml-devel
   libuv-devel
   lz4-devel
   openssl-devel
diff --git a/packaging/installer/dependencies/opensuse.sh b/packaging/installer/dependencies/opensuse.sh
index b1f0c2182..81291ef72 100755
--- a/packaging/installer/dependencies/opensuse.sh
+++ b/packaging/installer/dependencies/opensuse.sh
@@ -25,6 +25,7 @@ declare -a package_tree=(
   libuuid-devel
   libmnl-devel
   libjson-c-devel
+  libyaml-devel
   libuv-devel
   liblz4-devel
   libopenssl-devel
diff --git a/packaging/installer/dependencies/rockylinux.sh b/packaging/installer/dependencies/rockylinux.sh
index 63981df4b..7ac98f5e2 100755
--- a/packaging/installer/dependencies/rockylinux.sh
+++ b/packaging/installer/dependencies/rockylinux.sh
@@ -23,6 +23,7 @@ declare -a package_tree=(
   libuuid-devel
   libmnl-devel
   json-c-devel
+  libyaml-devel
   libuv-devel
   lz4-devel
   openssl-devel
diff --git a/packaging/installer/dependencies/ubuntu.sh b/packaging/installer/dependencies/ubuntu.sh
index 295dbf013..e3d734c68 100755
--- a/packaging/installer/dependencies/ubuntu.sh
+++ b/packaging/installer/dependencies/ubuntu.sh
@@ -27,6 +27,7 @@ package_tree="
   uuid-dev
   libmnl-dev
   libjson-c-dev
+  libyaml-dev
   libuv1-dev
   liblz4-dev
   libssl-dev
-- 
cgit v1.2.3