From e5f00d2fdcb116b4e18970c518138d40f852aaa3 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Thu, 13 Jun 2019 16:28:29 +0800 Subject: debian/: use ceph-osd for packaging crimson-osd * debian/: remove ceph-crimson-osd package. * debian/control: set `CEPH_OSD_BASENAME` env variable, which will be consumed by `ceph-osd.install`. alternatively, we could rename crimson-osd to ceph-osd in `override_dh_auto_install`, but let's go with this way at this moment, unless `mv` in `override_dh_auto_install` is proved to be better. * ceph-osd.install: replace ceph-osd with crimson-osd if `CEPH_EXTRA_CMAKE_ARGS` has `WITH_SEASTAR` in it. this only happens when we are packaging the "crimson" flavor packages from jenkins. * ceph-osd.install: `chmod +x` this file, as we need to use `/usr/bin/dh-exec` as the interpreter of it to perform variable substitution and install. Signed-off-by: Kefu Chai --- debian/ceph-osd.install | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) mode change 100644 => 100755 debian/ceph-osd.install (limited to 'debian/ceph-osd.install') diff --git a/debian/ceph-osd.install b/debian/ceph-osd.install old mode 100644 new mode 100755 index 39420ca413a..3f73ec16a2d --- a/debian/ceph-osd.install +++ b/debian/ceph-osd.install @@ -1,10 +1,12 @@ +#! /usr/bin/dh-exec + lib/systemd/system/ceph-osd* lib/systemd/system/ceph-volume@.service usr/bin/ceph-bluestore-tool usr/bin/ceph-clsinfo usr/bin/ceph-objectstore-tool usr/bin/ceph-osdomap-tool -usr/bin/ceph-osd +usr/bin/${CEPH_OSD_BASENAME} => /usr/bin/ceph-osd usr/bin/ceph_objectstore_bench usr/lib/ceph/ceph-osd-prestart.sh usr/lib/libos_tp.so* -- cgit v1.2.3