X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Makefile;h=e7054734bef68fcde322d78ae31f5c4fe6e36dee;hb=cb0157bcf8682eaf75c8e608a9efb3c861e4235f;hp=35b0c1cf67ba6612c154f7586f29056be28011c2;hpb=0432c2e11ebba6867b3b0c7ed11ae2b035df3bd6;p=ceph.git

diff --git a/Makefile b/Makefile
index 35b0c1cf6..e7054734b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,64 +1,53 @@
 RELEASE=5.0
 
 PACKAGE=ceph
-VER=12.0.0
-DEBREL=pve3
+VER=12.2.1
+DEBREL=pve2
 
-SRC=ceph.tar.gz
 SRCDIR=ceph
-
-# everything except boost
-SUBMODULES=ceph-erasure-code-corpus \
- ceph-object-corpus \
- src/Beast \
- src/civetweb \
- src/dpdk \
- src/erasure-code/jerasure/gf-complete \
- src/erasure-code/jerasure/jerasure \
- src/googletest \
- src/isa-l \
- src/lua \
- src/rocksdb \
- src/spdk \
- src/xxHash \
- src/zstd
+BUILDSRC=${SRCDIR}-${VER}
 
 ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
-GITVERSION:=$(shell cat .git/refs/heads/master)
+GITVERSION:=$(shell git rev-parse HEAD)
+
+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 \
+MAIN_DEB=ceph_${VER}-${DEBREL}_${ARCH}.deb
+DEBS_REST=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,39 +60,43 @@ 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 \
+rados-objclass-dev_${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
+DEBS=$(MAIN_DEB) $(DEBS_REST)
 
-all: ${DEBS}
+all: ${DEBS} ${DBG_DEBS}
 	@echo ${DEBS}
+	@echo ${DBG_DEBS}
 
 .PHONY: deb
-deb: ${DEBS}
-${DEBS}: ${SRC} patches
-	rm -rf ${SRCDIR}
-	tar xf ${SRC}
-	cd ${SRCDIR}; ln -s ../patches patches
-	cd ${SRCDIR}; quilt push -a
-	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
+deb: ${DEBS} ${DBG_DEBS}
+${DEBS_REST} ${DBG_DEBS}: $(MAIN_DEB)
+$(MAIN_DEB): patches
+	rm -rf ${BUILDSRC}
+	mkdir ${BUILDSRC}
+	rsync -ra ${SRCDIR}/ ${BUILDSRC}
+	cd ${BUILDSRC}; ln -s ../patches patches
+	cd ${BUILDSRC}; quilt push -a
+	cd ${BUILDSRC}; rm -rf .pc ./patches
+	echo "git clone git://git.proxmox.com/git/ceph.git\\ngit checkout ${GITVERSION}" >  ${BUILDSRC}/debian/SOURCE
+	echo "debian/SOURCE" >> ${BUILDSRC}/debian/docs
+	echo "${GITVERSION}\\nv${VER}" > ${BUILDSRC}/src/.git_version
+	cd ${BUILDSRC}; dpkg-buildpackage -b -uc -us
 	@echo ${DEBS}
 
 .PHONY: download
-download ${SRC}:
-	rm -rf ${SRC} ${SRCDIR}
-	git clone -b v${VER} --depth 1 https://github.com/ceph/ceph.git ${SRCDIR}
-	cd ${SRCDIR}; for module in ${SUBMODULES}; do git submodule update --init $${module}; done
-	# "ceph version" is derived from "git describe"
-	# only drop module history to save space
-	tar czf ${SRC} --exclude ".git/modules" ${SRCDIR}
+download:
+	rm -rf ${SRCDIR}.tmp
+	git clone --recursive -b v${VER} https://github.com/ceph/ceph ${SRCDIR}.tmp
+	cd ${SRCDIR}.tmp; ./make-dist
+	rm -rf ${SRCDIR}
+	mkdir ${SRCDIR}
+	tar -C ${SRCDIR} --strip-components=1 -xf ${SRCDIR}.tmp/ceph-*.tar.bz2
+	# needed because boost and zstd builds fail otherwise
+	find ${SRCDIR} -type f -name ".gitignore" -delete
+	rm -rf ${SRCDIR}.tmp
 
 .PHONY: upload
 upload: ${DEBS}
@@ -113,7 +106,7 @@ distclean: clean
 
 .PHONY: clean
 clean:
-	rm -rf ceph *_all.deb *_${ARCH}.deb *.changes *.dsc *.buildinfo
+	rm -rf ${BUILDSRC} *_all.deb *_${ARCH}.deb *.changes *.dsc *.buildinfo *.tar.gz
 
 .PHONY: dinstall
 dinstall: ${DEB}