From 5486dcbf08200c22b6086d37055fb64de423eabe Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 20 Sep 2010 15:16:20 -0700 Subject: corosync: Fix compilation Update to 1.2.8 Add corosync-docs.patch to fix html doc compilation Signed-off-by: Khem Raj --- recipes/corosync/corosync_1.2.7.bb | 41 ----------------------------- recipes/corosync/corosync_1.2.8.bb | 42 ++++++++++++++++++++++++++++++ recipes/corosync/files/corosync-docs.patch | 38 +++++++++++++++++++++++++++ 3 files changed, 80 insertions(+), 41 deletions(-) delete mode 100644 recipes/corosync/corosync_1.2.7.bb create mode 100644 recipes/corosync/corosync_1.2.8.bb create mode 100644 recipes/corosync/files/corosync-docs.patch (limited to 'recipes') diff --git a/recipes/corosync/corosync_1.2.7.bb b/recipes/corosync/corosync_1.2.7.bb deleted file mode 100644 index b3f6f49b51..0000000000 --- a/recipes/corosync/corosync_1.2.7.bb +++ /dev/null @@ -1,41 +0,0 @@ -DESCRIPTION = "OSI Certified implementation of a complete cluster engine" -LICENSE = "BSD" - -PR = "r0" - -SRC_URI = " \ - ftp://ftp@corosync.org/downloads/corosync-${PV}/corosync-${PV}.tar.gz \ - file://fix-lcrso-linkage.patch \ - file://init \ - file://corosync.conf \ - file://volatiles \ - file://fix-define-semun-union.patch \ - " -SRC_URI[md5sum] = "a1f5b03512977d495819e2ed05ba645b" -SRC_URI[sha256sum] = "0f774cee5d9f5d3e20b146c8719115c029815015952b48de1b99b61b462367d1" - - -inherit autotools update-rc.d - -INITSCRIPT_NAME = "corosync-daemon" - -EXTRA_OECONF = "--disable-nss" - -FILES_${PN}-dbg += "${libexecdir}/lcrso/.debug" - -do_install_append() { - install -d ${D}/${sysconfdir}/init.d - install -d ${D}${sysconfdir}/default/volatiles - # Original init script is too bashy - rm -f ${D}/${sysconfdir}/init.d/corosync - install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/corosync-daemon - install -m 0644 ${WORKDIR}/corosync.conf ${D}/${sysconfdir}/corosync/corosync.conf.example - install -m 0644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/05_corosync -} - -pkg_postinst_${PN} () { - set -e - grep haclient /etc/group || addgroup haclient - grep hacluster /etc/passwd || adduser --disabled-password --home=/var/lib/heartbeat --ingroup haclient -g "HA cluster" hacluster - /etc/init.d/populate-volatile.sh update -} diff --git a/recipes/corosync/corosync_1.2.8.bb b/recipes/corosync/corosync_1.2.8.bb new file mode 100644 index 0000000000..c3e4290009 --- /dev/null +++ b/recipes/corosync/corosync_1.2.8.bb @@ -0,0 +1,42 @@ +DESCRIPTION = "OSI Certified implementation of a complete cluster engine" +LICENSE = "BSD" +DEPENDS = "groff-native" + +PR = "r0" + +SRC_URI = " \ + ftp://ftp@corosync.org/downloads/corosync-${PV}/corosync-${PV}.tar.gz \ + file://fix-lcrso-linkage.patch \ + file://corosync-docs.patch \ + file://init \ + file://corosync.conf \ + file://volatiles \ + file://fix-define-semun-union.patch \ + " +SRC_URI[md5sum] = "43e97ef0d964ccb4063f40a4478eb679" +SRC_URI[sha256sum] = "424b0590e52a08cf9066f9edbac4edf84e9d9bff54dd5036fb681d917db02bc8" + +inherit autotools update-rc.d + +INITSCRIPT_NAME = "corosync-daemon" + +EXTRA_OECONF = "--disable-nss" + +FILES_${PN}-dbg += "${libexecdir}/lcrso/.debug" + +do_install_append() { + install -d ${D}/${sysconfdir}/init.d + install -d ${D}${sysconfdir}/default/volatiles + # Original init script is too bashy + rm -f ${D}/${sysconfdir}/init.d/corosync + install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/corosync-daemon + install -m 0644 ${WORKDIR}/corosync.conf ${D}/${sysconfdir}/corosync/corosync.conf.example + install -m 0644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/05_corosync +} + +pkg_postinst_${PN} () { + set -e + grep haclient /etc/group || addgroup haclient + grep hacluster /etc/passwd || adduser --disabled-password --home=/var/lib/heartbeat --ingroup haclient -g "HA cluster" hacluster + /etc/init.d/populate-volatile.sh update +} diff --git a/recipes/corosync/files/corosync-docs.patch b/recipes/corosync/files/corosync-docs.patch new file mode 100644 index 0000000000..1b5fc30421 --- /dev/null +++ b/recipes/corosync/files/corosync-docs.patch @@ -0,0 +1,38 @@ +Make docs optional + +--- a/configure.ac ++++ b/configure.ac +@@ -432,7 +432,7 @@ + fi + + # final build of *FLAGS +-CFLAGS="$ENV_CFLAGS $OPT_CFLAGS $GDB_FLAGS $OS_CFLAGS \ ++CFLAGS="$ENV_CFLAGS $OS_CFLAGS \ + $COVERAGE_CFLAGS $EXTRA_WARNINGS $WERROR_CFLAGS $NSS_CFLAGS" + CPPFLAGS="$ENV_CPPFLAGS $ANSI_CPPFLAGS $OS_CPPFLAGS" + LDFLAGS="$ENV_LDFLAGS $COVERAGE_LDFLAGS $OS_LDFLAGS" +@@ -458,7 +458,10 @@ + AC_SUBST([DARWIN_OPTS]) + AC_SUBST([SOLARIS_OPTS]) + +-AM_CONDITIONAL(BUILD_HTML_DOCS, test -n "${GROFF}") ++AC_ARG_ENABLE([doc], ++ AS_HELP_STRING([--enable-doc],[Build html documentation]) ++) ++AM_CONDITIONAL(BUILD_HTML_DOCS, [test -n "${GROFF}" && test "x$enable_doc" = "xyes"] ) + + AC_SUBST([LINT_FLAGS]) + +--- a/Makefile.am ++++ b/Makefile.am +@@ -41,9 +41,6 @@ + config.guess config.sub missing install-sh \ + autoheader automake autoconf + +-dist_doc_DATA = LICENSE INSTALL README.devmap \ +- README.recovery SECURITY TODO AUTHORS +- + corosysconfdir = ${COROSYSCONFDIR} + + corosysconf_DATA = conf/corosync.conf.example + -- cgit v1.2.3