]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
debian: Use system packages for cephadm bundled dependencies
authorKefu Chai <k.chai@proxmox.com>
Tue, 21 Oct 2025 03:25:00 +0000 (11:25 +0800)
committerKefu Chai <k.chai@proxmox.com>
Wed, 12 Nov 2025 03:59:14 +0000 (11:59 +0800)
Configure the Debian build to use CEPHADM_BUNDLED_DEPENDENCIES=deb,
which instructs the cephadm build script to bundle dependencies from
system-installed Debian packages instead of downloading from PyPI.

This change addresses build failures in restricted network environments
where Debian build tools do not permit internet access. By leveraging
the Debian package support added in commit 9378a2988e1, the build now
uses python3-markupsafe, python3-jinja2, and python3-yaml packages
that are already installed as build dependencies.

This approach mirrors the existing RPM packaging workflow, ensuring
consistent behavior across different distribution package formats.

Signed-off-by: Kefu Chai <k.chai@proxmox.com>
debian/control
debian/rules

index 954b3dd4dc151b27250642345727006a9e9b99c5..7d30e1faa709c4b415d19e27bd2833ca7c8a2ecb 100644 (file)
@@ -107,6 +107,8 @@ Build-Depends: automake,
                python3-requests <pkg.ceph.check>,
                python3-scipy <pkg.ceph.check>,
                python3-onelogin-saml2 <pkg.ceph.check>,
+               python3-jinja2,
+               python3-markupsafe,
                python3-setuptools,
                python3-sphinx,
                python3-venv,
index b935efaa8cddc3753a6e7e67b70e413c2b4b67aa..ee4eff2bdc54c49aca24d2b133f6830dc7c51a25 100755 (executable)
@@ -30,6 +30,7 @@ extraopts += -DWITH_CEPHFS_JAVA=ON
 extraopts += -DWITH_CEPHFS_SHELL=ON
 extraopts += -DWITH_SYSTEMD=ON -DCEPH_SYSTEMD_ENV_DIR=/etc/default
 extraopts += -DWITH_GRAFANA=ON
+extraopts += -DCEPHADM_BUNDLED_DEPENDENCIES=deb
 ifeq ($(DEB_HOST_ARCH), amd64)
   extraopts += -DWITH_RBD_RWL=ON
 else