add pacemaker and update drbd

8 files changed, 58 insertions, 13 deletions

diff --git a/package/drbd/Makefile b/package/drbd/Makefile
index c8d69e2a0..c22d385ac 100644
--- a/package/drbd/Makefile
+++ b/package/drbd/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		drbd
-PKG_VERSION:=		8.3.8.1
+PKG_VERSION:=		8.3.10
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		551dae488006af86a33eab1eba407f48
+PKG_MD5SUM:=		7d80edc2da10de5bfffe0ca9e9996fed
 PKG_DESCR:=		DRBD admin tools
 PKG_SECTION:=		fs
 PKG_URL:=		http://www.drbd.org/
@@ -17,11 +17,14 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,DRBD,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_ARGS+=	--with-distro=generic \
+			--with-pacemaker \
 			--without-km \
 			--without-xen \
 			--without-udev
 
 post-install:
+	$(INSTALL_DIR) $(IDIR_DRBD)/etc
+	$(CP) ./files/drbd.conf $(IDIR_DRBD)/etc
 	$(INSTALL_DIR) $(IDIR_DRBD)/usr/lib/drbd
 	$(INSTALL_DIR) $(IDIR_DRBD)/usr/sbin
 	$(CP) $(WRKINST)/usr/lib/drbd/* \
diff --git a/package/drbd/files/drbd.conf b/package/drbd/files/drbd.conf
new file mode 100644
index 000000000..8eb55e497
--- /dev/null
+++ b/package/drbd/files/drbd.conf
@@ -0,0 +1,21 @@
+#resource r1 {
+#  protocol C;
+#
+#  startup { wfc-timeout 0; degr-wfc-timeout 120; }
+#  disk    { on-io-error detach; }
+#  net     { timeout 60; connect-int 10; ping-int 10;
+#            max-buffers 2048; max-epoch-size 2048; }
+#  syncer  { rate 5M; } # sync when r0 and r1 are finished syncing.
+#  on alice {
+#    address 192.168.1.1:7790;
+#    disk /dev/sdb1; 
+#    device /dev/drbd1; 
+#    meta-disk "internal";
+#  }
+#  on bob {
+#    address 192.168.1.2:7790;
+#    disk "/dev/sdb1"; 
+#    device "/dev/drbd2"; 
+#    meta-disk "internal";
+#  }
+#}
diff --git a/package/drbd/files/drbd.conffiles b/package/drbd/files/drbd.conffiles
new file mode 100644
index 000000000..9096001bf
--- /dev/null
+++ b/package/drbd/files/drbd.conffiles
@@ -0,0 +1 @@
+/etc/drbd.conf
diff --git a/package/drbd/patches/patch-Makefile_in b/package/drbd/patches/patch-Makefile_in
index bce8496a1..71ece3f6f 100644
--- a/package/drbd/patches/patch-Makefile_in
+++ b/package/drbd/patches/patch-Makefile_in
@@ -1,6 +1,6 @@
---- drbd-8.3.8.1.orig/Makefile.in	2010-07-09 10:13:59.000000000 +0200
-+++ drbd-8.3.8.1/Makefile.in	2010-11-26 19:00:49.000000000 +0100
-@@ -47,7 +47,7 @@ WITH_BASHCOMPLETION = @WITH_BASHCOMPLETI
+--- drbd-8.3.10.orig/Makefile.in	2011-01-26 14:57:59.000000000 +0100
++++ drbd-8.3.10/Makefile.in	2011-05-23 17:11:50.000000000 +0200
+@@ -56,7 +56,7 @@ KDIR ?= /lib/modules/$(KVER)/build
  # and not in e.g. dash. I'm too lazy to fix it to be compatible.
  SHELL=/bin/bash
  
diff --git a/package/drbd/patches/patch-configure b/package/drbd/patches/patch-configure
new file mode 100644
index 000000000..67bff21ce
--- /dev/null
+++ b/package/drbd/patches/patch-configure
@@ -0,0 +1,11 @@
+--- drbd-8.3.10.orig/configure	2011-01-28 12:17:35.000000000 +0100
++++ drbd-8.3.10/configure	2011-05-25 12:54:02.000000000 +0200
+@@ -3368,7 +3368,7 @@ fi
+ 
+ 
+ cat >>confdefs.h <<_ACEOF
+-#define DRBD_LIB_DIR "$localstatedir/lib/$PACKAGE_TARNAME"
++#define DRBD_LIB_DIR "/etc/$PACKAGE_TARNAME"
+ _ACEOF
+ 
+ cat >>confdefs.h <<_ACEOF
diff --git a/package/drbd/patches/patch-drbd_Makefile b/package/drbd/patches/patch-drbd_Makefile
index 809caca26..dffd1e258 100644
--- a/package/drbd/patches/patch-drbd_Makefile
+++ b/package/drbd/patches/patch-drbd_Makefile
@@ -1,7 +1,7 @@
---- drbd-8.3.8.1.orig/drbd/Makefile	2010-07-06 09:47:59.000000000 +0200
-+++ drbd-8.3.8.1/drbd/Makefile	2010-11-26 18:59:47.000000000 +0100
-@@ -132,7 +132,7 @@ else
- 	  echo -e "\treturn \"GIT-hash: $$GITHEAD$$GITDIFF\"";	 		\
+--- drbd-8.3.10.orig/drbd/Makefile	2011-01-26 14:57:59.000000000 +0100
++++ drbd-8.3.10/drbd/Makefile	2011-05-23 17:11:50.000000000 +0200
+@@ -133,7 +133,7 @@ else
+ 		grep return $@ ;						\
  	fi ;									\
  	echo -e "\t\t\" build by $$USER@$$HOSTNAME, `date "+%F %T"`\";\n}";	\
 -	mv --force $@.new $@
diff --git a/package/drbd/patches/patch-drbd_drbd_buildtag_c b/package/drbd/patches/patch-drbd_drbd_buildtag_c
new file mode 100644
index 000000000..425a04abe
--- /dev/null
+++ b/package/drbd/patches/patch-drbd_drbd_buildtag_c
@@ -0,0 +1,9 @@
+--- drbd-8.3.10.orig/drbd/drbd_buildtag.c	2011-01-28 12:17:35.000000000 +0100
++++ drbd-8.3.10/drbd/drbd_buildtag.c	2011-05-23 17:11:52.000000000 +0200
+@@ -3,5 +3,5 @@
+ const char *drbd_buildtag(void)
+ {
+ 	return "GIT-hash: 5c0b0469666682443d4785d90a2c603378f9017b"
+-		" build by phil@fat-tyre, 2011-01-28 12:17:35";
++		" build by wbx@neon, 2011-05-23 17:11:52";
+ }
diff --git a/package/drbd/patches/patch-user_Makefile_in b/package/drbd/patches/patch-user_Makefile_in
index 2979decb1..9471b2aa0 100644
--- a/package/drbd/patches/patch-user_Makefile_in
+++ b/package/drbd/patches/patch-user_Makefile_in
@@ -1,6 +1,6 @@
---- drbd-8.3.8.1.orig/user/Makefile.in	2010-05-10 16:09:13.000000000 +0200
-+++ drbd-8.3.8.1/user/Makefile.in	2011-01-14 22:16:28.000000000 +0100
-@@ -74,7 +74,7 @@ drbd_strings.c: ../drbd/drbd_strings.c
+--- drbd-8.3.10.orig/user/Makefile.in	2011-01-26 14:57:59.000000000 +0100
++++ drbd-8.3.10/user/Makefile.in	2011-05-23 17:11:50.000000000 +0200
+@@ -73,7 +73,7 @@ drbd_strings.c: ../drbd/drbd_strings.c
  	cp $^ $@
  
  drbdadm: $(drbdadm-obj)
@@ -9,7 +9,7 @@
  
  drbdadm_scanner.c: drbdadm_scanner.fl drbdadm_parser.h
  	flex -s -odrbdadm_scanner.c drbdadm_scanner.fl
-@@ -83,10 +83,10 @@ drbdmeta_scanner.c: drbdmeta_scanner.fl 
+@@ -82,10 +82,10 @@ drbdmeta_scanner.c: drbdmeta_scanner.fl 
  	flex -s -odrbdmeta_scanner.c drbdmeta_scanner.fl
  
  drbdsetup: $(drbdsetup-obj)