From 6bde5bd7302d9eeca63d55c8b57a6c544e56fe8c Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 8 Oct 2011 11:42:06 +0200 Subject: push pacemaker stuff in a usable state. --- package/corosync/Makefile | 7 ++++--- package/corosync/patches/patch-Makefile_in | 11 ----------- package/corosync/patches/patch-tools_corosync-keygen_c | 4 ++-- 3 files changed, 6 insertions(+), 16 deletions(-) delete mode 100644 package/corosync/patches/patch-Makefile_in (limited to 'package/corosync') diff --git a/package/corosync/Makefile b/package/corosync/Makefile index 378fd618a..eb5ae8197 100644 --- a/package/corosync/Makefile +++ b/package/corosync/Makefile @@ -4,13 +4,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:= corosync -PKG_VERSION:= 1.3.1 +PKG_VERSION:= 1.4.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= c58459a009a3a9d0b9c00e276a190d90 +PKG_MD5SUM:= 66231146af210637393748add091021d PKG_DESCR:= Cluster Engine PKG_SECTION:= ha +PKG_DEPENDS:= cluster-glue PKG_URL:= http://www.corosync.org/ -PKG_SITES:= http://openadk.org/distfiles/ +PKG_SITES:= ftp://ftp:downloads@ftp.corosync.org/downloads/corosync-1.4.1/ PKG_CFLINE_COROSYNC:= select ADK_KERNEL_IP_MULTICAST diff --git a/package/corosync/patches/patch-Makefile_in b/package/corosync/patches/patch-Makefile_in deleted file mode 100644 index 4fc1ef74a..000000000 --- a/package/corosync/patches/patch-Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ ---- corosync-1.3.1.orig/Makefile.in 2011-04-25 04:39:52.000000000 +0200 -+++ corosync-1.3.1/Makefile.in 2011-06-25 21:58:51.012672595 +0200 -@@ -320,7 +320,7 @@ corosysconf_DATA = conf/corosync.conf.ex - conf/corosync.conf.example.udpu - - SUBDIRS = include lcr lib exec services tools test pkgconfig \ -- man init -+ init - - RPMBUILDOPTS = --define "_sourcedir $(abs_builddir)" \ - --define "_specdir $(abs_builddir)" \ diff --git a/package/corosync/patches/patch-tools_corosync-keygen_c b/package/corosync/patches/patch-tools_corosync-keygen_c index 6e147930c..eecf92026 100644 --- a/package/corosync/patches/patch-tools_corosync-keygen_c +++ b/package/corosync/patches/patch-tools_corosync-keygen_c @@ -1,5 +1,5 @@ ---- corosync-1.3.1.orig/tools/corosync-keygen.c 2011-04-25 04:37:50.000000000 +0200 -+++ corosync-1.3.1/tools/corosync-keygen.c 2011-05-26 07:27:22.000000000 +0200 +--- corosync-1.4.1.orig/tools/corosync-keygen.c 2011-07-26 10:08:43.000000000 +0200 ++++ corosync-1.4.1/tools/corosync-keygen.c 2011-10-04 21:03:05.000000000 +0200 @@ -65,11 +65,11 @@ int main (void) { } } -- cgit v1.2.3 From 29a01716572ba7763e35b1b22d1b6d2083c01fe9 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 12 Oct 2011 17:47:22 +0200 Subject: do not build manpages --- package/corosync/patches/patch-Makefile_in | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 package/corosync/patches/patch-Makefile_in (limited to 'package/corosync') diff --git a/package/corosync/patches/patch-Makefile_in b/package/corosync/patches/patch-Makefile_in new file mode 100644 index 000000000..38cf13b7c --- /dev/null +++ b/package/corosync/patches/patch-Makefile_in @@ -0,0 +1,11 @@ +--- corosync-1.4.1.orig/Makefile.in 2011-07-26 10:13:38.000000000 +0200 ++++ corosync-1.4.1/Makefile.in 2011-10-12 06:02:03.291467847 +0200 +@@ -323,7 +323,7 @@ corosysconf_DATA = conf/corosync.conf.ex + conf/corosync.conf.example.udpu + + SUBDIRS = include lcr lib exec services tools test pkgconfig \ +- man init conf ++ init conf + + RPMBUILDOPTS = --define "_sourcedir $(abs_builddir)" \ + --define "_specdir $(abs_builddir)" \ -- cgit v1.2.3