diff options
| author | Kefu Chai <kchai@redhat.com> | 2019-06-13 10:28:29 +0200 |
|---|---|---|
| committer | Kefu Chai <kchai@redhat.com> | 2019-06-13 17:06:59 +0200 |
| commit | e5f00d2fdcb116b4e18970c518138d40f852aaa3 (patch) | |
| tree | e8b6cfedbc47af9ba6a3b83c1aa1b6cf4b7a89eb /debian/rules | |
| parent | Merge pull request #28515 from hvhaugwitz/mondb-recovery-script (diff) | |
| download | ceph-e5f00d2fdcb116b4e18970c518138d40f852aaa3.tar.xz ceph-e5f00d2fdcb116b4e18970c518138d40f852aaa3.zip | |
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>
Diffstat (limited to 'debian/rules')
| -rwxr-xr-x | debian/rules | 5 |
1 files changed, 5 insertions, 0 deletions
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 |