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>
This commit is contained in:
Kefu Chai
2019-06-13 16:28:29 +08:00
parent 494d624997
commit e5f00d2fdc
5 changed files with 8 additions and 34 deletions

View File

@@ -1 +0,0 @@
var/lib/ceph/osd

View File

@@ -1 +0,0 @@
usr/bin/crimson-osd

4
debian/ceph-osd.install vendored Normal file → Executable file
View File

@@ -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*

31
debian/control vendored
View File

@@ -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},

5
debian/rules vendored
View File

@@ -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