Browse Source

remove ha packages for now, old and seldom tested

Waldemar Brodkorb 10 years ago
parent
commit
8e0732eefc

+ 0 - 49
package/cluster-glue/Makefile

@@ -1,49 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=		cluster-glue
-PKG_VERSION:=		1.0.11
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		bd5a20fc9185da17caf113776d1eac47
-PKG_DESCR:=		Cluster Glue library and tools
-PKG_SECTION:=		ha
-PKG_BUILDDEP:=		glib bzip2 e2fsprogs libaio
-PKG_DEPENDS:=		libaio
-PKG_URL:=		http://www.linux-ha.org/wiki/Cluster_Glue
-PKG_SITES:=		http://openadk.org/distfiles/
-PKG_NOPARALLEL:=	1
-
-PKG_LIBC_DEPENDS:=	glibc musl
-PKG_ARCH_DEPENDS:=	x86 x86_64
-
-include $(TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,CLUSTER_GLUE,cluster-glue,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-# disable honour cflags stuff
-XAKE_FLAGS+=		GCC_HONOUR_COPTS=s
-CONFIGURE_ENV+=		ac_cv_path_HELP2MAN=''
-CONFIGURE_ARGS+=	--disable-bundled-ltdl \
-			--enable-fatal-warnings=no
-
-TARGET_CPPFLAGS+=	-DCONFIG_LITTLE_ENDIAN
-ifeq (${CPU_ARCH},mips)
-TARGET_CPPFLAGS+=		-DCONFIG_BIG_ENDIAN
-endif
-ifeq (${CPU_ARCH},mips64)
-TARGET_CPPFLAGS+=		-DCONFIG_BIG_ENDIAN
-endif
-ifeq (${CPU_ARCH},ppc)
-TARGET_CPPFLAGS+=		-DCONFIG_BIG_ENDIAN
-endif
-
-cluster-glue-install:
-	$(INSTALL_DIR) $(IDIR_CLUSTER_GLUE)/usr/lib/heartbeat
-	$(CP) $(WRKINST)/usr/lib/*.so* \
-		$(IDIR_CLUSTER_GLUE)/usr/lib
-	$(CP) $(WRKINST)/usr/lib/heartbeat/* \
-		$(IDIR_CLUSTER_GLUE)/usr/lib/heartbeat
-
-include ${TOPDIR}/mk/pkg-bottom.mk

+ 0 - 11
package/cluster-glue/patches/patch-configure

@@ -1,11 +0,0 @@
---- cluster-glue-1.0.7.orig/configure	2011-05-24 14:40:32.000000000 +0200
-+++ cluster-glue-1.0.7/configure	2011-06-22 13:30:10.976951778 +0200
-@@ -12620,7 +12620,7 @@ case $libdir in
-     *prefix*|NONE)
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking which lib directory to use" >&5
- $as_echo_n "checking which lib directory to use... " >&6; }
--    for aDir in lib64 lib
-+    for aDir in lib
-     do
-       trydir="${exec_prefix}/${aDir}"
-       if

+ 0 - 20
package/cluster-glue/patches/patch-lib_clplumbing_Makefile_in

@@ -1,20 +0,0 @@
---- cluster-glue-1.0.11.orig/lib/clplumbing/Makefile.in	2013-02-27 15:20:39.000000000 +0100
-+++ cluster-glue-1.0.11/lib/clplumbing/Makefile.in	2013-02-27 15:38:14.000000000 +0100
-@@ -121,6 +121,7 @@ PROGRAMS = $(test_PROGRAMS)
- am_base64_md5_test_OBJECTS = base64_md5_test.$(OBJEXT)
- base64_md5_test_OBJECTS = $(am_base64_md5_test_OBJECTS)
- base64_md5_test_DEPENDENCIES = libplumb.la \
-+	$(top_builddir)/lib/pils/libpils.la \
- 	$(top_builddir)/replace/libreplace.la
- am_ipctest_OBJECTS = ipctest.$(OBJEXT)
- ipctest_OBJECTS = $(am_ipctest_OBJECTS)
-@@ -454,7 +455,8 @@ ipctransientserver_LDADD = libplumb.la $
- #netstring_test_SOURCES	= netstring_test.c
- #netstring_test_LDADD	= libplumb.la $(top_builddir)/replace/libreplace.la libhbclient.la $(gliblib)
- base64_md5_test_SOURCES = base64_md5_test.c
--base64_md5_test_LDADD = libplumb.la $(top_builddir)/replace/libreplace.la $(GLIBLIB)
-+base64_md5_test_LDADD = libplumb.la $(top_builddir)/replace/libreplace.la $(GLIBLIB) \
-+			$(top_builddir)/lib/pils/libpils.la
- EXTRA_DIST = $(test_SCRIPTS)
- all: all-am
- 

+ 0 - 18
package/cluster-glue/patches/patch-lib_stonith_Makefile_in

@@ -1,18 +0,0 @@
---- cluster-glue-1.0.11.orig/lib/stonith/Makefile.in	2013-02-27 15:20:40.000000000 +0100
-+++ cluster-glue-1.0.11/lib/stonith/Makefile.in	2013-02-27 15:39:57.000000000 +0100
-@@ -111,6 +111,7 @@ meatclient_DEPENDENCIES =
- am_sbd_OBJECTS = sbd-sbd-md.$(OBJEXT) sbd-sbd-common.$(OBJEXT)
- sbd_OBJECTS = $(am_sbd_OBJECTS)
- sbd_DEPENDENCIES = $(top_builddir)/lib/clplumbing/libplumb.la \
-+	$(top_builddir)/lib/pils/libpils.la \
- 	$(top_builddir)/lib/clplumbing/libplumbgpl.la
- sbd_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- 	--mode=link $(CCLD) $(sbd_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-@@ -385,6 +386,7 @@ sbd_SOURCES = sbd-md.c sbd-common.c
- sbd_CFLAGS = -D_GNU_SOURCE
- sbd_LDADD = $(GLIBLIB) -laio				\
- 			$(top_builddir)/lib/clplumbing/libplumb.la	\
-+			$(top_builddir)/lib/pils/libpils.la \
- 			$(top_builddir)/lib/clplumbing/libplumbgpl.la
- 
- lib_LTLIBRARIES = libstonith.la

+ 0 - 20
package/cluster-glue/patches/patch-logd_Makefile_in

@@ -1,20 +0,0 @@
---- cluster-glue-1.0.11.orig/logd/Makefile.in	2013-02-27 15:20:40.000000000 +0100
-+++ cluster-glue-1.0.11/logd/Makefile.in	2013-02-27 15:57:45.000000000 +0100
-@@ -362,14 +362,15 @@ AM_CFLAGS = @CFLAGS@
- initddir = @INITDIR@
- ha_logd_SOURCES = ha_logd.c
- ha_logd_LDADD = $(top_builddir)/lib/clplumbing/libplumb.la		\
-+		$(top_builddir)/lib/pils/libpils.la \
- 		    $(top_builddir)/lib/clplumbing/libplumbgpl.la
- 
- 
- #		    $(top_builddir)/lib/apphb/libapphb.la
- ha_logger_SOURCES = ha_logger.c
--ha_logger_LDADD = $(top_builddir)/lib/clplumbing/libplumb.la
-+ha_logger_LDADD = $(top_builddir)/lib/clplumbing/libplumb.la $(top_builddir)/lib/pils/libpils.la
- logtest_SOURCES = logtest.c
--logtest_LDADD = $(top_builddir)/lib/clplumbing/libplumb.la
-+logtest_LDADD = $(top_builddir)/lib/clplumbing/libplumb.la $(top_builddir)/lib/pils/libpils.la
- initd_SCRIPTS = logd
- all: all-am
- 

+ 0 - 11
package/cluster-glue/patches/patch-lrm_admin_Makefile_in

@@ -1,11 +0,0 @@
---- cluster-glue-1.0.11.orig/lrm/admin/Makefile.in	2013-02-27 15:20:40.000000000 +0100
-+++ cluster-glue-1.0.11/lrm/admin/Makefile.in	2013-02-27 15:42:54.000000000 +0100
-@@ -349,7 +349,7 @@ INCLUDES = -I$(top_builddir)/include -I$
- 					-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl
- 
- halibdir = $(libdir)/@HB_PKG@
--COMMONLIBS = $(top_builddir)/lib/clplumbing/libplumb.la $(GLIBLIB)
-+COMMONLIBS = $(top_builddir)/lib/clplumbing/libplumb.la $(GLIBLIB) $(top_builddir)/lib/pils/libpils.la
- sbin_SCRIPTS = cibsecret
- lrmadmin_SOURCES = lrmadmin.c
- lrmadmin_LDFLAGS = $(COMMONLIBS)

+ 0 - 11
package/cluster-glue/patches/patch-lrm_test_Makefile_in

@@ -1,11 +0,0 @@
---- cluster-glue-1.0.11.orig/lrm/test/Makefile.in	2013-02-27 15:20:41.000000000 +0100
-+++ cluster-glue-1.0.11/lrm/test/Makefile.in	2013-02-27 15:52:00.000000000 +0100
-@@ -401,7 +401,7 @@ SUBDIRS = testcases
- INCLUDES = -I$(top_builddir)/include  -I$(top_srcdir)/include \
- 			-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl
- 
--COMMONLIBS = $(top_builddir)/lib/clplumbing/libplumb.la $(GLIBLIB)
-+COMMONLIBS = $(top_builddir)/lib/clplumbing/libplumb.la $(GLIBLIB) $(top_builddir)/lib/pils/libpils.la
- apitest_SOURCES = apitest.c
- apitest_LDFLAGS = $(COMMONLIBS)
- apitest_LDADD = $(top_builddir)/lib/$(LRM_DIR)/liblrm.la

+ 0 - 44
package/corosync/Makefile

@@ -1,44 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=		corosync
-PKG_VERSION:=		2.3.0
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		4689279c36b1417e122a23c6818017dd
-PKG_DESCR:=		Cluster Engine	
-PKG_SECTION:=		ha
-PKG_BUILDDEP:=		libqb nss
-PKG_DEPENDS:=		cluster-glue libqb nss
-PKG_URL:=		http://www.corosync.org/
-PKG_SITES:=		http://corosync.org/download/
-
-PKG_CFLINE_COROSYNC:=	select ADK_KERNEL_IP_MULTICAST
-PKG_LIBC_DEPENDS:=	glibc musl
-PKG_ARCH_DEPENDS:=      x86 x86_64
-
-include $(TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,COROSYNC,corosync,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-XAKE_FLAGS+=		GCC_HONOUR_COPTS=s
-TARGET_CPPFLAGS+=	-I$(STAGING_TARGET_DIR)/usr/include/nss \
-			-I$(STAGING_TARGET_DIR)/usr/include/nspr
-TARGET_LDFLAGS+=	-lssl3 -lsmime3 -lnss3 -lnssutil3
-CONFIGURE_ENV+=		ac_cv_func_fnmatch_works=yes
-
-corosync-install:
-	$(INSTALL_DIR) $(IDIR_COROSYNC)/etc/corosync
-	$(CP) ./files/corosync.conf $(IDIR_COROSYNC)/etc/corosync
-	$(INSTALL_DIR) $(IDIR_COROSYNC)/usr/lib
-	$(CP) $(WRKINST)/usr/lib/lib*.so* \
-		$(IDIR_COROSYNC)/usr/lib
-	$(INSTALL_DIR) $(IDIR_COROSYNC)/usr/sbin
-	$(CP) $(WRKINST)/usr/sbin/* \
-		$(IDIR_COROSYNC)/usr/sbin
-	$(INSTALL_DIR) $(IDIR_COROSYNC)/usr/bin
-	$(CP) $(WRKINST)/usr/bin/* \
-		$(IDIR_COROSYNC)/usr/bin
-
-include ${TOPDIR}/mk/pkg-bottom.mk

+ 0 - 32
package/corosync/files/corosync.conf

@@ -1,32 +0,0 @@
-aisexec {        
-	user:   root
-        group:  root
-}
-service {
-        name: pacemaker
-        ver:  0
-}
-totem {
-        version: 2
-        secauth: on
-        threads: 0
-        interface {
-                ringnumber: 0
-                bindnetaddr: 192.168.1.0
-                mcastaddr: 226.94.1.1
-                mcastport: 5405
-        }
-        netmtu: 8800
-}
-logging {
-        debug: off
-        fileline: off
-        to_syslog: yes
-        to_stderr: no
-        syslog_facility: daemon
-        timestamp: on
-}
-amf {
-        mode: disabled
-}
-

+ 0 - 1
package/corosync/files/corosync.conffiles

@@ -1 +0,0 @@
-/etc/corosync/corosync.conf

+ 0 - 42
package/pacemaker-mgmt/Makefile

@@ -1,42 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=		pacemaker-mgmt
-PKG_VERSION:=		2.0.2
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		be16a38588d1c518f53e64e7e48e1c90
-PKG_DESCR:=		Pacemaker management daemon
-PKG_SECTION:=		ha
-PKG_BUILDDEP:=		swig-host pacemaker gnutls pam python2
-PKG_URL:=		http://hg.clusterlabs.org/pacemaker/pygui/
-PKG_SITES:=		http://openadk.org/distfiles/
-
-PKG_LIBC_DEPENDS:=	glibc musl
-PKG_ARCH_DEPENDS:=      x86 x86_64
-
-include $(TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,PACEMAKER_MGMT,pacemaker-mgmt,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-include $(TOPDIR)/mk/python.mk
-
-CONFIGURE_ENV+=		PYTHON=$(PYTHON)
-CONFIGURE_ARGS+=	--with-initdir=/etc/init.d \
-			--with-ocf-root=/usr/lib/ocf \
-			--without-ais-support \
-			--disable-fatal-warnings
-TARGET_CFLAGS+=		-I$(STAGING_TARGET_DIR)/usr/include/python2.7 \
-			-I$(STAGING_TARGET_DIR)/usr/include/pacemaker \
-			-I$(STAGING_TARGET_DIR)/usr/include/heartbeat
-
-pacemaker-mgmt-install:
-	$(INSTALL_DIR) $(IDIR_PACEMAKER_MGMT)/usr/lib
-	$(CP) $(WRKINST)/usr/lib/libhbmgmt*so* \
-		$(IDIR_PACEMAKER_MGMT)/usr/lib
-	$(INSTALL_DIR) $(IDIR_PACEMAKER_MGMT)/usr/lib/heartbeat
-	$(INSTALL_BIN) $(WRKINST)/usr/lib/heartbeat/mgmtd \
-		$(IDIR_PACEMAKER_MGMT)/usr/lib/heartbeat
-	
-include ${TOPDIR}/mk/pkg-bottom.mk

+ 0 - 109
package/pacemaker-mgmt/patches/patch-configure

@@ -1,109 +0,0 @@
---- pacemaker-mgmt-2.0.2.orig/configure	2013-02-28 13:48:44.000000000 +0100
-+++ pacemaker-mgmt-2.0.2/configure	2013-03-04 11:56:52.000000000 +0100
-@@ -1,4 +1,5 @@
- #! /bin/sh
-+set -x
- # Guess values for system-dependent variables and create Makefiles.
- # Generated by GNU Autoconf 2.69.
- #
-@@ -19866,35 +19867,6 @@ fi
- 
- 
- 
--STACKS=""
--CLUSTERLIBS=""
--if test $SUPPORT_HEARTBEAT = 1; then
--   STACKS="$STACKS heartbeat"
--   CLUSTERLIBS="$CLUSTERLIBS -lhbclient -lccmclient -lclm"
--fi
--
--if test $SUPPORT_AIS = 1; then
--   STACKS="$STACKS $AIS_VERSION"
--   #CLUSTERLIBS="$CLUSTERLIBS ${AISMSGLIB}"
--else
--   AISPREFIX=""
--   LCRSODIR="$libdir"
--fi
--
--PKG_FEATURES="$PKG_FEATURES$STACKS"
--
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for supported stacks" >&5
--$as_echo_n "checking for supported stacks... " >&6; }
--if test x"$STACKS" = x; then
--   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "You must choose at least one cluster stack to support
--See \`config.log' for more details" "$LINENO" 5; }
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $STACKS" >&5
--$as_echo "$STACKS" >&6; }
--
--
- 
- 
- 
-@@ -21522,62 +21494,9 @@ CPPFLAGS="$save_CPPFLAGS"
- 
- 
- 
--as_ac_File=`$as_echo "ac_cv_file_$sysconfdir/pam.d/common-account" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $sysconfdir/pam.d/common-account" >&5
--$as_echo_n "checking for $sysconfdir/pam.d/common-account... " >&6; }
--if eval \${$as_ac_File+:} false; then :
--  $as_echo_n "(cached) " >&6
--else
--  test "$cross_compiling" = yes &&
--  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "$sysconfdir/pam.d/common-account"; then
--  eval "$as_ac_File=yes"
--else
--  eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
--	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
--
--fi
--
--as_ac_File=`$as_echo "ac_cv_file_$sysconfdir/pam.d/common-auth" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $sysconfdir/pam.d/common-auth" >&5
--$as_echo_n "checking for $sysconfdir/pam.d/common-auth... " >&6; }
--if eval \${$as_ac_File+:} false; then :
--  $as_echo_n "(cached) " >&6
--else
--  test "$cross_compiling" = yes &&
--  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "$sysconfdir/pam.d/common-auth"; then
--  eval "$as_ac_File=yes"
--else
--  eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
--	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
--
--fi
--
-- if test -f $sysconfdir/pam.d/common-account -a \
--				    -f /etc/pam.d/common-auth; then
--  USE_PAM_COMMON_TRUE=
--  USE_PAM_COMMON_FALSE='#'
--else
--  USE_PAM_COMMON_TRUE='#'
--  USE_PAM_COMMON_FALSE=
--fi
--
-+USE_PAM_COMMON_TRUE='#'
-+USE_PAM_COMMON_FALSE=
- 
--	if test "x${enable_mgmt_client}" != "xno" -a "x${PYTHON_INCLUDES}" = "x"; then
--  		FatalMissingThing "Python.h" \
--		  "The GUI managment module needs Python.h (Linux: python-devel package)"
--	fi
- 
- 	if test "$ac_cv_header_security_pam_appl_h" = "no" -a "$ac_cv_header_pam_pam_appl_h" = "no"; then
-   		FatalMissingThing "security/pam_appl.h" \

+ 0 - 52
package/pacemaker/Makefile

@@ -1,52 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=		pacemaker
-PKG_VERSION:=		1.1.8
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		3aaa95da2bdce96e0c244a2fb0e8b1e3
-PKG_DESCR:=		scalable High-Availability cluster resource manager
-PKG_SECTION:=		ha
-PKG_BUILDDEP:=		resource-agents cluster-glue pam gnutls corosync libtool
-PKG_DEPENDS:=		python2 python2-readline python2-bzip2 cluster-glue libuuid
-PKG_DEPENDS+=		bash resource-agents pam libgnutls glib libxslt libxml2 libltdl librt
-PKG_URL:=		http://www.clusterlabs.org/
-PKG_SITES:=		http://openadk.org/distfiles/
-
-PKG_LIBC_DEPENDS:=	glibc musl
-PKG_ARCH_DEPENDS:=	x86 x86_64
-
-include $(TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,PACEMAKER,pacemaker,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-CONFIGURE_ARGS+=	--disable-fatal-warnings \
-			--with-corosync \
-			--without-ais \
-			--without-heartbeat
-CONFIGURE_ENV+=		ac_cv_path_HELP2MAN=''
-
-pacemaker-install:
-	$(INSTALL_DIR) $(IDIR_PACEMAKER)/usr/lib/heartbeat
-	$(INSTALL_DIR) $(IDIR_PACEMAKER)/usr/lib/ocf
-	$(CP) $(WRKINST)/usr/lib/lib*.so* \
-		$(IDIR_PACEMAKER)/usr/lib
-	$(CP) $(WRKINST)/usr/lib/ocf/* \
-		$(IDIR_PACEMAKER)/usr/lib/ocf
-	$(INSTALL_DIR) $(IDIR_PACEMAKER)/usr/share/pacemaker
-	$(CP) $(WRKINST)/usr/share/pacemaker/* \
-		$(IDIR_PACEMAKER)/usr/share/pacemaker
-	$(INSTALL_DIR) $(IDIR_PACEMAKER)/usr/sbin
-	$(CP) $(WRKINST)/usr/sbin/* \
-		$(IDIR_PACEMAKER)/usr/sbin
-	$(INSTALL_DIR) $(IDIR_PACEMAKER)/usr/libexec
-	$(CP) $(WRKINST)/usr/libexec/* \
-		$(IDIR_PACEMAKER)/usr/libexec
-	$(INSTALL_DIR) $(IDIR_PACEMAKER)/usr/lib/python2.7/site-packages
-	$(CP) $(WRKINST)/usr/lib/python2.7/site-packages/* \
-		$(IDIR_PACEMAKER)/usr/lib/python2.7/site-packages/
-	-find ${IDIR_PACEMAKER} -name "\*.pyc" -o -name "*\.pyo" -exec rm {} \;
-
-include ${TOPDIR}/mk/pkg-bottom.mk

+ 0 - 7
package/pacemaker/files/pacemaker.postinst

@@ -1,7 +0,0 @@
-#!/bin/sh
-. $IPKG_INSTROOT/etc/functions.sh
-gid=$(get_next_gid)
-gid2=$(get_next_gid)
-add_user hacluster $(get_next_uid) $gid /tmp
-add_group hacluster $gid
-add_group haclient $gid2

+ 0 - 11
package/pacemaker/patches/patch-cib_Makefile_in

@@ -1,11 +0,0 @@
---- pacemaker-1.1.8.orig/cib/Makefile.in	2013-02-28 11:07:10.000000000 +0100
-+++ pacemaker-1.1.8/cib/Makefile.in	2013-02-28 11:23:15.000000000 +0100
-@@ -450,6 +450,8 @@ hadir = $(sysconfdir)/ha.d
- halibdir = $(CRM_DAEMON_DIR)
- commmoddir = $(halibdir)/modules/comm
- COMMONLIBS = $(top_builddir)/lib/common/libcrmcommon.la	\
-+		$(top_builddir)/lib/fencing/libstonithd.la \
-+		$(top_builddir)/lib/pengine/libpe_rules.la \
- 		  $(top_builddir)/lib/cib/libcib.la
- 
- @BUILD_HELP_TRUE@man8_MANS = 

+ 0 - 19
package/pacemaker/patches/patch-lrmd_Makefile_in

@@ -1,19 +0,0 @@
---- pacemaker-1.1.8.orig/lrmd/Makefile.in	2013-02-28 11:07:12.000000000 +0100
-+++ pacemaker-1.1.8/lrmd/Makefile.in	2013-02-28 12:16:59.000000000 +0100
-@@ -455,11 +455,14 @@ lrmdlibdir = $(CRM_DAEMON_DIR)
- lrmd_SOURCES = main.c lrmd.c tls_backend.c
- lrmd_LDADD = $(top_builddir)/lib/common/libcrmcommon.la	\
- 			$(top_builddir)/lib/services/libcrmservice.la \
--			$(top_builddir)/lib/lrmd/liblrmd.la  \
--			$(top_builddir)/lib/fencing/libstonithd.la
-+			$(top_builddir)/lib/pengine/libpe_rules.la \
-+			$(top_builddir)/lib/fencing/libstonithd.la \
-+			$(top_builddir)/lib/lrmd/liblrmd.la
- 
- lrmd_test_SOURCES = test.c
- lrmd_test_LDADD = $(top_builddir)/lib/common/libcrmcommon.la	\
-+			$(top_builddir)/lib/pengine/libpe_rules.la \
-+			$(top_builddir)/lib/fencing/libstonithd.la \
- 			$(top_builddir)/lib/lrmd/liblrmd.la  \
- 			$(top_builddir)/lib/cib/libcib.la   \
- 			$(top_builddir)/lib/services/libcrmservice.la \

+ 0 - 11
package/pacemaker/patches/patch-mcp_Makefile_in

@@ -1,11 +0,0 @@
---- pacemaker-1.1.8.orig/mcp/Makefile.in	2013-02-28 11:07:13.000000000 +0100
-+++ pacemaker-1.1.8/mcp/Makefile.in	2013-02-28 11:18:34.000000000 +0100
-@@ -456,7 +456,7 @@ MAINTAINERCLEANFILES = Makefile.in
- @BUILD_CS_SUPPORT_TRUE@@HAVE_SYSTEMD_TRUE@systemdunit_DATA = pacemaker.service
- @BUILD_CS_SUPPORT_TRUE@noinst_HEADERS = 
- @BUILD_CS_SUPPORT_TRUE@pacemakerd_SOURCES = pacemaker.c corosync.c
--@BUILD_CS_SUPPORT_TRUE@pacemakerd_LDADD = $(top_builddir)/lib/cluster/libcrmcluster.la $(top_builddir)/lib/common/libcrmcommon.la
-+@BUILD_CS_SUPPORT_TRUE@pacemakerd_LDADD = $(top_builddir)/lib/cluster/libcrmcluster.la $(top_builddir)/lib/common/libcrmcommon.la $(top_builddir)/lib/fencing/libstonithd.la
- @BUILD_CS_SUPPORT_TRUE@pacemakerd_LDFLAGS = $(CLUSTERLIBS)
- all: all-am
- 

+ 0 - 12
package/pacemaker/patches/patch-tools_Makefile_in

@@ -1,12 +0,0 @@
---- pacemaker-1.1.8.orig/tools/Makefile.in	2013-02-28 11:07:13.000000000 +0100
-+++ pacemaker-1.1.8/tools/Makefile.in	2013-02-28 12:28:59.000000000 +0100
-@@ -570,6 +570,9 @@ INCLUDES = -I$(top_builddir)/include -I$
- COMMONLIBS = \
- 		$(top_builddir)/lib/common/libcrmcommon.la		\
- 		$(top_builddir)/lib/cib/libcib.la			\
-+		$(top_builddir)/lib/pengine/libpe_rules.la \
-+		$(top_builddir)/lib/fencing/libstonithd.la \
-+		$(top_builddir)/lib/services/libcrmservice.la \
- 		$(CURSESLIBS) $(CLUSTERLIBS) 
- 
- headerdir = $(pkgincludedir)/crm

+ 0 - 32
package/resource-agents/Makefile

@@ -1,32 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=		resource-agents
-PKG_VERSION:=		3.9.0
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		b5d0c178082ff186c36ab145b5bbf5df
-PKG_DESCR:=		Resource agents for clusters
-PKG_SECTION:=		ha
-PKG_BUILDDEP:=		glib cluster-glue
-PKG_URL:=		https://github.com/ClusterLabs/resource-agents
-PKG_SITES:=		http://openadk.org/distfiles/
-
-PKG_LIBC_DEPENDS:=	glibc musl
-PKG_ARCH_DEPENDS:=	x86 x86_64
-
-include $(TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,RESOURCE_AGENTS,resource-agents,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-CONFIGURE_ARGS+=	--with-ocf-root=/usr/lib/ocf
-
-resource-agents-install:
-	$(INSTALL_DIR) $(IDIR_RESOURCE_AGENTS)/usr/share/cluster
-	$(CP) $(WRKINST)/usr/share/cluster/*.sh \
-		$(IDIR_RESOURCE_AGENTS)/usr/share/cluster
-	$(INSTALL_DIR) $(IDIR_RESOURCE_AGENTS)/usr/lib
-	$(CP) $(WRKINST)/usr/lib/* $(IDIR_RESOURCE_AGENTS)/usr/lib
-
-include ${TOPDIR}/mk/pkg-bottom.mk

+ 0 - 20
package/resource-agents/patches/patch-Makefile_in

@@ -1,20 +0,0 @@
---- resource-agents-3.9.0.orig/Makefile.in	2011-05-24 15:37:09.000000000 +0200
-+++ resource-agents-3.9.0/Makefile.in	2011-05-24 15:41:27.000000000 +0200
-@@ -53,7 +53,7 @@ POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
- @BUILD_RGMANAGER_TRUE@am__append_1 = rgmanager
--@BUILD_LINUX_HA_TRUE@am__append_2 = include heartbeat tools ldirectord doc
-+@BUILD_LINUX_HA_TRUE@am__append_2 = include heartbeat tools ldirectord
- subdir = .
- DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
- 	$(srcdir)/Makefile.in $(top_srcdir)/configure AUTHORS COPYING \
-@@ -86,7 +86,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGE
- 	distdir dist dist-all distcheck
- ETAGS = etags
- CTAGS = ctags
--DIST_SUBDIRS = rgmanager include heartbeat tools ldirectord doc
-+DIST_SUBDIRS = rgmanager include heartbeat tools ldirectord
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- distdir = $(PACKAGE)-$(VERSION)
- top_distdir = $(distdir)

+ 0 - 94
package/resource-agents/patches/patch-autom4te_cache_requests

@@ -1,94 +0,0 @@
---- resource-agents-3.9.0.orig/autom4te.cache/requests	2011-05-24 15:37:08.000000000 +0200
-+++ resource-agents-3.9.0/autom4te.cache/requests	2011-05-24 15:38:05.000000000 +0200
-@@ -66,14 +66,14 @@
-                         '_AM_AUTOCONF_VERSION' => 1,
-                         'AM_PROG_CC_C_O' => 1,
-                         '_AM_MANGLE_OPTION' => 1,
--                        'AM_CONDITIONAL' => 1,
-                         'AM_SET_LEADING_DOT' => 1,
-+                        'AM_CONDITIONAL' => 1,
-                         'AM_SET_DEPDIR' => 1,
-                         '_AM_DEPENDENCIES' => 1,
--                        'AM_PROG_INSTALL_SH' => 1,
-                         'm4_include' => 1,
--                        '_AC_AM_CONFIG_HEADER_HOOK' => 1,
-+                        'AM_PROG_INSTALL_SH' => 1,
-                         'AM_PATH_PYTHON' => 1,
-+                        '_AC_AM_CONFIG_HEADER_HOOK' => 1,
-                         'AU_DEFUN' => 1,
-                         'AM_MAKE_INCLUDE' => 1
-                       }
-@@ -90,55 +90,55 @@
-                         'configure.ac'
-                       ],
-                       {
--                        '_LT_AC_TAGCONFIG' => 1,
-                         'AM_PROG_F77_C_O' => 1,
--                        'm4_pattern_forbid' => 1,
-+                        '_LT_AC_TAGCONFIG' => 1,
-                         'AC_INIT' => 1,
--                        '_AM_COND_IF' => 1,
-+                        'm4_pattern_forbid' => 1,
-                         'AC_CANONICAL_TARGET' => 1,
--                        'AC_SUBST' => 1,
-+                        '_AM_COND_IF' => 1,
-                         'AC_CONFIG_LIBOBJ_DIR' => 1,
--                        'AC_FC_SRCEXT' => 1,
-+                        'AC_SUBST' => 1,
-                         'AC_CANONICAL_HOST' => 1,
-+                        'AC_FC_SRCEXT' => 1,
-                         'AC_PROG_LIBTOOL' => 1,
-                         'AM_INIT_AUTOMAKE' => 1,
--                        'AM_PATH_GUILE' => 1,
-                         'AC_CONFIG_SUBDIRS' => 1,
-+                        'AM_PATH_GUILE' => 1,
-                         'AM_AUTOMAKE_VERSION' => 1,
-                         'LT_CONFIG_LTDL_DIR' => 1,
--                        'AC_REQUIRE_AUX_FILE' => 1,
-                         'AC_CONFIG_LINKS' => 1,
--                        'm4_sinclude' => 1,
-+                        'AC_REQUIRE_AUX_FILE' => 1,
-                         'LT_SUPPORTED_TAG' => 1,
-+                        'm4_sinclude' => 1,
-                         'AM_MAINTAINER_MODE' => 1,
-                         'AM_NLS' => 1,
-                         'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
--                        'AM_MAKEFILE_INCLUDE' => 1,
-                         '_m4_warn' => 1,
-+                        'AM_MAKEFILE_INCLUDE' => 1,
-                         'AM_PROG_CXX_C_O' => 1,
--                        '_AM_COND_ENDIF' => 1,
-                         '_AM_MAKEFILE_INCLUDE' => 1,
-+                        '_AM_COND_ENDIF' => 1,
-                         'AM_ENABLE_MULTILIB' => 1,
-                         'AM_SILENT_RULES' => 1,
-                         'AM_PROG_MOC' => 1,
-                         'AC_CONFIG_FILES' => 1,
--                        'LT_INIT' => 1,
-                         'include' => 1,
--                        'AM_PROG_AR' => 1,
-+                        'LT_INIT' => 1,
-                         'AM_GNU_GETTEXT' => 1,
-+                        'AM_PROG_AR' => 1,
-                         'AC_LIBSOURCE' => 1,
--                        'AM_PROG_FC_C_O' => 1,
-                         'AC_CANONICAL_BUILD' => 1,
-+                        'AM_PROG_FC_C_O' => 1,
-                         'AC_FC_FREEFORM' => 1,
-                         'AH_OUTPUT' => 1,
--                        '_AM_SUBST_NOTMAKE' => 1,
-                         'AC_CONFIG_AUX_DIR' => 1,
--                        'sinclude' => 1,
--                        'AM_PROG_CC_C_O' => 1,
-+                        '_AM_SUBST_NOTMAKE' => 1,
-                         'm4_pattern_allow' => 1,
--                        'AM_XGETTEXT_OPTION' => 1,
--                        'AC_CANONICAL_SYSTEM' => 1,
-+                        'AM_PROG_CC_C_O' => 1,
-+                        'sinclude' => 1,
-                         'AM_CONDITIONAL' => 1,
-+                        'AC_CANONICAL_SYSTEM' => 1,
-+                        'AM_XGETTEXT_OPTION' => 1,
-                         'AC_CONFIG_HEADERS' => 1,
-                         'AC_DEFINE_TRACE_LITERAL' => 1,
-                         'AM_POT_TOOLS' => 1,

+ 0 - 11
package/resource-agents/patches/patch-configure

@@ -1,11 +0,0 @@
---- resource-agents-3.9.0.orig/configure	2011-05-24 15:37:07.000000000 +0200
-+++ resource-agents-3.9.0/configure	2011-10-07 20:11:45.000000000 +0200
-@@ -6171,7 +6171,7 @@ $as_echo_n "checking for $2 in $1... " >
- 	  printf "#include <stdio.h>\n" > ${Cfile}.c
- 	  printf "#include <%s>\n" $1 >> ${Cfile}.c
- 	  printf "int main(int argc, char **argv) { printf(\"%%s\", %s); return 0; }\n" $2 >> ${Cfile}.c
--	  $CC $CFLAGS ${Cfile}.c -o ${Cfile}
-+	  $CC_FOR_BUILD $CFLAGS_FOR_BUILD ${Cfile}.c -o ${Cfile}
- 	  value=`${Cfile}`
- 	  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $value" >&5
- $as_echo "$value" >&6; }

+ 0 - 1
package/section.lst

@@ -16,7 +16,6 @@ firewall	Firewall / Routing / Bridging
 route	Firewall / Routing / Bridging
 bridge	Firewall / Routing / Bridging
 fs	Filesystem / Blockdevice utilities
-ha	Linux High Availability
 ipv6	IPv6
 lang	Programming / Languages
 libs	Libraries