From: Kefu Chai Date: Thu, 27 Apr 2017 05:25:58 +0000 (+0800) Subject: debian: package crypto plugins only on amd64 X-Git-Tag: v12.0.3~219^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cd4dbaea3add72829541268f582b9d1e35ae346c;p=ceph.git debian: package crypto plugins only on amd64 currently, only plugin based on isa-l is installed. archs other than amd64 will not have this directory or the plugin(s) residing in it. hence dh_install will fail when trying to copy nonexistence file/dir. * debian/ceph-common.install: chmod +x, and only install crypto on amd64 so dh_install can filter the install list using dh-exec * debian/control: depends on dh-exec now. dh-exec v0.13 introduces support for filtering based on architecture. see dh-exec's changelog for more details. but trusty only offers dh-exec v0.12. so do not require ">= 0.13) at this moment. Signed-off-by: Kefu Chai --- diff --git a/debian/ceph-common.install b/debian/ceph-common.install old mode 100644 new mode 100755 index e38ede33f46d..05601692e783 --- a/debian/ceph-common.install +++ b/debian/ceph-common.install @@ -1,3 +1,5 @@ +#! /usr/bin/dh-exec --with=install + etc/bash_completion.d/rados etc/bash_completion.d/rbd usr/bin/ceph @@ -18,7 +20,7 @@ usr/bin/ceph-post-file usr/bin/ceph-brag usr/sbin/mount.ceph sbin usr/lib/ceph/compressor/* -usr/lib/ceph/crypto/* +usr/lib/ceph/crypto/* [amd64] usr/share/man/man8/ceph-authtool.8 usr/share/man/man8/ceph-conf.8 usr/share/man/man8/ceph-dencoder.8 diff --git a/debian/control b/debian/control index 1ae3a8a7662c..4e5766362fa8 100644 --- a/debian/control +++ b/debian/control @@ -15,6 +15,7 @@ Build-Depends: bc, cython, cython3, debhelper (>= 9), + dh-exec, dh-python, dh-systemd, default-jdk,