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/rules | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 33b5f28ff70..b3ee6af2d07 100755 --- a/debian/rules +++ b/debian/rules @@ -11,6 +11,11 @@ ifneq (,$(findstring WITH_STATIC_LIBSTDCXX,$(CEPH_EXTRA_CMAKE_ARGS))) # see http://tracker.ceph.com/issues/25209 export DEB_LDFLAGS_MAINT_STRIP = -Wl,-Bsymbolic-functions endif +ifeq (,$(findstring WITH_SEASTAR,$(CEPH_EXTRA_CMAKE_ARGS))) + export CEPH_OSD_BASENAME = ceph-osd +else + export CEPH_OSD_BASENAME = crimson-osd +endif extraopts += -DWITH_OCF=ON -DWITH_LTTNG=ON extraopts += -DWITH_PYTHON3=ON -DWITH_MGR_DASHBOARD_FRONTEND=OFF -- cgit v1.2.3