X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Makefile;h=420f83894ae132c89b34f2d717ad25ce77d8a4ef;hb=18d92ca7c59021ccfb5a5674c608dff59eb0a8a5;hp=c2b1650ddb3b2c4ed99b5df40f5f8489587880af;hpb=81eedcae9c6d684efdae63dc481d8be7c714897d;p=ceph.git

diff --git a/Makefile b/Makefile
index c2b1650dd..420f83894 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,7 @@
-RELEASE=6.0
-
 PACKAGE=ceph
-VER=14.2.2
-DEBREL=pve2
+VER != dpkg-parsechangelog -l changelog.Debian -Sversion | cut -d- -f1
+PKGVER != dpkg-parsechangelog -l changelog.Debian -Sversion
+DEBREL=pve1
 
 SRCDIR=ceph
 BUILDSRC=${SRCDIR}-${VER}
@@ -10,63 +9,63 @@ BUILDSRC=${SRCDIR}-${VER}
 ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 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
+DBG_DEBS=ceph-common-dbg_${PKGVER}_${ARCH}.deb \
+ceph-fuse-dbg_${PKGVER}_${ARCH}.deb \
+ceph-mds-dbg_${PKGVER}_${ARCH}.deb \
+ceph-mgr-dbg_${PKGVER}_${ARCH}.deb \
+ceph-mon-dbg_${PKGVER}_${ARCH}.deb \
+ceph-osd-dbg_${PKGVER}_${ARCH}.deb \
+ceph-test-dbg_${PKGVER}_${ARCH}.deb \
+libcephfs2-dbg_${PKGVER}_${ARCH}.deb \
+librados2-dbg_${PKGVER}_${ARCH}.deb \
+libradosstriper1-dbg_${PKGVER}_${ARCH}.deb \
+librbd1-dbg_${PKGVER}_${ARCH}.deb \
+librgw2-dbg_${PKGVER}_${ARCH}.deb \
+radosgw-dbg_${PKGVER}_${ARCH}.deb \
+rbd-fuse-dbg_${PKGVER}_${ARCH}.deb \
+rbd-mirror-dbg_${PKGVER}_${ARCH}.deb \
+rbd-nbd-dbg_${PKGVER}_${ARCH}.deb
 
