From f65a2a31d30291ce81ce3b4042b41cf66bb41810 Mon Sep 17 00:00:00 2001 From: Roman I Khimov Date: Thu, 1 Jul 2010 19:26:03 +0400 Subject: pacemaker: update to version 1.0.9.1 * bugfix release, considered as safe upgrade Signed-off-by: Roman I Khimov --- .../pacemaker-1.0.8/fix-header-defs-lookup.patch | 16 ----- .../pacemaker-dont-use-help2man.patch | 16 ----- .../pacemaker-remove-native-includes.patch | 22 ------- .../pacemaker-1.0.9.1/fix-header-defs-lookup.patch | 16 +++++ .../pacemaker-dont-use-help2man.patch | 16 +++++ .../pacemaker-remove-native-includes.patch | 22 +++++++ recipes/pacemaker/pacemaker_1.0.8.bb | 77 ---------------------- recipes/pacemaker/pacemaker_1.0.9.1.bb | 77 ++++++++++++++++++++++ 8 files changed, 131 insertions(+), 131 deletions(-) delete mode 100644 recipes/pacemaker/pacemaker-1.0.8/fix-header-defs-lookup.patch delete mode 100644 recipes/pacemaker/pacemaker-1.0.8/pacemaker-dont-use-help2man.patch delete mode 100644 recipes/pacemaker/pacemaker-1.0.8/pacemaker-remove-native-includes.patch create mode 100644 recipes/pacemaker/pacemaker-1.0.9.1/fix-header-defs-lookup.patch create mode 100644 recipes/pacemaker/pacemaker-1.0.9.1/pacemaker-dont-use-help2man.patch create mode 100644 recipes/pacemaker/pacemaker-1.0.9.1/pacemaker-remove-native-includes.patch delete mode 100644 recipes/pacemaker/pacemaker_1.0.8.bb create mode 100644 recipes/pacemaker/pacemaker_1.0.9.1.bb (limited to 'recipes') diff --git a/recipes/pacemaker/pacemaker-1.0.8/fix-header-defs-lookup.patch b/recipes/pacemaker/pacemaker-1.0.8/fix-header-defs-lookup.patch deleted file mode 100644 index 02ce26ec90..0000000000 --- a/recipes/pacemaker/pacemaker-1.0.8/fix-header-defs-lookup.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: Pacemaker-1-0-Pacemaker-1.0.8/configure.ac -=================================================================== ---- Pacemaker-1-0-Pacemaker-1.0.8.orig/configure.ac 2010-04-06 13:08:53.000000000 +0400 -+++ Pacemaker-1-0-Pacemaker-1.0.8/configure.ac 2010-04-06 13:08:58.000000000 +0400 -@@ -106,9 +106,8 @@ - Cfile=/tmp/extract_define.$2.${$} - printf "#include \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} -- value=`${Cfile}` -+ printf "\"%s\":%s\n" $2 $2 >> ${Cfile}.c -+ value=`$CC $CFLAGS -E ${Cfile}.c | grep \"$2\" | cut -f 2 -d ':' | sed 's,^",,' | sed 's,"$,,'` - AC_MSG_RESULT($value) - printf $value - rm -f ${Cfile}.c ${Cfile} diff --git a/recipes/pacemaker/pacemaker-1.0.8/pacemaker-dont-use-help2man.patch b/recipes/pacemaker/pacemaker-1.0.8/pacemaker-dont-use-help2man.patch deleted file mode 100644 index da970d5079..0000000000 --- a/recipes/pacemaker/pacemaker-1.0.8/pacemaker-dont-use-help2man.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: Pacemaker-1-0-Pacemaker-1.0.8/configure.ac -=================================================================== ---- Pacemaker-1-0-Pacemaker-1.0.8.orig/configure.ac 2010-03-23 12:03:29.000000000 +0300 -+++ Pacemaker-1-0-Pacemaker-1.0.8/configure.ac 2010-03-23 12:06:43.000000000 +0300 -@@ -504,10 +504,7 @@ - AC_MSG_ERROR(You need (g)make installed in order to build ${PACKAGE}) - fi - --AM_CONDITIONAL(BUILD_HELP, test x"${HELP2MAN}" != x"") --if test x"${HELP2MAN}" != x""; then -- PKG_FEATURES="$PKG_FEATURES manpages" --fi -+AM_CONDITIONAL(BUILD_HELP, test x"" != x"") - - AM_CONDITIONAL(BUILD_ASCIIDOC, test x"${ASCIIDOC}" != x"") - if test x"${ASCIIDOC}" != x""; then diff --git a/recipes/pacemaker/pacemaker-1.0.8/pacemaker-remove-native-includes.patch b/recipes/pacemaker/pacemaker-1.0.8/pacemaker-remove-native-includes.patch deleted file mode 100644 index a16854024c..0000000000 --- a/recipes/pacemaker/pacemaker-1.0.8/pacemaker-remove-native-includes.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: Pacemaker-1-0-Pacemaker-1.0.8/configure.ac -=================================================================== ---- Pacemaker-1-0-Pacemaker-1.0.8.orig/configure.ac 2010-03-16 22:46:38.000000000 +0300 -+++ Pacemaker-1-0-Pacemaker-1.0.8/configure.ac 2010-03-23 00:06:28.000000000 +0300 -@@ -325,7 +325,6 @@ - ;; - *linux*) - AC_DEFINE_UNQUOTED(ON_LINUX, 1, Compiling for Linux platform) -- CFLAGS="$CFLAGS -I${prefix}/include" - ;; - darwin*) - AC_DEFINE_UNQUOTED(ON_DARWIN, 1, Compiling for Darwin platform) -@@ -334,9 +333,6 @@ - ;; - esac - --dnl Eventually remove this --CFLAGS="$CFLAGS -I${prefix}/include/heartbeat" -- - AC_SUBST(INIT_EXT) - AC_DEFINE_UNQUOTED(HA_LOG_FACILITY, LOG_DAEMON, Default logging facility) - diff --git a/recipes/pacemaker/pacemaker-1.0.9.1/fix-header-defs-lookup.patch b/recipes/pacemaker/pacemaker-1.0.9.1/fix-header-defs-lookup.patch new file mode 100644 index 0000000000..02ce26ec90 --- /dev/null +++ b/recipes/pacemaker/pacemaker-1.0.9.1/fix-header-defs-lookup.patch @@ -0,0 +1,16 @@ +Index: Pacemaker-1-0-Pacemaker-1.0.8/configure.ac +=================================================================== +--- Pacemaker-1-0-Pacemaker-1.0.8.orig/configure.ac 2010-04-06 13:08:53.000000000 +0400 ++++ Pacemaker-1-0-Pacemaker-1.0.8/configure.ac 2010-04-06 13:08:58.000000000 +0400 +@@ -106,9 +106,8 @@ + Cfile=/tmp/extract_define.$2.${$} + printf "#include \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} +- value=`${Cfile}` ++ printf "\"%s\":%s\n" $2 $2 >> ${Cfile}.c ++ value=`$CC $CFLAGS -E ${Cfile}.c | grep \"$2\" | cut -f 2 -d ':' | sed 's,^",,' | sed 's,"$,,'` + AC_MSG_RESULT($value) + printf $value + rm -f ${Cfile}.c ${Cfile} diff --git a/recipes/pacemaker/pacemaker-1.0.9.1/pacemaker-dont-use-help2man.patch b/recipes/pacemaker/pacemaker-1.0.9.1/pacemaker-dont-use-help2man.patch new file mode 100644 index 0000000000..da970d5079 --- /dev/null +++ b/recipes/pacemaker/pacemaker-1.0.9.1/pacemaker-dont-use-help2man.patch @@ -0,0 +1,16 @@ +Index: Pacemaker-1-0-Pacemaker-1.0.8/configure.ac +=================================================================== +--- Pacemaker-1-0-Pacemaker-1.0.8.orig/configure.ac 2010-03-23 12:03:29.000000000 +0300 ++++ Pacemaker-1-0-Pacemaker-1.0.8/configure.ac 2010-03-23 12:06:43.000000000 +0300 +@@ -504,10 +504,7 @@ + AC_MSG_ERROR(You need (g)make installed in order to build ${PACKAGE}) + fi + +-AM_CONDITIONAL(BUILD_HELP, test x"${HELP2MAN}" != x"") +-if test x"${HELP2MAN}" != x""; then +- PKG_FEATURES="$PKG_FEATURES manpages" +-fi ++AM_CONDITIONAL(BUILD_HELP, test x"" != x"") + + AM_CONDITIONAL(BUILD_ASCIIDOC, test x"${ASCIIDOC}" != x"") + if test x"${ASCIIDOC}" != x""; then diff --git a/recipes/pacemaker/pacemaker-1.0.9.1/pacemaker-remove-native-includes.patch b/recipes/pacemaker/pacemaker-1.0.9.1/pacemaker-remove-native-includes.patch new file mode 100644 index 0000000000..a16854024c --- /dev/null +++ b/recipes/pacemaker/pacemaker-1.0.9.1/pacemaker-remove-native-includes.patch @@ -0,0 +1,22 @@ +Index: Pacemaker-1-0-Pacemaker-1.0.8/configure.ac +=================================================================== +--- Pacemaker-1-0-Pacemaker-1.0.8.orig/configure.ac 2010-03-16 22:46:38.000000000 +0300 ++++ Pacemaker-1-0-Pacemaker-1.0.8/configure.ac 2010-03-23 00:06:28.000000000 +0300 +@@ -325,7 +325,6 @@ + ;; + *linux*) + AC_DEFINE_UNQUOTED(ON_LINUX, 1, Compiling for Linux platform) +- CFLAGS="$CFLAGS -I${prefix}/include" + ;; + darwin*) + AC_DEFINE_UNQUOTED(ON_DARWIN, 1, Compiling for Darwin platform) +@@ -334,9 +333,6 @@ + ;; + esac + +-dnl Eventually remove this +-CFLAGS="$CFLAGS -I${prefix}/include/heartbeat" +- + AC_SUBST(INIT_EXT) + AC_DEFINE_UNQUOTED(HA_LOG_FACILITY, LOG_DAEMON, Default logging facility) + diff --git a/recipes/pacemaker/pacemaker_1.0.8.bb b/recipes/pacemaker/pacemaker_1.0.8.bb deleted file mode 100644 index fb8c9dd5fc..0000000000 --- a/recipes/pacemaker/pacemaker_1.0.8.bb +++ /dev/null @@ -1,77 +0,0 @@ -DESCRIPTION = "Scalable High-Availability cluster resource manager" -LICENSE = "GPL" -DEPENDS = " \ - bzip2 \ - cluster-glue \ - cluster-resource-agents \ - glib-2.0 \ - gnutls \ - libxml2 \ - libxslt \ - ncurses \ - openais \ - python-native \ - util-linux-ng \ - zlib \ - " -RDEPENDS_${PN} += "openais" - -PR = "r4" - -SRC_URI = " \ - http://hg.clusterlabs.org/pacemaker/stable-1.0/archive/Pacemaker-${PV}.tar.bz2;name=tar \ - file://pacemaker-remove-native-includes.patch \ - file://pacemaker-dont-use-help2man.patch \ - file://fix-header-defs-lookup.patch \ - file://volatiles \ - " -SRC_URI_append_libc-uclibc = " file://kill-stack-protector.patch" -SRC_URI[tar.md5sum] = "088569ca893fe9f2239b68abe2856132" -SRC_URI[tar.sha256sum] = "07e2e5559720890603baac96aa7635ff02f0b33ead592977554e661c6afe7b55" -inherit autotools_stage python-dir - -S = "${WORKDIR}/Pacemaker-1-0-Pacemaker-${PV}" - -EXTRA_OECONF = "--with-ais --without-heartbeat --disable-fatal-warnings --disable-pretty" - -CFLAGS += "-I${STAGING_INCDIR}/heartbeat" - -do_install_append() { - install -d ${D}${sysconfdir}/default/volatiles - install -m 0644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/06_pacemaker - find ${D} -name "*.pyo" -exec rm {} \; - find ${D} -name "*.pyc" -exec rm {} \; - find ${D} -name "*.py" | xargs sed -i -e "s:${STAGING_BINDIR_NATIVE}:${bindir}:g" -} - -pkg_postinst_${PN} () { - set -e - grep haclient /etc/group || addgroup haclient - grep hacluster /etc/passwd || adduser --disabled-password --home=${localstatedir}/lib/heartbeat --ingroup haclient -g "HA cluster" hacluster - /etc/init.d/populate-volatile.sh update -} - -FILES_${PN} += " \ - ${libdir}/service_crm.so \ - ${libdir}/ocf/resource.d/pacemaker \ - ${libdir}/heartbeat/a* \ - ${libdir}/heartbeat/c* \ - ${libdir}/heartbeat/pengine \ - ${libdir}/heartbeat/pingd \ - ${libdir}/heartbeat/plugins/RAExec/stonith.so \ - ${libdir}/heartbeat/s* \ - " -FILES_${PN}-dbg += "${libdir}/heartbeat/.debug ${libdir}/heartbeat/plugins/RAExec/.debug/ ${libdir}/heartbeat/stonithdtest/.debug/ ${libexecdir}/lcrso/.debug" -FILES_${PN}-dev += "${libdir}/heartbeat/plugins/RAExec/*.la" -FILES_${PN}-static += "${libdir}/heartbeat/plugins/RAExec/*.a" - -PACKAGES =+ "${PN}-crm ${PN}-hb2openais ${PN}-haresources2cib ${PN}-tests ${PN}-snmp" -FILES_${PN}-crm = "${sbindir}/crm ${PYTHON_SITEPACKAGES_DIR} ${libdir}/heartbeat/crm_primitive.py " -RDEPENDS_${PN}-crm += "python-core" -FILES_${PN}-hb2openais = "${libdir}/heartbeat/hb2openais.sh ${libdir}/heartbeat/hb2openais-helper.py" -RDEPENDS_${PN}-hb2openais += "python-core" -FILES_${PN}-haresources2cib = "${libdir}/heartbeat/haresources2cib.py" -RDEPENDS_${PN}-haresources2cib += "python-core" -FILES_${PN}-tests = "${datadir}/pacemaker/tests" -RDEPENDS_${PN}-test += "python-core" -FILES_${PN}-snmp = "${datadir}/snmp/mibs/PCMK-MIB.txt" diff --git a/recipes/pacemaker/pacemaker_1.0.9.1.bb b/recipes/pacemaker/pacemaker_1.0.9.1.bb new file mode 100644 index 0000000000..652b0c657d --- /dev/null +++ b/recipes/pacemaker/pacemaker_1.0.9.1.bb @@ -0,0 +1,77 @@ +DESCRIPTION = "Scalable High-Availability cluster resource manager" +LICENSE = "GPL" +DEPENDS = " \ + bzip2 \ + cluster-glue \ + cluster-resource-agents \ + glib-2.0 \ + gnutls \ + libxml2 \ + libxslt \ + ncurses \ + openais \ + python-native \ + util-linux-ng \ + zlib \ + " +RDEPENDS_${PN} += "openais" + +PR = "r0" + +SRC_URI = " \ + http://hg.clusterlabs.org/pacemaker/stable-1.0/archive/Pacemaker-${PV}.tar.bz2 \ + file://pacemaker-remove-native-includes.patch \ + file://pacemaker-dont-use-help2man.patch \ + file://fix-header-defs-lookup.patch \ + file://volatiles \ + " +SRC_URI_append_libc-uclibc = " file://kill-stack-protector.patch" +SRC_URI[md5sum] = "c844d98a5e6163192dd9f073ba9856ff" +SRC_URI[sha256sum] = "55b30bf018720f28d92c22519cbb26ebedb5c511dbeedb7e2c2a2712034ebd92" +inherit autotools_stage python-dir + +S = "${WORKDIR}/Pacemaker-1-0-Pacemaker-${PV}" + +EXTRA_OECONF = "--with-ais --without-heartbeat --disable-fatal-warnings --disable-pretty" + +CFLAGS += "-I${STAGING_INCDIR}/heartbeat" + +do_install_append() { + install -d ${D}${sysconfdir}/default/volatiles + install -m 0644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/06_pacemaker + find ${D} -name "*.pyo" -exec rm {} \; + find ${D} -name "*.pyc" -exec rm {} \; + find ${D} -name "*.py" | xargs sed -i -e "s:${STAGING_BINDIR_NATIVE}:${bindir}:g" +} + +pkg_postinst_${PN} () { + set -e + grep haclient /etc/group || addgroup haclient + grep hacluster /etc/passwd || adduser --disabled-password --home=${localstatedir}/lib/heartbeat --ingroup haclient -g "HA cluster" hacluster + /etc/init.d/populate-volatile.sh update +} + +FILES_${PN} += " \ + ${libdir}/service_crm.so \ + ${libdir}/ocf/resource.d/pacemaker \ + ${libdir}/heartbeat/a* \ + ${libdir}/heartbeat/c* \ + ${libdir}/heartbeat/pengine \ + ${libdir}/heartbeat/pingd \ + ${libdir}/heartbeat/plugins/RAExec/stonith.so \ + ${libdir}/heartbeat/s* \ + " +FILES_${PN}-dbg += "${libdir}/heartbeat/.debug ${libdir}/heartbeat/plugins/RAExec/.debug/ ${libdir}/heartbeat/stonithdtest/.debug/ ${libexecdir}/lcrso/.debug" +FILES_${PN}-dev += "${libdir}/heartbeat/plugins/RAExec/*.la" +FILES_${PN}-static += "${libdir}/heartbeat/plugins/RAExec/*.a" + +PACKAGES =+ "${PN}-crm ${PN}-hb2openais ${PN}-haresources2cib ${PN}-tests ${PN}-snmp" +FILES_${PN}-crm = "${sbindir}/crm ${PYTHON_SITEPACKAGES_DIR} ${libdir}/heartbeat/crm_primitive.py " +RDEPENDS_${PN}-crm += "python-core" +FILES_${PN}-hb2openais = "${libdir}/heartbeat/hb2openais.sh ${libdir}/heartbeat/hb2openais-helper.py" +RDEPENDS_${PN}-hb2openais += "python-core" +FILES_${PN}-haresources2cib = "${libdir}/heartbeat/haresources2cib.py" +RDEPENDS_${PN}-haresources2cib += "python-core" +FILES_${PN}-tests = "${datadir}/pacemaker/tests" +RDEPENDS_${PN}-test += "python-core" +FILES_${PN}-snmp = "${datadir}/snmp/mibs/PCMK-MIB.txt" -- cgit v1.2.3