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 <kchai@redhat.com>

diff --git a/debian/ceph-crimson-osd.dirs b/debian/ceph-crimson-osd.dirs
deleted file mode 100644 (file)
index b7fc476..0000000
--- a/debian/ceph-crimson-osd.dirs
+++ /dev/null
@@ -1 +0,0 @@
-var/lib/ceph/osd

diff --git a/debian/ceph-crimson-osd.install b/debian/ceph-crimson-osd.install
deleted file mode 100644 (file)
index 621ac63..0000000
--- a/debian/ceph-crimson-osd.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin/crimson-osd

diff --git a/debian/ceph-osd.install b/debian/ceph-osd.install
old mode 100644 (file)
new mode 100755 (executable)
index 39420ca..3f73ec1
--- 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*

diff --git a/debian/control b/debian/control
index 81d606e3856fddd79e17065aa6a4b4910e560977..9347ca3b293c03c0777d4ef51eebd93cc9e5aeee 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -380,37 +380,6 @@ Description: debugging symbols for ceph-osd
  .
  This package contains the debugging symbols for ceph-osd.
 
-# Crimson Package: ceph-crimson-osd
-# Crimson Architecture: linux-any
-# Crimson Depends: ceph-base (= ${binary:Version}),
-# Crimson          ceph-osd (= ${binary:Version}),
-# Crimson          lvm2,
-# Crimson          sudo,
-# Crimson          ${misc:Depends},
-# Crimson          ${python:Depends},
-# Crimson          ${shlibs:Depends},
-# Crimson Description: OSD server for the ceph storage system
-# Crimson  Ceph is a massively scalable, open-source, distributed
-# Crimson  storage system that runs on commodity hardware and delivers object,
-# Crimson  block and file system storage.
-# Crimson  .
-# Crimson  This package contains the Object Storage Daemon for the Ceph storage system.
-# Crimson  It is responsible for storing objects on a local file system
-# Crimson  and providing access to them over the network.
-
-# Crimson Package: ceph-crimson-osd-dbg
-# Crimson Architecture: linux-any
-# Crimson Section: debug
-# Crimson Priority: extra
-# Crimson Depends: ceph-crimson-osd (= ${binary:Version}),
-# Crimson          ${misc:Depends},
-# Crimson Description: debugging symbols for ceph-crimson-osd
-# Crimson  Ceph is a massively scalable, open-source, distributed
-# Crimson  storage system that runs on commodity hardware and delivers object,
-# Crimson  block and file system storage.
-# Crimson  .
-# Crimson  This package contains the debugging symbols for ceph-osd.
-
 Package: ceph-fuse
 Architecture: linux-any
 Depends: ${misc:Depends},

diff --git a/debian/rules b/debian/rules
index 33b5f28ff70162164935ab525513c9a243956cce..b3ee6af2d07526515ab2e0fc4522eae7a220f741 100755 (executable)
--- 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