-MAIN_DEB=ceph_${VER}-${DEBREL}_${ARCH}.deb
-DEBS_REST=ceph-base_${VER}-${DEBREL}_${ARCH}.deb \
-ceph-common_${VER}-${DEBREL}_${ARCH}.deb \
-ceph-fuse_${VER}-${DEBREL}_${ARCH}.deb \
-ceph-mds_${VER}-${DEBREL}_${ARCH}.deb \
-ceph-mgr_${VER}-${DEBREL}_${ARCH}.deb \
-ceph-mon_${VER}-${DEBREL}_${ARCH}.deb \
-ceph-osd_${VER}-${DEBREL}_${ARCH}.deb \
-ceph-resource-agents_${VER}-${DEBREL}_${ARCH}.deb \
-ceph-test_${VER}-${DEBREL}_${ARCH}.deb \
-libcephfs2_${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 \
-librados-dev_${VER}-${DEBREL}_${ARCH}.deb \
-libradosstriper1_${VER}-${DEBREL}_${ARCH}.deb \
-libradosstriper-dev_${VER}-${DEBREL}_${ARCH}.deb \
-librbd1_${VER}-${DEBREL}_${ARCH}.deb \
-librbd-dev_${VER}-${DEBREL}_${ARCH}.deb \
-librgw2_${VER}-${DEBREL}_${ARCH}.deb \
-librgw-dev_${VER}-${DEBREL}_${ARCH}.deb \
-python3-ceph-argparse_${VER}-${DEBREL}_all.deb \
-python3-cephfs_${VER}-${DEBREL}_${ARCH}.deb \
-python3-rados_${VER}-${DEBREL}_${ARCH}.deb \
-python3-rbd_${VER}-${DEBREL}_${ARCH}.deb \
-python3-rgw_${VER}-${DEBREL}_${ARCH}.deb \
-python-ceph_${VER}-${DEBREL}_${ARCH}.deb \
-python-cephfs_${VER}-${DEBREL}_${ARCH}.deb \
-python-rados_${VER}-${DEBREL}_${ARCH}.deb \
-python-rbd_${VER}-${DEBREL}_${ARCH}.deb \
-python-rgw_${VER}-${DEBREL}_${ARCH}.deb \
-radosgw_${VER}-${DEBREL}_${ARCH}.deb \
-rados-objclass-dev_${VER}-${DEBREL}_${ARCH}.deb \
-rbd-fuse_${VER}-${DEBREL}_${ARCH}.deb \
-rbd-mirror_${VER}-${DEBREL}_${ARCH}.deb \
-rbd-nbd_${VER}-${DEBREL}_${ARCH}.deb
+MAIN_DEB=ceph_${PKGVER}_${ARCH}.deb
+DEBS_REST=ceph-base_${PKGVER}_${ARCH}.deb \
+ceph-common_${PKGVER}_${ARCH}.deb \
+ceph-fuse_${PKGVER}_${ARCH}.deb \
+ceph-mds_${PKGVER}_${ARCH}.deb \
+ceph-mgr_${PKGVER}_${ARCH}.deb \
+ceph-mon_${PKGVER}_${ARCH}.deb \
+ceph-osd_${PKGVER}_${ARCH}.deb \
+ceph-resource-agents_${PKGVER}_${ARCH}.deb \
+ceph-test_${PKGVER}_${ARCH}.deb \
+libcephfs2_${PKGVER}_${ARCH}.deb \
+libcephfs-dev_${PKGVER}_${ARCH}.deb \
+libcephfs-java_${PKGVER}_all.deb \
+libcephfs-jni_${PKGVER}_${ARCH}.deb \
+librados2_${PKGVER}_${ARCH}.deb \
+librados-dev_${PKGVER}_${ARCH}.deb \
+libradosstriper1_${PKGVER}_${ARCH}.deb \
+libradosstriper-dev_${PKGVER}_${ARCH}.deb \
+librbd1_${PKGVER}_${ARCH}.deb \
+librbd-dev_${PKGVER}_${ARCH}.deb \
+librgw2_${PKGVER}_${ARCH}.deb \
+librgw-dev_${PKGVER}_${ARCH}.deb \
+python3-ceph-argparse_${PKGVER}_all.deb \
+python3-cephfs_${PKGVER}_${ARCH}.deb \
+python3-rados_${PKGVER}_${ARCH}.deb \
+python3-rbd_${PKGVER}_${ARCH}.deb \
+python3-rgw_${PKGVER}_${ARCH}.deb \
+python3-ceph_${PKGVER}_${ARCH}.deb \
+python3-cephfs_${PKGVER}_${ARCH}.deb \
+python3-rados_${PKGVER}_${ARCH}.deb \
+python3-rbd_${PKGVER}_${ARCH}.deb \
+python3-rgw_${PKGVER}_${ARCH}.deb \
+radosgw_${PKGVER}_${ARCH}.deb \
+rados-objclass-dev_${PKGVER}_${ARCH}.deb \
+rbd-fuse_${PKGVER}_${ARCH}.deb \
+rbd-mirror_${PKGVER}_${ARCH}.deb \
+rbd-nbd_${PKGVER}_${ARCH}.deb
 DEBS=$(MAIN_DEB) $(DEBS_REST)
 
-DSC=ceph_${VER}-${DEBREL}.dsc
+DSC=ceph_${PKGVER}.dsc
 
 all: ${DEBS} ${DBG_DEBS}
 	@echo ${DEBS}
@@ -81,7 +80,7 @@ ${BUILDSRC}: ${SRCDIR} patches
 	cd $@.tmp; rm -rf .pc ./patches
 	echo "git clone git://git.proxmox.com/git/ceph.git\\ngit checkout ${GITVERSION}" >  $@.tmp/debian/SOURCE
 	echo "debian/SOURCE" >> $@.tmp/debian/docs
-	echo "${GITVERSION}\\nv${VER}" > $@.tmp/src/.git_version
+	echo "${GITVERSION}\\n${VER}" > $@.tmp/src/.git_version
 	cp changelog.Debian $@.tmp/debian/changelog
 	mv $@.tmp $@
 
@@ -99,21 +98,22 @@ ${DSC}: ${BUILDSRC}
 	cd ${BUILDSRC}; dpkg-buildpackage -S -uc -us -d -nc
 	@echo ${DSC}
 
+# NOTE: always downloads latest version!
 .PHONY: download
 download:
-	# FIXME: better verification (download dsc and use dscverify with ceph.com release key?)
-	dget --allow-unauthenticated --download-only 'https://download.ceph.com/debian-nautilus/pool/main/c/ceph/ceph_${VER}.orig.tar.gz'
 	rm -rf ${SRCDIR}.tmp ${SRCDIR}
-	mkdir ${SRCDIR}.tmp
-	tar -C ${SRCDIR}.tmp --strip-components=1 -xf ceph_${VER}.orig.tar.gz
-	# needed because boost and zstd builds fail otherwise
-	find ${SRCDIR}.tmp -type f -name ".gitignore" -delete
+	dgit -cdgit-distro.ceph.archive-query=aptget: -cdgit-distro.ceph.mirror=http://download.ceph.com/debian-pacific -cdgit-distro.ceph.git-check=false --apt-get:--option=Dir::Etc::Trusted=${CURDIR}/upstream-key.asc -d ceph clone ceph focal ./${SRCDIR}.tmp
+	@echo "WARNING"
+	@echo "Check output above for verification errors!"
+	@echo "WARNING"
+	rm -rf ${SRCDIR}.tmp/.git
+	find ${SRCDIR}.tmp/ -type f -name '.gitignore' -delete
 	mv ${SRCDIR}.tmp/debian/changelog ${SRCDIR}.tmp/changelog.upstream
 	mv ${SRCDIR}.tmp ${SRCDIR}
 
 .PHONY: upload
 upload: ${DEBS}
-	tar cf - ${DEBS} | ssh repoman@repo.proxmox.com upload --product ceph-luminous --dist stretch --arch ${ARCH}
+	tar cf - ${DEBS} | ssh repoman@repo.proxmox.com upload --product ceph-pacific --dist bullseye --arch ${ARCH}
 
 distclean: clean