X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Makefile;h=71007fec9054c6c98aeabb5403e207666532c8da;hb=cbb314ce1fc33edc5f01637d205cf43429322b5a;hp=90f3a9f0c8248c7edc630c5715b61da1035f0ebd;hpb=26cbb7ec2e7864aaa43528631331338f1ea55775;p=ceph.git diff --git a/Makefile b/Makefile index 90f3a9f0c..71007fec9 100644 --- a/Makefile +++ b/Makefile @@ -1,14 +1,14 @@ RELEASE=5.0 PACKAGE=ceph -VER=12.0.3 -DEBREL=pve2 +VER=12.1.3 +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,7 +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 \ +MAIN_DEB=ceph_${VER}-${DEBREL}_${ARCH}.deb +DEBS_REST=$(MAIN_DEB) \ ceph-base_${VER}-${DEBREL}_${ARCH}.deb \ ceph-common_${VER}-${DEBREL}_${ARCH}.deb \ ceph-fuse_${VER}-${DEBREL}_${ARCH}.deb \ @@ -63,6 +64,7 @@ radosgw_${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}