From a56af6246b77354bab06a22e4728026059ad4403 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
Date: Wed, 8 Mar 2017 14:13:37 +0100
Subject: [PATCH] switch to Debian corosync package as base

---
 Makefile                             | 55 ++++++++++++++++++----------
 debian/changelog => changelog.Debian |  0
 2 files changed, 36 insertions(+), 19 deletions(-)
 rename debian/changelog => changelog.Debian (100%)

diff --git a/Makefile b/Makefile
index a84bc6f..db4d6f4 100644
--- a/Makefile
+++ b/Makefile
@@ -3,41 +3,58 @@ RELEASE=4.2
 # source from http://www.corosync.org
 
 CSVERSION=2.4.2
-CSRELEASE=2
+CSRELEASE=pve1
+DEBRELEASE=3
 CSDIR=corosync-${CSVERSION}
 CSSRC=corosync-${CSVERSION}.tar.gz
 
 ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 GITVERSION:=$(shell cat .git/refs/heads/master)
 
-DEB1 := corosync-pve_${CSVERSION}-${CSRELEASE}_${ARCH}.deb
-
-DEB2 := libcorosync4-pve_${CSVERSION}-${CSRELEASE}_${ARCH}.deb \
-	libcorosync-pve-dev_${CSVERSION}-${CSRELEASE}_${ARCH}.deb
-
-DEBS := $(DEB1) $(DEB2)
+DEBS=corosync-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: $(DEB1)
-$(DEB2): $(DEB1)
-${DEB1}: ${CSSRC}
+deb: ${DEBS}
+${DEBS}: ${CSSRC}
 	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
-
-	cd ${CSDIR}; dpkg-buildpackage -rfakeroot -b -us -uc
+	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
 
 .PHONY: download
 download:
 	rm -rf ${CSSRC} ${CSSRC}.tmp ${CSDIR}
+	git clone https://anonscm.debian.org/git/debian-ha/corosync.git -b debian/${CSVERSION}-${DEBRELEASE} ${CSDIR}
 	# wget http://build.clusterlabs.org/corosync/releases/${CSSRC}
-	git clone https://github.com/corosync/corosync.git  -b needle ${CSDIR}
-	cd ${CSDIR}; git checkout v${CSVERSION}
-	cd ${CSDIR}; ./autogen.sh
 	tar czf ${CSSRC}.tmp ${CSDIR}
 	mv ${CSSRC}.tmp ${CSSRC}
 
@@ -49,7 +66,7 @@ distclean: clean
 
 .PHONY: clean
 clean:
-	rm -rf *_${ARCH}.deb *.changes *.dsc ${CSDIR} corosync_${CSVERSION}-${CSRELEASE}.tar.gz
+	rm -rf *.deb *.changes *.dsc *.buildinfo ${CSDIR} corosync_${CSVERSION}-${CSRELEASE}.tar.gz
 	find . -name '*~' -exec rm {} ';'
 
 .PHONY: dinstall
diff --git a/debian/changelog b/changelog.Debian
similarity index 100%
rename from debian/changelog
rename to changelog.Debian
-- 
2.39.2