Skip to content

Commit 2568002

Browse files
committed
debian: Use system packages for cephadm bundled dependencies
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 <[email protected]>
1 parent f670dce commit 2568002

File tree

2 files changed

+3
-0
lines changed

2 files changed

+3
-0
lines changed

debian/control

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,8 @@ Build-Depends: automake,
107107
python3-requests <pkg.ceph.check>,
108108
python3-scipy <pkg.ceph.check>,
109109
python3-onelogin-saml2 <pkg.ceph.check>,
110+
python3-jinja2,
111+
python3-markupsafe,
110112
python3-setuptools,
111113
python3-sphinx,
112114
python3-venv,

debian/rules

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ extraopts += -DWITH_CEPHFS_JAVA=ON
3030
extraopts += -DWITH_CEPHFS_SHELL=ON
3131
extraopts += -DWITH_SYSTEMD=ON -DCEPH_SYSTEMD_ENV_DIR=/etc/default
3232
extraopts += -DWITH_GRAFANA=ON
33+
extraopts += -DCEPHADM_BUNDLED_DEPENDENCIES=deb
3334
ifeq ($(DEB_HOST_ARCH), amd64)
3435
extraopts += -DWITH_RBD_RWL=ON
3536
else

0 commit comments

Comments
 (0)