From 0ce692f2add209c6f5d449ee2be7af725f1813e8 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 15 Feb 2022 04:25:22 +0100 Subject: Adding upstream version 1.33.1. Signed-off-by: Daniel Baumann --- packaging/installer/install-required-packages.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'packaging/installer/install-required-packages.sh') diff --git a/packaging/installer/install-required-packages.sh b/packaging/installer/install-required-packages.sh index 28605a142..52fdc348c 100755 --- a/packaging/installer/install-required-packages.sh +++ b/packaging/installer/install-required-packages.sh @@ -198,7 +198,7 @@ get_os_release() { eval "$(grep -E "^(NAME|ID|ID_LIKE|VERSION|VERSION_ID)=" "${os_release_file}")" for x in "${ID}" ${ID_LIKE}; do case "${x,,}" in - alpine | arch | centos | clear-linux-os | debian | fedora | gentoo | manjaro | opensuse-leap | ol | rhel | sabayon | sles | suse | ubuntu) + alpine | arch | centos | clear-linux-os | debian | fedora | gentoo | manjaro | opensuse-leap | ol | rhel | rocky | sabayon | sles | suse | ubuntu) distribution="${x}" version="${VERSION_ID}" codename="${VERSION}" @@ -419,7 +419,7 @@ detect_package_manager_from_distribution() { fi ;; - centos* | clearos*) + centos* | clearos* | rocky*) package_installer="" tree="centos" [ -n "${dnf}" ] && package_installer="install_dnf" @@ -695,6 +695,7 @@ declare -A pkg_json_c_dev=( ['sabayon']="dev-libs/json-c" ['suse']="libjson-c-devel" ['freebsd']="json-c" + ['macos']="json-c" ['default']="json-c-devel" ) @@ -828,7 +829,7 @@ declare -A pkg_libuuid_dev=( ['rhel']="libuuid-devel" ['ol']="libuuid-devel" ['suse']="libuuid-devel" - ['macos']="NOTREQUIRED" + ['macos']="ossp-uuid" ['freebsd']="e2fsprogs-libuuid" ['default']="" ) @@ -1171,7 +1172,7 @@ declare -A pkg_openssl=( ['gentoo']="dev-libs/openssl" ['arch']="openssl" ['freebsd']="openssl" - ['macos']="openssl@1.1" + ['macos']="openssl" ['default']="openssl-devel" ) -- cgit v1.2.3