]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
debian: remove all python2 overrides and declarations
authorAlfredo Deza <adeza@redhat.com>
Mon, 14 Oct 2019 13:54:11 +0000 (09:54 -0400)
committerSage Weil <sage@redhat.com>
Thu, 12 Dec 2019 19:04:57 +0000 (13:04 -0600)
Signed-off-by: Alfredo Deza <adeza@redhat.com>
debian/rules

index be6b1539cd01ec152010a3ac075ebd76e4a062be..43dbb70d33aa2731098e32a1822ec3bdb17d50df 100755 (executable)
@@ -40,7 +40,7 @@ else
 endif
 
 %:
-       dh $@ --buildsystem=cmake --with javahelper,python2,python3,systemd --parallel
+       dh $@ --buildsystem=cmake --with javahelper,python3,systemd --parallel
 
 override_dh_auto_configure:
        env | sort
@@ -113,30 +113,14 @@ override_dh_strip:
        dh_strip -plibrgw2 --dbg-package=librgw2-dbg
        dh_strip -pradosgw --dbg-package=radosgw-dbg
        dh_strip -pceph-test --dbg-package=ceph-test-dbg
-       dh_strip -ppython-rados --dbg-package=python-rados-dbg
        dh_strip -ppython3-rados --dbg-package=python3-rados-dbg
-       dh_strip -ppython-rbd --dbg-package=python-rbd-dbg
        dh_strip -ppython3-rbd --dbg-package=python3-rbd-dbg
-       dh_strip -ppython-rgw --dbg-package=python-rgw-dbg
        dh_strip -ppython3-rgw --dbg-package=python3-rgw-dbg
-       dh_strip -ppython-cephfs --dbg-package=python-cephfs-dbg
        dh_strip -ppython3-cephfs --dbg-package=python3-cephfs-dbg
 
 override_dh_shlibdeps:
        dh_shlibdeps -a --exclude=erasure-code --exclude=rados-classes --exclude=compressor
 
-override_dh_python2:
-       for binding in rados cephfs rbd rgw; do \
-         dh_python2 -p python-$$binding;       \
-       done
-       dh_python2 -p ceph-common
-       dh_python2 -p ceph-base
-       dh_python2 -p ceph-osd
-       dh_python2 -p ceph-mgr
-       # batch-compile, and set up for delete, all the module files
-       dh_python2 -p ceph-mgr usr/lib/ceph/mgr
-       dh_python2 -p cephadm
-
 override_dh_python3:
        for binding in rados cephfs rbd rgw; do \
          dh_python3 -p python3-$$binding;      \
@@ -144,6 +128,7 @@ override_dh_python3:
        dh_python3 -p python3-ceph-argparse
        dh_python3 -p python3-ceph-common
        dh_python3 -p cephfs-shell
+       dh_python3 -p cephadm
 
 # do not run tests
 override_dh_auto_test: