From: David Galloway Date: Fri, 10 Jul 2026 20:12:01 +0000 (-0400) Subject: script/buildcontainer-setup: fix package install on debian trixie X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b5697987ae86f51d7f16a1409ce9f2b542f3de52;p=ceph.git script/buildcontainer-setup: fix package install on debian trixie Debian removed software-properties-common from the archive in trixie, so the flat apt-get install list fails there. The package was only needed to provide add-apt-repository for llvm.sh, which installs clang-19 from apt.llvm.org. Trixie ships clang-19 natively, so install it from the distro instead; run-make.sh's prepare() then finds clang-19 and skips llvm.sh entirely. Ubuntu and older Debian releases still have software-properties-common and keep the previous behavior. Fixes: https://tracker.ceph.com/issues/78111 Signed-off-by: David Galloway --- diff --git a/src/script/buildcontainer-setup.sh b/src/script/buildcontainer-setup.sh index e5442f4ab7b..d4de868e68a 100644 --- a/src/script/buildcontainer-setup.sh +++ b/src/script/buildcontainer-setup.sh @@ -43,7 +43,17 @@ case "${CEPH_BASE_BRANCH}~${DISTRO_KIND}" in ;; *~*ubuntu*|*~*debian*) apt-get update - apt-get install -y wget reprepro curl software-properties-common lksctp-tools libsctp-dev protobuf-compiler ragel libc-ares-dev + pkgs=(wget reprepro curl lksctp-tools libsctp-dev protobuf-compiler ragel libc-ares-dev) + # software-properties-common provides add-apt-repository, which + # llvm.sh needs to install clang from apt.llvm.org. Debian removed + # the package in trixie, which ships clang-19 natively instead, so + # install that directly and run-make.sh will skip llvm.sh. + if apt-cache show software-properties-common >/dev/null 2>&1; then + pkgs+=(software-properties-common) + else + pkgs+=(clang-19) + fi + apt-get install -y "${pkgs[@]}" install_container_deps ;; *)