From: Zack Cerza <zack@cerza.org>
Date: Thu, 10 Apr 2025 18:33:59 +0000 (-0600)
Subject: buildcontainer-setup.sh: Fix curl package conflict
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=362b1a44cad529416941406d732ffdc7552ec638;p=ceph.git

buildcontainer-setup.sh: Fix curl package conflict

It looks like at some point the centos9 image started shipping with
curl-minimal, which conflicts with the regular curl package. Asking dnf to find
the binary avoids this, since both packages provide it. Since we were already
doing this with rpmbuild, we can go ahead and loop wget into that in case
something similar happens there.

Signed-off-by: Zack Cerza <zack@cerza.org>
(cherry picked from commit 8964380cbbf6c64eb8342b55bc7078f5617560b8)
---

diff --git a/src/script/buildcontainer-setup.sh b/src/script/buildcontainer-setup.sh
index f655bcb6a93..43e45fcd9b7 100644
--- a/src/script/buildcontainer-setup.sh
+++ b/src/script/buildcontainer-setup.sh
@@ -31,12 +31,12 @@ fi
 # packages etc.
 case "${CEPH_BASE_BRANCH}~${DISTRO_KIND}" in
     *~*centos*8)
-        dnf install -y java-1.8.0-openjdk-headless /usr/bin/rpmbuild wget curl
+        dnf install -y java-1.8.0-openjdk-headless /usr/bin/{rpmbuild,wget,curl}
         install_container_deps
         dnf_clean
     ;;
     *~*centos*9|*~*centos*10*|*~fedora*)
-        dnf install -y /usr/bin/rpmbuild wget curl
+        dnf install -y /usr/bin/{rpmbuild,wget,curl}
         install_container_deps
         dnf_clean
     ;;