build: add isa-l_crypto submodule

[ceph.git] / Makefile

diff --git a/Makefile b/Makefile
index 19f7bff97ea4e17a1690a1518ed81a31af7a6b42..4e194fc6b7918d0df0d8d795d93e72950405eed1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -12,6 +12,7 @@ SUBMODULES=ceph-erasure-code-corpus \
  ceph-object-corpus \
  src/Beast \
  src/civetweb \
+ src/crypto/isa-l/isa-l_crypto \
  src/dpdk \
  src/erasure-code/jerasure/gf-complete \
  src/erasure-code/jerasure/jerasure \
@@ -26,39 +27,44 @@ SUBMODULES=ceph-erasure-code-corpus \
 ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 GITVERSION:=$(shell cat .git/refs/heads/master)
 
+DBG_DEBS=ceph-common-dbg_${VER}-${DEBREL}_${ARCH}.deb \
+ceph-fuse-dbg_${VER}-${DEBREL}_${ARCH}.deb \
+ceph-mds-dbg_${VER}-${DEBREL}_${ARCH}.deb \
+ceph-mgr-dbg_${VER}-${DEBREL}_${ARCH}.deb \
+ceph-mon-dbg_${VER}-${DEBREL}_${ARCH}.deb \
+ceph-osd-dbg_${VER}-${DEBREL}_${ARCH}.deb \
+ceph-test-dbg_${VER}-${DEBREL}_${ARCH}.deb \
+libcephfs2-dbg_${VER}-${DEBREL}_${ARCH}.deb \
+librados2-dbg_${VER}-${DEBREL}_${ARCH}.deb \
+libradosstriper1-dbg_${VER}-${DEBREL}_${ARCH}.deb \
+librbd1-dbg_${VER}-${DEBREL}_${ARCH}.deb \
+librgw2-dbg_${VER}-${DEBREL}_${ARCH}.deb \
+radosgw-dbg_${VER}-${DEBREL}_${ARCH}.deb \
+rbd-fuse-dbg_${VER}-${DEBREL}_${ARCH}.deb \
+rbd-mirror-dbg_${VER}-${DEBREL}_${ARCH}.deb \
+rbd-nbd-dbg_${VER}-${DEBREL}_${ARCH}.deb
+
 DEBS=ceph_${VER}-${DEBREL}_${ARCH}.deb \
 ceph-base_${VER}-${DEBREL}_${ARCH}.deb \
 ceph-common_${VER}-${DEBREL}_${ARCH}.deb \
-ceph-common-dbg_${VER}-${DEBREL}_${ARCH}.deb \
 ceph-fuse_${VER}-${DEBREL}_${ARCH}.deb \
-ceph-fuse-dbg_${VER}-${DEBREL}_${ARCH}.deb \
 ceph-mds_${VER}-${DEBREL}_${ARCH}.deb \
-ceph-mds-dbg_${VER}-${DEBREL}_${ARCH}.deb \
 ceph-mgr_${VER}-${DEBREL}_${ARCH}.deb \
-ceph-mgr-dbg_${VER}-${DEBREL}_${ARCH}.deb \
 ceph-mon_${VER}-${DEBREL}_${ARCH}.deb \
-ceph-mon-dbg_${VER}-${DEBREL}_${ARCH}.deb \
 ceph-osd_${VER}-${DEBREL}_${ARCH}.deb \
-ceph-osd-dbg_${VER}-${DEBREL}_${ARCH}.deb \
 ceph-resource-agents_${VER}-${DEBREL}_${ARCH}.deb \
 ceph-test_${VER}-${DEBREL}_${ARCH}.deb \
-ceph-test-dbg_${VER}-${DEBREL}_${ARCH}.deb \
 libcephfs2_${VER}-${DEBREL}_${ARCH}.deb \
-libcephfs2-dbg_${VER}-${DEBREL}_${ARCH}.deb \
 libcephfs-dev_${VER}-${DEBREL}_${ARCH}.deb \
 libcephfs-java_${VER}-${DEBREL}_all.deb \
 libcephfs-jni_${VER}-${DEBREL}_${ARCH}.deb \
 librados2_${VER}-${DEBREL}_${ARCH}.deb \
-librados2-dbg_${VER}-${DEBREL}_${ARCH}.deb \
 librados-dev_${VER}-${DEBREL}_${ARCH}.deb \
 libradosstriper1_${VER}-${DEBREL}_${ARCH}.deb \
-libradosstriper1-dbg_${VER}-${DEBREL}_${ARCH}.deb \
 libradosstriper-dev_${VER}-${DEBREL}_${ARCH}.deb \
 librbd1_${VER}-${DEBREL}_${ARCH}.deb \
-librbd1-dbg_${VER}-${DEBREL}_${ARCH}.deb \
 librbd-dev_${VER}-${DEBREL}_${ARCH}.deb \
 librgw2_${VER}-${DEBREL}_${ARCH}.deb \
-librgw2-dbg_${VER}-${DEBREL}_${ARCH}.deb \
 librgw-dev_${VER}-${DEBREL}_${ARCH}.deb \
 python3-ceph-argparse_${VER}-${DEBREL}_${ARCH}.deb \
 python3-cephfs_${VER}-${DEBREL}_${ARCH}.deb \
@@ -71,20 +77,17 @@ python-rados_${VER}-${DEBREL}_${ARCH}.deb \
 python-rbd_${VER}-${DEBREL}_${ARCH}.deb \
 python-rgw_${VER}-${DEBREL}_${ARCH}.deb \
 radosgw_${VER}-${DEBREL}_${ARCH}.deb \
-radosgw-dbg_${VER}-${DEBREL}_${ARCH}.deb \
 rbd-fuse_${VER}-${DEBREL}_${ARCH}.deb \
-rbd-fuse-dbg_${VER}-${DEBREL}_${ARCH}.deb \
 rbd-mirror_${VER}-${DEBREL}_${ARCH}.deb \
-rbd-mirror-dbg_${VER}-${DEBREL}_${ARCH}.deb \
-rbd-nbd_${VER}-${DEBREL}_${ARCH}.deb \
-rbd-nbd-dbg_${VER}-${DEBREL}_${ARCH}.deb
+rbd-nbd_${VER}-${DEBREL}_${ARCH}.deb
 
-all: ${DEBS}
+all: ${DEBS} ${DBG_DEBS}
        @echo ${DEBS}
+       @echo ${DBG_DEBS}
 
 .PHONY: deb
-deb: ${DEBS}
-${DEBS}: ${SRC} patches
+deb: ${DEBS} ${DBG_DEBS}
+${DEBS} ${DBG_DEBS}: ${SRC} patches
        rm -rf ${SRCDIR}
        tar xf ${SRC}
        cd ${SRCDIR}; ln -s ../patches patches
@@ -92,7 +95,6 @@ ${DEBS}: ${SRC} patches
        cd ${SRCDIR}; rm -rf .pc ./patches
        echo "git clone git://git.proxmox.com/git/ceph.git\\ngit checkout ${GITVERSION}" >  ${SRCDIR}/debian/SOURCE
        echo "debian/SOURCE" >> ${SRCDIR}/debian/docs
-       cd ${SRCDIR}; git tag -m "PVE release tag" "v${VER}-${DEBREL}"
        cd ${SRCDIR}; dpkg-buildpackage -b -uc -us
        @echo ${DEBS}