[Pkg-ceph-commits] [ceph] 05/06: d/p/skip-setup.py-makefiles.patch, rules: Avoid use of virtualenv to install ceph-disk and ceph-detect-init python modules.

[James Downing Page]

This is an automated email from the git hooks/post-receive script.

jamespage pushed a commit to branch ubuntu-xenial
in repository ceph.

commit 4996f6e3d275c091a541489c60277abe222eac9a
Author: James Page <james.page at ubuntu.com>
Date:   Wed Mar 23 13:55:45 2016 +0000

    d/p/skip-setup.py-makefiles.patch,rules: Avoid use of virtualenv to install ceph-disk and ceph-detect-init python modules.
---
 debian/ceph.install                          |  3 ++-
 debian/changelog                             |  2 ++
 debian/patches/series                        |  1 +
 debian/patches/skip-setup.py-makefiles.patch | 20 ++++++++++++++++++++
 debian/rules                                 |  6 ++++++
 5 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/debian/ceph.install b/debian/ceph.install
index ce87a75..04f13a6 100644
--- a/debian/ceph.install
+++ b/debian/ceph.install
@@ -6,7 +6,6 @@ udev/95-ceph-osd.rules lib/udev/rules.d
 usr/bin/ceph-bluefs-tool
 usr/bin/ceph-clsinfo
 usr/bin/ceph-debugpack
-usr/bin/ceph-detect-init
 usr/bin/ceph-mon
 usr/bin/ceph-objectstore-tool
 usr/bin/ceph-osd
@@ -20,8 +19,10 @@ usr/lib/*/ceph/ceph_common.sh
 usr/lib/*/ceph/erasure-code/libec_*.so
 usr/lib/*/rados-classes/*.so
 usr/lib/python*/dist-packages/ceph_detect_init*
+usr/lib/python*/dist-packages/ceph_disk*
 usr/lib/python*/dist-packages/ceph_rest_api.py
 usr/sbin/ceph-create-keys
+usr/sbin/ceph-detect-init
 usr/sbin/ceph-disk
 usr/share/doc/ceph/sample.ceph.conf
 usr/share/doc/ceph/sample.fetch_config
diff --git a/debian/changelog b/debian/changelog
index 94d0166..0d7c6f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ ceph (10.0.5-0ubuntu1) UNRELEASED; urgency=medium
   * New upstream point release, in preparation for Ceph Jewel.
     - d/p/*: Refresh patches
     - d/control: Enable rbd-mirror(-dbg) packages.
+    - d/p/skip-setup.py-makefiles.patch,rules: Avoid use of virtualenv
+      to install ceph-disk and ceph-detect-init python modules.
 
  -- James Page <james.page at ubuntu.com>  Tue, 22 Mar 2016 11:04:02 +0000
 
diff --git a/debian/patches/series b/debian/patches/series
index f6e1eb3..4b9a085 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -17,3 +17,4 @@ fix-cycles-arch.patch
 pybind-flags.patch
 fix-systemd-escaping.patch
 rocksdb-flags.patch
+skip-setup.py-makefiles.patch
diff --git a/debian/patches/skip-setup.py-makefiles.patch b/debian/patches/skip-setup.py-makefiles.patch
new file mode 100644
index 0000000..9e36e35
--- /dev/null
+++ b/debian/patches/skip-setup.py-makefiles.patch
@@ -0,0 +1,20 @@
+Description: Skip Makefile base install of python modules
+ ceph-disk and ceph-detect-init are python modules; the Makefile
+ based build uses tox and virtualenv, which we really don't want
+ to use in the package build process.
+ .
+ Skip this part of the build, and use d/rules to install.
+Author: James Page <james.page at ubuntu.com>
+Forwarded: not-needed
+
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -32,8 +32,6 @@ endif
+ include arch/Makefile.am
+ include auth/Makefile.am
+ include brag/Makefile.am
+-include ceph-detect-init/Makefile.am
+-include ceph-disk/Makefile.am
+ include crush/Makefile.am
+ include kv/Makefile.am
+ include mon/Makefile.am
diff --git a/debian/rules b/debian/rules
index 3f62d98..de02067 100755
--- a/debian/rules
+++ b/debian/rules
@@ -72,6 +72,12 @@ override_dh_auto_clean:
 
 override_dh_auto_install:
 	dh_auto_install --destdir=$(CURDIR)/debian/tmp
+	# NOTE: manually install python modules to avoid virtualenvs
+	#       during the package build process.
+	set -e; for comp in ceph-detect-init ceph-disk; do \
+		(set -e; cd src/$$comp; python setup.py install --root=$(CURDIR)/debian/tmp \
+			--install-script=/usr/sbin --install-layout=deb); \
+	done
 	# NOTE: ensure that any versioned erasure coding test code is dropped
 	#       from the package install - package ships unversioned modules.
 	rm -f $(CURDIR)/debian/tmp/usr/lib/*/ceph/erasure-code/libec_*.so.*

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ceph/ceph.git