From 004713eaddca9ef26a4ab9cb8da5de5cb4a21213 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Thu, 9 Aug 2018 00:50:00 +0800 Subject: [PATCH] tools/cephfs,deb: package cephfs-shell change `#!/usr/bin/env python3` to `#!/usr/bin/python3` as per https://www.debian.org/doc/packaging-manuals/python-policy/programs.html#interpreter-directive Signed-off-by: Kefu Chai --- debian/cephfs-shell.install | 2 ++ debian/control | 13 +++++++++++++ debian/py3dist-overrides | 1 + debian/rules | 5 ++++- src/tools/cephfs/cephfs-shell | 2 +- 5 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 debian/cephfs-shell.install create mode 100644 debian/py3dist-overrides diff --git a/debian/cephfs-shell.install b/debian/cephfs-shell.install new file mode 100644 index 0000000000000..4713a81b11578 --- /dev/null +++ b/debian/cephfs-shell.install @@ -0,0 +1,2 @@ +usr/bin/cephfs-shell +usr/lib/python3*/dist-packages/cephfs_shell-*.egg-info diff --git a/debian/control b/debian/control index b2cfc11bcb753..a33d5ab997b98 100644 --- a/debian/control +++ b/debian/control @@ -1078,3 +1078,16 @@ Depends: librados-dev (= ${binary:Version}) ${misc:Depends}, Description: RADOS object class development kit. . This package contains development files needed for building RADOS object class plugins. + +Package: cephfs-shell +Architecture: all +Depends: ${misc:Depends} + ${python3:Depends} +Description: interactive shell for the Ceph distributed file system + Ceph is a massively scalable, open-source, distributed + storage system that runs on commodity hardware and delivers object, + block and file system storage. This is an interactive tool that + allows accessing a Ceph file system without mounting it by providing + a nice pseudo-shell which works like an FTP client. + . + This package contains a CLI for interacting with the CephFS. diff --git a/debian/py3dist-overrides b/debian/py3dist-overrides new file mode 100644 index 0000000000000..1cf76162b47c8 --- /dev/null +++ b/debian/py3dist-overrides @@ -0,0 +1 @@ +cephfs python3-cephfs; PEP386 diff --git a/debian/rules b/debian/rules index fd752bc5d4f4f..44490c8fbddd5 100755 --- a/debian/rules +++ b/debian/rules @@ -12,8 +12,10 @@ ifneq (,$(findstring WITH_STATIC_LIBSTDCXX,$(CEPH_EXTRA_CMAKE_ARGS))) export DEB_LDFLAGS_MAINT_STRIP = -Wl,-Bsymbolic-functions endif -extraopts += -DWITH_OCF=ON -DWITH_LTTNG=ON -DWITH_PYTHON3=ON -DWITH_MGR_DASHBOARD_FRONTEND=OFF +extraopts += -DWITH_OCF=ON -DWITH_LTTNG=ON +extraopts += -DWITH_PYTHON3=ON -DWITH_MGR_DASHBOARD_FRONTEND=OFF extraopts += -DWITH_CEPHFS_JAVA=ON +extraopts += -DWITH_CEPHFS_SHELL=ON extraopts += -DWITH_SYSTEMD=ON -DCEPH_SYSTEMD_ENV_DIR=/etc/default # assumes that ceph is exmpt from multiarch support, so we override the libdir. extraopts += -DCMAKE_INSTALL_LIBDIR=/usr/lib @@ -147,6 +149,7 @@ override_dh_python3: dh_python3 -p python3-$$binding; \ done dh_python3 -p python3-ceph-argparse + dh_python3 -p cephfs-shell # do not run tests override_dh_auto_test: diff --git a/src/tools/cephfs/cephfs-shell b/src/tools/cephfs/cephfs-shell index 574c3d67fe4ba..4fd4b85aec36f 100644 --- a/src/tools/cephfs/cephfs-shell +++ b/src/tools/cephfs/cephfs-shell @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/python3 # coding = utf-8 import argparse -- 2.39.5