Skip to content

Commit

Permalink
Revert "debian/rules: build deb with cmake"
Browse files Browse the repository at this point in the history
This reverts commit a6e9379.
  • Loading branch information
tchaikov committed Jun 29, 2016
1 parent da5be4d commit 13edc87
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 13 deletions.
6 changes: 5 additions & 1 deletion debian/control
Expand Up @@ -7,12 +7,16 @@ Vcs-Browser: https://github.com/ceph/ceph
Maintainer: Ceph Maintainers <ceph-maintainers@lists.ceph.com>
Uploaders: Ken Dreyer <kdreyer@redhat.com>,
Alfredo Deza <adeza@redhat.com>
Build-Depends: btrfs-tools,
Build-Depends: autoconf,
automake,
autotools-dev,
btrfs-tools,
cmake,
cpio,
cryptsetup-bin | cryptsetup,
cython,
debhelper (>= 8),
dh-autoreconf,
dh-python,
dh-systemd,
default-jdk,
Expand Down
2 changes: 1 addition & 1 deletion debian/libcephfs-java.jlibs
@@ -1 +1 @@
debian/tmp/usr/share/java/libcephfs.jar
src/java/libcephfs.jar
33 changes: 22 additions & 11 deletions debian/rules
Expand Up @@ -5,34 +5,45 @@ export DESTDIR=$(CURDIR)/debian/tmp

export DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)

extraopts += -DUSE_CRYPTOPP=OFF -DWITH_OCF=ON -DWITH_LTTNG=ON
extraopts += -DWITH_CEPHFS_JAVA=ON
# assumes that ceph is exmpt from multiarch support, so we override the libdir.
extraopts += -DCMAKE_INSTALL_LIBDIR=/usr/lib
extraopts += --with-ocf --with-nss
extraopts += --with-debug
extraopts += --enable-cephfs-java

# rocksdb is not packaged by anyone. build it if we can.
extraopts += --with-librocksdb-static=check

ifeq ($(DEB_HOST_ARCH), armel)
# armel supports ARMv4t or above instructions sets.
# libatomic-ops is only usable with Ceph for ARMv6 or above.
extraopts += -DWITH_ATOMIC_OPS=OFF
extraopts += --without-libatomic-ops
endif

%:
dh $@ --buildsystem=cmake --with javahelper,python2,systemd --parallel
dh $@ --with javahelper,python2,autoreconf,systemd --parallel

override_dh_autoreconf:
dh_autoreconf ./autogen.sh

override_dh_auto_configure:
dh_auto_configure --buildsystem=cmake -- $(extraopts) $(CEPH_EXTRA_CMAKE_ARGS)
dh_auto_configure -- $(extraopts) $(CEPH_EXTRA_CONFIGURE_ARGS)

override_dh_auto_build:
dh_auto_build --buildsystem=cmake
dh_auto_build
cp src/init-ceph debian/ceph-base.ceph.init
cp src/init-radosgw debian/radosgw.init
cp src/logrotate.conf debian/ceph.logrotate

override_dh_auto_clean:
dh_auto_clean --buildsystem=cmake
rm -f debian/radosgw.init debian/ceph.logrotate
dh_auto_clean
rm -f build-stamp configure-stamp
rm -f aclocal.m4 compile config.sub config.guess depcomp install-sh \
ltmain.sh missing
rm -f configure Makefile.in man/Makefile.in src/Makefile.in
rm -f src/acconfig.h.in
rm -f debian/ceph-base.ceph.init debian/radosgw.init debian/ceph.logrotate

override_dh_auto_install:
dh_auto_install --buildsystem=cmake --destdir=$(DESTDIR)
dh_auto_install --destdir=$(DESTDIR)
install -D -m 644 udev/50-rbd.rules $(DESTDIR)/lib/udev/rules.d/50-rbd.rules
install -D -m 644 udev/95-ceph-osd.rules $(DESTDIR)/lib/udev/rules.d/95-ceph-osd.rules
install -D -m 644 src/etc-rbdmap $(DESTDIR)/etc/ceph/rbdmap
Expand Down

0 comments on commit 13edc87

Please sign in to comment.