Merge pull request #10788 from ceph/wip-cmake

debian and cmake cleanups Reviewed-by: Oleh Prypin <oleh@pryp.in>
ceph · Aug 19, 2016 · 58b47a6 · 58b47a6
2 parents 5498123 + 2e3b23a
commit 58b47a6
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/debian/control b/debian/control
@@ -52,8 +52,7 @@ Build-Depends: btrfs-tools,
 	       lsb-release,
                parted,
                pkg-config,
-               python (>= 2.6.6-3~),
-               python-argparse | libpython2.7-stdlib,
+               python (>= 2.7),
                python-all-dev,
                python-nose,
 	       python-setuptools,

diff --git a/debian/rules b/debian/rules
@@ -19,7 +19,7 @@ ifeq ($(DEB_HOST_ARCH), armel)
 endif
 
 %:
-	dh $@ --buildsystem=cmake --with javahelper,python2,systemd --parallel
+	dh $@ --buildsystem=cmake --with javahelper,python2,python3,systemd --parallel
 
 override_dh_auto_configure:
 	dh_auto_configure --buildsystem=cmake -- $(extraopts) $(CEPH_EXTRA_CMAKE_ARGS)
@@ -131,7 +131,9 @@ override_dh_strip:
 	dh_strip -pceph-test --dbg-package=ceph-test-dbg
 
 override_dh_shlibdeps:
-	dh_shlibdeps -a --exclude=erasure-code --exclude=rados-classes --exclude=compressor --exclude=python-rados --exclude=python-cephfs --exclude=python-rbd
+	dh_shlibdeps -a --exclude=erasure-code --exclude=rados-classes --exclude=compressor \
+	  --exclude=python-rados --exclude=python-cephfs --exclude=python-rbd    \
+	  --exclude=python3-rados --exclude=python3-cephfs --exclude=python3-rbd \
 
 override_dh_python2:
 	for binding in rados cephfs rbd; do                                \
@@ -141,6 +143,12 @@ override_dh_python2:
 	dh_python2 -p ceph-base
 	dh_python2 -p ceph-osd
 
+override_dh_python3:
+	for binding in rados cephfs rbd; do                                \
+	  dh_python3 -p python-$$binding; \
+	done
+	dh_python3 -p python3-ceph-argparse
+
 # do not run tests
 override_dh_auto_test:
 

diff --git a/src/erasure-code/jerasure/CMakeLists.txt b/src/erasure-code/jerasure/CMakeLists.txt
@@ -67,4 +67,4 @@ foreach(flavor ${jerasure_flavors})
     $<TARGET_OBJECTS:erasure_code_objs>)
   target_link_libraries(${plugin_name} ${EXTRALIBS})
   install(TARGETS ${plugin_name} DESTINATION ${erasure_plugin_dir})
-endforeach(flavor flavors)
+endforeach()
diff --git a/src/erasure-code/shec/CMakeLists.txt b/src/erasure-code/shec/CMakeLists.txt
@@ -22,4 +22,4 @@ foreach(flavor ${jerasure_flavors})
     $<TARGET_OBJECTS:shec_utils>)
   target_link_libraries(${plugin_name} ${EXTRALIBS})
   install(TARGETS ${plugin_name} DESTINATION ${erasure_plugin_dir})
-endforeach(flavor flavors)
+endforeach()