X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Makefile;h=d28171236cf3af7b1302e9aa9be65de185612e38;hb=82342947a639e0f78b1e31e2fc0bfab733ea1676;hp=e54697f4e423b14381e12b9e611f47b49f79cd40;hpb=0320eacf36c76a25ae8c3eac56a15855e6bce5f2;p=corosync-pve.git

diff --git a/Makefile b/Makefile
index e54697f..d281712 100644
--- a/Makefile
+++ b/Makefile
@@ -1,48 +1,73 @@
-RELEASE=3.2
+RELEASE=5.0
 
 # source from http://www.corosync.org
 
-CSVERSION=1.4.7
-CSRELEASE=1
+CSVERSION=2.4.4
+CSRELEASE=pve5
+DEBRELEASE=3
 CSDIR=corosync-${CSVERSION}
-CSSRC=corosync-${CSVERSION}.orig.tar.gz
+CSSRC=corosync_${CSVERSION}.orig.tar.gz
 
 ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 GITVERSION:=$(shell cat .git/refs/heads/master)
 
-DEBS=									\
-	corosync-pve_${CSVERSION}-${CSRELEASE}_${ARCH}.deb 		\
-	libcorosync4-pve_${CSVERSION}-${CSRELEASE}_${ARCH}.deb 		\
-	libcorosync-pve-dev_${CSVERSION}-${CSRELEASE}_${ARCH}.deb
+DEBS=corosync-pve_${CSVERSION}-${CSRELEASE}_all.deb \
+libcorosync4-pve_${CSVERSION}-${CSRELEASE}_all.deb \
+corosync_${CSVERSION}-${CSRELEASE}_${ARCH}.deb \
+corosync-notifyd_${CSVERSION}-${CSRELEASE}_${ARCH}.deb \
+corosync-qdevice_${CSVERSION}-${CSRELEASE}_${ARCH}.deb \
+corosync-qnetd_${CSVERSION}-${CSRELEASE}_${ARCH}.deb \
+corosync-doc_${CSVERSION}-${CSRELEASE}_all.deb \
+corosync-dev_${CSVERSION}-${CSRELEASE}_all.deb \
+libcfg6_${CSVERSION}-${CSRELEASE}_${ARCH}.deb \
+libcmap4_${CSVERSION}-${CSRELEASE}_${ARCH}.deb \
+libcorosync-common4_${CSVERSION}-${CSRELEASE}_${ARCH}.deb \
+libcpg4_${CSVERSION}-${CSRELEASE}_${ARCH}.deb \
+libquorum5_${CSVERSION}-${CSRELEASE}_${ARCH}.deb \
+libsam4_${CSVERSION}-${CSRELEASE}_${ARCH}.deb \
+libtotem-pg5_${CSVERSION}-${CSRELEASE}_${ARCH}.deb \
+libvotequorum8_${CSVERSION}-${CSRELEASE}_${ARCH}.deb \
+libcfg-dev_${CSVERSION}-${CSRELEASE}_${ARCH}.deb \
+libcmap-dev_${CSVERSION}-${CSRELEASE}_${ARCH}.deb \
+libcorosync-common-dev_${CSVERSION}-${CSRELEASE}_${ARCH}.deb \
+libcpg-dev_${CSVERSION}-${CSRELEASE}_${ARCH}.deb \
+libquorum-dev_${CSVERSION}-${CSRELEASE}_${ARCH}.deb \
+libsam-dev_${CSVERSION}-${CSRELEASE}_${ARCH}.deb \
+libtotem-pg-dev_${CSVERSION}-${CSRELEASE}_${ARCH}.deb \
+libvotequorum-dev_${CSVERSION}-${CSRELEASE}_${ARCH}.deb
 
 all: ${DEBS}
 	echo ${DEBS}
 
+.PHONY: deb
+deb: ${DEBS}
 ${DEBS}: ${CSSRC}
-	echo ${DEBS}
 	rm -rf ${CSDIR}
-	tar xf ${CSSRC} 
-	cp -a debian ${CSDIR}/debian
-	echo "git clone git://git.proxmox.com/git/corosync-pve.git\\ngit checkout ${GITVERSION}" >  ${CSDIR}/debian/SOURCE
+	tar xf ${CSSRC}
+	mv ${CSDIR}/debian/changelog ${CSDIR}/debian/changelog.org
+	cat changelog.Debian ${CSDIR}/debian/changelog.org > ${CSDIR}/debian/changelog
+	cd ${CSDIR}; ln -s ../patches patches
+	cd ${CSDIR}; quilt push -a
+	cd ${CSDIR}; rm -rf .pc ./patches
+	cd ${CSDIR}; dpkg-buildpackage -b -us -uc
 
-	cd ${CSDIR}; dpkg-buildpackage -rfakeroot -b -us -uc
+.PHONY: download
+download:
+	rm -rf ${CSSRC} ${CSSRC}.tmp ${CSDIR}
+	git clone https://salsa.debian.org/ha-team/corosync.git -b debian/${CSVERSION}-${DEBRELEASE} ${CSDIR}
+	tar czf ${CSSRC}.tmp ${CSDIR}
+	mv ${CSSRC}.tmp ${CSSRC}
 
 .PHONY: upload
 upload: ${DEBS}
-	umount /pve/${RELEASE}; mount /pve/${RELEASE} -o rw 
-	mkdir -p /pve/${RELEASE}/extra
-	rm -f /pve/${RELEASE}/extra/corosync*.deb
-	rm -f /pve/${RELEASE}/extra/libcorosync*.deb
-	rm -f /pve/${RELEASE}/extra/Packages*
-	cp ${DEBS} /pve/${RELEASE}/extra
-	cd /pve/${RELEASE}/extra; dpkg-scanpackages . /dev/null > Packages; gzip -9c Packages > Packages.gz
-	umount /pve/${RELEASE}; mount /pve/${RELEASE} -o ro
+	tar cf - ${DEBS} | ssh -X repoman@repo.proxmox.com -- upload --product pve --dist stretch --arch ${ARCH}
 
 distclean: clean
 
 .PHONY: clean
 clean:
-	rm -rf *_${ARCH}.deb *.changes *.dsc ${CSDIR} corosync_${CSVERSION}-${CSRELEASE}.tar.gz
+	rm -rf *.deb *.changes *.dsc *.buildinfo ${CSDIR}
+	find . -name '*~' -exec rm {} ';'
 
 .PHONY: dinstall
 dinstall: ${DEBS}