build: pull changelog out of patches

[ceph.git] / Makefile

diff --git a/Makefile b/Makefile
index 67171c758f37dea420c2ef8310f4af04ff526ccf..582d27904b437728e04302019a1f1b846bb211dc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
-RELEASE=5.0
+RELEASE=5.3
 
 PACKAGE=ceph
-VER=12.1.0
-DEBREL=pve2
+VER=12.2.11
+DEBREL=pve1
 
 SRCDIR=ceph
 BUILDSRC=${SRCDIR}-${VER}
@@ -28,8 +28,7 @@ rbd-mirror-dbg_${VER}-${DEBREL}_${ARCH}.deb \
 rbd-nbd-dbg_${VER}-${DEBREL}_${ARCH}.deb
 
 MAIN_DEB=ceph_${VER}-${DEBREL}_${ARCH}.deb
-DEBS_REST=$(MAIN_DEB) \
-ceph-base_${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 \
@@ -61,31 +60,44 @@ 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)
 
+DSC=ceph_${VER}-${DEBREL}.dsc
+
 all: ${DEBS} ${DBG_DEBS}
        @echo ${DEBS}
        @echo ${DBG_DEBS}
 
+${BUILDSRC}: ${SRCDIR} patches
+       rm -rf $@
+       mkdir $@.tmp
+       rsync -ra ${SRCDIR}/ $@.tmp
+       cd $@.tmp; ln -s ../patches patches
+       cd $@.tmp; quilt push -a
+       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
+       cp changelog.Debian $@.tmp/debian/changelog
+       mv $@.tmp $@
+
 .PHONY: deb
 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
+$(MAIN_DEB): ${BUILDSRC}
        cd ${BUILDSRC}; dpkg-buildpackage -b -uc -us
        @echo ${DEBS}
 
+.PHONY: dsc
+dsc: ${DSC}
+${DSC}: ${BUILDSRC}
+       cd ${BUILDSRC}; dpkg-buildpackage -S -uc -us -d -nc
+       @echo ${DSC}
+
 .PHONY: download
 download:
        rm -rf ${SRCDIR}.tmp
@@ -96,6 +108,7 @@ download:
        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
+       mv ${SRCDIR}/debian/changelog ${SRCDIR}/changelog.upstream
        rm -rf ${SRCDIR}.tmp
 
 .PHONY: upload