[pve-devel] [RFC corosync-pve 1/5] switch to Debian corosync package as base

Fabian Grünbichler f.gruenbichler at proxmox.com
Wed Mar 8 14:22:05 CET 2017


Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
---
 changelog.Debian | 178 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 Makefile         |  55 +++++++++++------
 debian/changelog | 178 -------------------------------------------------------
 3 files changed, 214 insertions(+), 197 deletions(-)
 create mode 100644 changelog.Debian
 delete mode 100644 debian/changelog

diff --git a/changelog.Debian b/changelog.Debian
new file mode 100644
index 0000000..a2c55da
--- /dev/null
+++ b/changelog.Debian
@@ -0,0 +1,178 @@
+corosync-pve (2.4.2-2) unstable; urgency=medium
+
+  * rebuild for PVE 5.0 / Debian Stretch
+
+ -- Proxmox Support Team <support at proxmox.com>  Mon, 6 Mar 2017 09:30:57 +0100
+
+corosync-pve (2.4.2-1) unstable; urgency=medium
+
+  * update to corosync 2.4.2
+
+ -- Proxmox Support Team <support at proxmox.com>  Wed, 08 Feb 2017 14:08:49 +0100
+
+corosync-pve (2.4.0-1) unstable; urgency=medium
+
+  * update to v2.4.0
+
+ -- Proxmox Support Team <support at proxmox.com>  Sat, 16 Jul 2016 10:27:49 +0200
+
+corosync-pve (2.3.5-2) unstable; urgency=medium
+
+  * update to latest versions from branch needle
+    (commit e2b6b25126a3e8f2caefcb8ccde67788c63fbeb5)
+
+  * remove patch 0001-totem-swap-unicast-and-multicast-bind-order.patch (upstream)
+
+ -- Proxmox Support Team <support at proxmox.com>  Thu, 03 Dec 2015 14:49:43 +0100
+
+corosync-pve (2.3.5-1) unstable; urgency=medium
+
+  * update to v2.3.5
+
+ -- Proxmox Support Team <support at proxmox.com>  Mon, 21 Sep 2015 12:02:49 +0200
+
+corosync-pve (2.3.4-2) unstable; urgency=medium
+
+  * update to latest upstream (commit 82526d2fe9137e8b604f1bbae6d6e39ba41377f9)
+
+ -- Proxmox Support Team <support at proxmox.com>  Mon, 30 Mar 2015 19:10:35 +0200
+
+corosync-pve (2.3.4-1) unstable; urgency=medium
+
+  * update to 2.3.4
+
+  * recompile for Debian Jessie
+
+ -- Proxmox Support Team <support at proxmox.com>  Mon, 23 Feb 2015 08:20:52 +0100
+
+corosync-pve (1.4.7-1) unstable; urgency=low
+
+  * update to 1.4.7
+
+ -- Proxmox Support Team <support at proxmox.com>  Tue, 22 Jul 2014 06:17:13 +0200
+
+corosync-pve (1.4.6-1) unstable; urgency=low
+
+  * update to 1.4.6
+
+ -- Proxmox Support Team <support at proxmox.com>  Fri, 09 May 2014 07:14:06 +0200
+
+corosync-pve (1.4.5-1) unstable; urgency=low
+
+  *  update to 1.4.5
+
+ -- Proxmox Support Team <support at proxmox.com>  Fri, 15 Mar 2013 06:35:02 +0100
+
+corosync-pve (1.4.4-3) unstable; urgency=low
+
+  * run at high priority using setpriority(-20)
+
+ -- Proxmox Support Team <support at proxmox.com>  Tue, 15 Jan 2013 12:54:02 +0100
+
+corosync-pve (1.4.4-2) unstable; urgency=low
+
+  * disable SCHED_RR (RT_GROUP_SCHED was disabled in our kernel
+    anyways). In newer kernels this is enabled, but causes corosync to
+    crash.
+
+ -- Proxmox Support Team <support at proxmox.com>  Fri, 11 Jan 2013 15:39:40 +0100
+
+corosync-pve (1.4.4-1) unstable; urgency=low
+
+  *  update to 1.4.4
+
+ -- Proxmox Support Team <support at proxmox.com>  Tue, 02 Oct 2012 09:41:59 +0200
+
+corosync-pve (1.4.3-1) unstable; urgency=low
+
+  * update to 1.4.3
+
+ -- Proxmox Support Team <support at proxmox.com>  Thu, 12 Apr 2012 12:54:10 +0200
+
+corosync-pve (1.4.1-1) unstable; urgency=low
+
+  * update to 1.4.1
+
+ -- Proxmox Support Team <support at proxmox.com>  Tue, 26 Jul 2011 11:49:17 +0200
+
+corosync-pve (1.4.0-1) unstable; urgency=low
+
+  * update to 1.4.0
+  
+  * remove fix-schedrr-warning.patch (alread in 1.4.0)
+
+ -- Proxmox Support Team <support at proxmox.com>  Tue, 19 Jul 2011 12:36:54 +0200
+
+corosync-pve (1.3.1-1) unstable; urgency=low
+
+  * update to latest stable
+
+ -- Proxmox Support Team <support at proxmox.com>  Thu, 23 Jun 2011 06:52:20 +0200
+
+corosync-pve (1.3.0-1) unstable; urgency=low
+
+  * update to latest stable
+
+ -- Proxmox Support Team <support at proxmox.com>  Thu, 02 Dec 2010 07:11:10 +0100
+
+corosync-pve (1.2.8-1) unstable; urgency=low
+
+  *  update to latest stable
+
+ -- Proxmox Support Team <support at proxmox.com>  Wed, 06 Oct 2010 13:24:24 +0200
+
+corosync-pve (1.2.0-1) unstable; urgency=low
+
+  * add patches/cpg-join-fix.diff, see
+  https://bugzilla.redhat.com/show_bug.cgi?id=568356
+  
+  * update to latest stable
+  
+  * do not create/installe /etc/corosync/* - we use cman instead
+  
+  * delete init.d script - we use cman instead
+
+ -- Proxmox Support Team <support at proxmox.com>  Thu, 21 Jan 2010 13:50:43 +0100
+
+corosync-pve (1.1.2-1) unstable; urgency=low
+
+  *  update to latest stable
+
+ -- Proxmox Support Team <support at proxmox.com>  Fri, 23 Oct 2009 11:41:04 +0200
+
+corosync-pve (1.1.1-1) unstable; urgency=low
+
+  *  update to latest stable
+
+ -- Proxmox Support Team <support at proxmox.com>  Thu, 22 Oct 2009 12:46:53 +0200
+
+corosync-pve (1.0-1) unstable; urgency=low
+
+  * update to latest trunc
+  
+  * use quilt instead of dpatch
+  
+  * use /dev/urandom instead of /dev/random for key generation
+  
+  * new config file localtion: /etc/corosync/corosync.conf
+  
+  * new key location: /etc/corosync/authkey
+  
+  * new default configuration: secauth = on
+  
+  * auto-generate authkey in postinst script if it does not exist
+
+ -- Proxmox Support Team <support at proxmox.com>  Mon, 08 Jun 2009 03:28:34 -0400
+
+corosync-pve (0.95-1) unstable; urgency=low
+
+  * update to 0.95
+
+ -- Proxmox Support Team <support at proxmox.com>  Wed, 01 Apr 2009 10:07:13 -0400
+
+corosync-pve (0.94-1) unstable; urgency=low
+
+  * Initial release.
+
+ -- Proxmox Support Team <support at proxmox.com>  Mon, 30 Mar 2009 06:55:24 -0400
+
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/debian/changelog
deleted file mode 100644
index a2c55da..0000000
--- a/debian/changelog
+++ /dev/null
@@ -1,178 +0,0 @@
-corosync-pve (2.4.2-2) unstable; urgency=medium
-
-  * rebuild for PVE 5.0 / Debian Stretch
-
- -- Proxmox Support Team <support at proxmox.com>  Mon, 6 Mar 2017 09:30:57 +0100
-
-corosync-pve (2.4.2-1) unstable; urgency=medium
-
-  * update to corosync 2.4.2
-
- -- Proxmox Support Team <support at proxmox.com>  Wed, 08 Feb 2017 14:08:49 +0100
-
-corosync-pve (2.4.0-1) unstable; urgency=medium
-
-  * update to v2.4.0
-
- -- Proxmox Support Team <support at proxmox.com>  Sat, 16 Jul 2016 10:27:49 +0200
-
-corosync-pve (2.3.5-2) unstable; urgency=medium
-
-  * update to latest versions from branch needle
-    (commit e2b6b25126a3e8f2caefcb8ccde67788c63fbeb5)
-
-  * remove patch 0001-totem-swap-unicast-and-multicast-bind-order.patch (upstream)
-
- -- Proxmox Support Team <support at proxmox.com>  Thu, 03 Dec 2015 14:49:43 +0100
-
-corosync-pve (2.3.5-1) unstable; urgency=medium
-
-  * update to v2.3.5
-
- -- Proxmox Support Team <support at proxmox.com>  Mon, 21 Sep 2015 12:02:49 +0200
-
-corosync-pve (2.3.4-2) unstable; urgency=medium
-
-  * update to latest upstream (commit 82526d2fe9137e8b604f1bbae6d6e39ba41377f9)
-
- -- Proxmox Support Team <support at proxmox.com>  Mon, 30 Mar 2015 19:10:35 +0200
-
-corosync-pve (2.3.4-1) unstable; urgency=medium
-
-  * update to 2.3.4
-
-  * recompile for Debian Jessie
-
- -- Proxmox Support Team <support at proxmox.com>  Mon, 23 Feb 2015 08:20:52 +0100
-
-corosync-pve (1.4.7-1) unstable; urgency=low
-
-  * update to 1.4.7
-
- -- Proxmox Support Team <support at proxmox.com>  Tue, 22 Jul 2014 06:17:13 +0200
-
-corosync-pve (1.4.6-1) unstable; urgency=low
-
-  * update to 1.4.6
-
- -- Proxmox Support Team <support at proxmox.com>  Fri, 09 May 2014 07:14:06 +0200
-
-corosync-pve (1.4.5-1) unstable; urgency=low
-
-  *  update to 1.4.5
-
- -- Proxmox Support Team <support at proxmox.com>  Fri, 15 Mar 2013 06:35:02 +0100
-
-corosync-pve (1.4.4-3) unstable; urgency=low
-
-  * run at high priority using setpriority(-20)
-
- -- Proxmox Support Team <support at proxmox.com>  Tue, 15 Jan 2013 12:54:02 +0100
-
-corosync-pve (1.4.4-2) unstable; urgency=low
-
-  * disable SCHED_RR (RT_GROUP_SCHED was disabled in our kernel
-    anyways). In newer kernels this is enabled, but causes corosync to
-    crash.
-
- -- Proxmox Support Team <support at proxmox.com>  Fri, 11 Jan 2013 15:39:40 +0100
-
-corosync-pve (1.4.4-1) unstable; urgency=low
-
-  *  update to 1.4.4
-
- -- Proxmox Support Team <support at proxmox.com>  Tue, 02 Oct 2012 09:41:59 +0200
-
-corosync-pve (1.4.3-1) unstable; urgency=low
-
-  * update to 1.4.3
-
- -- Proxmox Support Team <support at proxmox.com>  Thu, 12 Apr 2012 12:54:10 +0200
-
-corosync-pve (1.4.1-1) unstable; urgency=low
-
-  * update to 1.4.1
-
- -- Proxmox Support Team <support at proxmox.com>  Tue, 26 Jul 2011 11:49:17 +0200
-
-corosync-pve (1.4.0-1) unstable; urgency=low
-
-  * update to 1.4.0
-  
-  * remove fix-schedrr-warning.patch (alread in 1.4.0)
-
- -- Proxmox Support Team <support at proxmox.com>  Tue, 19 Jul 2011 12:36:54 +0200
-
-corosync-pve (1.3.1-1) unstable; urgency=low
-
-  * update to latest stable
-
- -- Proxmox Support Team <support at proxmox.com>  Thu, 23 Jun 2011 06:52:20 +0200
-
-corosync-pve (1.3.0-1) unstable; urgency=low
-
-  * update to latest stable
-
- -- Proxmox Support Team <support at proxmox.com>  Thu, 02 Dec 2010 07:11:10 +0100
-
-corosync-pve (1.2.8-1) unstable; urgency=low
-
-  *  update to latest stable
-
- -- Proxmox Support Team <support at proxmox.com>  Wed, 06 Oct 2010 13:24:24 +0200
-
-corosync-pve (1.2.0-1) unstable; urgency=low
-
-  * add patches/cpg-join-fix.diff, see
-  https://bugzilla.redhat.com/show_bug.cgi?id=568356
-  
-  * update to latest stable
-  
-  * do not create/installe /etc/corosync/* - we use cman instead
-  
-  * delete init.d script - we use cman instead
-
- -- Proxmox Support Team <support at proxmox.com>  Thu, 21 Jan 2010 13:50:43 +0100
-
-corosync-pve (1.1.2-1) unstable; urgency=low
-
-  *  update to latest stable
-
- -- Proxmox Support Team <support at proxmox.com>  Fri, 23 Oct 2009 11:41:04 +0200
-
-corosync-pve (1.1.1-1) unstable; urgency=low
-
-  *  update to latest stable
-
- -- Proxmox Support Team <support at proxmox.com>  Thu, 22 Oct 2009 12:46:53 +0200
-
-corosync-pve (1.0-1) unstable; urgency=low
-
-  * update to latest trunc
-  
-  * use quilt instead of dpatch
-  
-  * use /dev/urandom instead of /dev/random for key generation
-  
-  * new config file localtion: /etc/corosync/corosync.conf
-  
-  * new key location: /etc/corosync/authkey
-  
-  * new default configuration: secauth = on
-  
-  * auto-generate authkey in postinst script if it does not exist
-
- -- Proxmox Support Team <support at proxmox.com>  Mon, 08 Jun 2009 03:28:34 -0400
-
-corosync-pve (0.95-1) unstable; urgency=low
-
-  * update to 0.95
-
- -- Proxmox Support Team <support at proxmox.com>  Wed, 01 Apr 2009 10:07:13 -0400
-
-corosync-pve (0.94-1) unstable; urgency=low
-
-  * Initial release.
-
- -- Proxmox Support Team <support at proxmox.com>  Mon, 30 Mar 2009 06:55:24 -0400
-
-- 
2.1.4





More information about the pve-devel mailing list