From 04967404ed682835f81c1a5e51f94d09805d38b3 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Thu, 4 Aug 2022 21:52:43 +0800 Subject: [PATCH] cmake,debian: install pure python module to deb_system path in ubuntu 22.04 and debian unstable, the layout (scheme) for system python module is named "deb_system", the default one is 'posix_local'. and 'posix_local' installs python modules into paths like usr/local/lib/python3.10/dist-packages/. hence dh_install fails when it tries to find the files to be packaged under directory of usr/lib/python3*/site-packages/. in this change, the "deb_system" scheme is used if it is available, and fall back to "posix_prefix" to be backward compatible with older debian (derivative) distros. also, update the source directories of pure python's installation from `site-packages` to `*-packages`, to be compatible with ubuntu focal and ubuntu jammy. as we are now using the specified scheme instead of the default one. Signed-off-by: Kefu Chai --- debian/python3-ceph-argparse.install | 4 ++-- src/pybind/CMakeLists.txt | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/python3-ceph-argparse.install b/debian/python3-ceph-argparse.install index d3339be76909b..52479f93535ec 100755 --- a/debian/python3-ceph-argparse.install +++ b/debian/python3-ceph-argparse.install @@ -1,4 +1,4 @@ #! /usr/bin/dh-exec -usr/lib/python3*/site-packages/ceph_argparse.py /usr/lib/python3/dist-packages/ -usr/lib/python3*/site-packages/ceph_daemon.py /usr/lib/python3/dist-packages/ +usr/lib/python3*/*-packages/ceph_argparse.py /usr/lib/python3/dist-packages/ +usr/lib/python3*/*-packages/ceph_daemon.py /usr/lib/python3/dist-packages/ diff --git a/src/pybind/CMakeLists.txt b/src/pybind/CMakeLists.txt index 3808d68199844..b01c49b6215a5 100644 --- a/src/pybind/CMakeLists.txt +++ b/src/pybind/CMakeLists.txt @@ -36,6 +36,7 @@ execute_process( "import sysconfig;\ print(\ sysconfig.get_path(\ + scheme='deb_system' in sysconfig.get_scheme_names() and 'deb_system' or 'posix_prefix',\ name='purelib',\ vars=\ {'base': '${PYTHON_INSTALL_TEMPLATE}',\ -- 2.39.5