[pve-devel] r6328 - in corosync/trunk: . debian

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-07-19 12:46:04 +0200 (Tue, 19 Jul 2011)
New Revision: 6328

Added:
   corosync/trunk/corosync-1.4.0.orig.tar.gz
Removed:
   corosync/trunk/corosync-1.3.1.orig.tar.gz
   corosync/trunk/fix-schedrr-warning.patch
Modified:
   corosync/trunk/Makefile
   corosync/trunk/debian/changelog
Log:
update to 1.4.0


Modified: corosync/trunk/Makefile
===================================================================
--- corosync/trunk/Makefile	2011-07-19 10:32:15 UTC (rev 6327)
+++ corosync/trunk/Makefile	2011-07-19 10:46:04 UTC (rev 6328)
@@ -1,6 +1,6 @@
 RELEASE=2.0
 
-CSVERSION=1.3.1
+CSVERSION=1.4.0
 CSRELEASE=1
 CSDIR=corosync-${CSVERSION}
 CSSRC=corosync-${CSVERSION}.orig.tar.gz
@@ -19,13 +19,12 @@
 	echo ${DEBS}
 	rm -rf ${CSDIR}
 	tar xf ${CSSRC} 
-	cd ${CSDIR}; patch -p1 < ../fix-schedrr-warning.patch
 	cp -a debian ${CSDIR}/debian
 	cd ${CSDIR}; dpkg-buildpackage -rfakeroot -b -us -uc
 
 download:
 	rm -rf corosync-${CSVERSION} corosync-${CSVERSION}.orig.tar.gz
-	git clone git://corosync.org/corosync.git -b flatiron-1.3 corosync-${CSVERSION}
+	git clone git://corosync.org/corosync.git -b v${CSVERSION} corosync-${CSVERSION}
 	cd corosync-${CSVERSION}; ./autogen.sh
 	tar czf corosync-${CSVERSION}.orig.tar.gz corosync-${CSVERSION}/
 

Deleted: corosync/trunk/corosync-1.3.1.orig.tar.gz
===================================================================
(Binary files differ)

Added: corosync/trunk/corosync-1.4.0.orig.tar.gz
===================================================================
(Binary files differ)


Property changes on: corosync/trunk/corosync-1.4.0.orig.tar.gz
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: corosync/trunk/debian/changelog
===================================================================
--- corosync/trunk/debian/changelog	2011-07-19 10:32:15 UTC (rev 6327)
+++ corosync/trunk/debian/changelog	2011-07-19 10:46:04 UTC (rev 6328)
@@ -1,3 +1,11 @@
+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

Deleted: corosync/trunk/fix-schedrr-warning.patch
===================================================================
--- corosync/trunk/fix-schedrr-warning.patch	2011-07-19 10:32:15 UTC (rev 6327)
+++ corosync/trunk/fix-schedrr-warning.patch	2011-07-19 10:46:04 UTC (rev 6328)
@@ -1,14 +0,0 @@
---- corosync-1.3.1/exec/main.c.org	2011-06-23 06:58:38.000000000 +0200
-+++ corosync-1.3.1/exec/main.c	2011-06-23 06:58:44.000000000 +0200
-@@ -1230,10 +1230,10 @@
- 		if (res == -1) {
- 			char error_str[100];
- 			strerror_r (errno, error_str, 100);
--			global_sched_param.sched_priority = 0;
- 			log_printf (LOGSYS_LEVEL_WARNING, "Could not set SCHED_RR at priority %d: %s\n",
- 				global_sched_param.sched_priority, error_str);
- 
-+			global_sched_param.sched_priority = 0;
- 			logsys_thread_priority_set (SCHED_OTHER, NULL, 1);
- 		} else {
- 			/*