X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Makefile;h=9bc9fbe4684c7bf2a3d6cb6d8470e7740e4a5e14;hb=28e407b858acd3bddc89f68583571f771bb42e46;hp=b9b7065d47f2caa767a7ebce88dbbee59666e9bc;hpb=e841ecd40a0ab94f82a46fb7f9c295d3fe7c5c88;p=ceph.git diff --git a/Makefile b/Makefile index b9b7065d4..9bc9fbe46 100644 --- a/Makefile +++ b/Makefile @@ -1,14 +1,14 @@ -RELEASE=5.0 +RELEASE=5.2 PACKAGE=ceph -VER=12.0.3 +VER=12.2.7 DEBREL=pve1 SRCDIR=ceph 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 \ @@ -27,8 +27,8 @@ 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-fuse_${VER}-${DEBREL}_${ARCH}.deb \ ceph-mds_${VER}-${DEBREL}_${ARCH}.deb \ @@ -60,9 +60,11 @@ 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 +DEBS=$(MAIN_DEB) $(DEBS_REST) all: ${DEBS} ${DBG_DEBS} @echo ${DEBS} @@ -70,7 +72,8 @@ all: ${DEBS} ${DBG_DEBS} .PHONY: deb deb: ${DEBS} ${DBG_DEBS} -${DEBS} ${DBG_DEBS}: patches +${DEBS_REST} ${DBG_DEBS}: $(MAIN_DEB) +$(MAIN_DEB): patches rm -rf ${BUILDSRC} mkdir ${BUILDSRC} rsync -ra ${SRCDIR}/ ${BUILDSRC}