From 7b77d8014539fd31a0bc400b58e8b9d0a3d1ba00 Mon Sep 17 00:00:00 2001 From: Roman I Khimov Date: Fri, 23 Apr 2010 18:59:28 +0400 Subject: cluster-resource-agents: update to version 1.0.3 Signed-off-by: Roman I Khimov --- recipes/linux-ha/cluster-resource-agents_1.0.2.bb | 77 --------------------- recipes/linux-ha/cluster-resource-agents_1.0.3.bb | 82 +++++++++++++++++++++++ 2 files changed, 82 insertions(+), 77 deletions(-) delete mode 100644 recipes/linux-ha/cluster-resource-agents_1.0.2.bb create mode 100644 recipes/linux-ha/cluster-resource-agents_1.0.3.bb diff --git a/recipes/linux-ha/cluster-resource-agents_1.0.2.bb b/recipes/linux-ha/cluster-resource-agents_1.0.2.bb deleted file mode 100644 index 1871eee4cd..0000000000 --- a/recipes/linux-ha/cluster-resource-agents_1.0.2.bb +++ /dev/null @@ -1,77 +0,0 @@ -DESCRIPTION = "OCF resource agents for use by compatible cluster managers" -LICENSE = "GPL" -DEPENDS = "cluster-glue" - -PR = "r3" - -SRC_URI = " \ - http://hg.linux-ha.org/agents/archive/agents-${PV}.tar.bz2;name=tar \ - file://fix-header-defs-lookup.patch;patch=1 \ - file://disable-doc-build.patch;patch=1 \ - " -SRC_URI_append_libc-uclibc = " file://kill-stack-protector.patch;patch=1" -SRC_URI[tar.md5sum] = "b536dea1b1f642bdc3607cb85ea0b89d" -SRC_URI[tar.sha256sum] = "c5a1ea9a83c578672cd475ab4af5c2e40736669bae0eb70bb9bb6124074e5e5e" - -inherit autotools_stage - -S = "${WORKDIR}/Cluster-Resource-Agents-agents-${PV}" - -# ARM build fails on send_arp.linux.c with -# -# cc1: warnings being treated as errors -# send_arp.linux.c: In function 'send_pack': -# send_arp.linux.c:106: error: cast increases required alignment of target type -# send_arp.linux.c: In function 'recv_pack': -# send_arp.linux.c:207: error: cast increases required alignment of target type -# -# The code itself doesn't look that bad, so just disable -Werror -EXTRA_OECONF_arm += "--disable-fatal-warnings" - -PACKAGES =+ "ldirectord ldirectord-doc" - -FILES_ldirectord = " \ - ${sbindir}/ldirectord \ - ${sysconfdir}/ha.d/resource.d/ldirectord \ - ${sysconfdir}/init.d/ldirectord \ - ${sysconfdir}/logrotate.d/ldirectord \ - ${libdir}/ocf/resource.d/heartbeat/ldirectord \ - " -FILES_ldirectord-doc = "${mandir}/man8/ldirectord.8*" - -# Missing: -# Authen::Radius -# Net::LDAP -# Net::IMAP::Simple::SSL -# Net::IMAP::Simple -RDEPENDS_ldirectord += " \ - libdbi-perl \ - libmailtools-perl \ - libnet-dns-perl \ - libsocket6-perl \ - libwww-perl \ - perl \ - perl-module-getopt-long \ - perl-module-net-ftp \ - perl-module-net-smtp \ - perl-module-pod-usage \ - perl-module-posix \ - perl-module-socket \ - perl-module-strict \ - perl-module-sys-hostname \ - perl-module-sys-syslog \ - perl-module-vars \ - " - -FILES_${PN} += " \ - /usr/lib/heartbeat/findif \ - /usr/lib/heartbeat/ocf-returncodes \ - /usr/lib/heartbeat/ocf-shellfuncs \ - /usr/lib/heartbeat/send_arp \ - /usr/lib/heartbeat/sfex_daemon \ - /usr/lib/heartbeat/tickle_tcp \ - /usr/lib/ocf/resource.d/heartbeat/ \ - /usr/share/resource-agents/ra-api-1.dtd \ - " - -FILES_${PN}-dbg += "/usr/lib/heartbeat/.debug/" diff --git a/recipes/linux-ha/cluster-resource-agents_1.0.3.bb b/recipes/linux-ha/cluster-resource-agents_1.0.3.bb new file mode 100644 index 0000000000..58da21445a --- /dev/null +++ b/recipes/linux-ha/cluster-resource-agents_1.0.3.bb @@ -0,0 +1,82 @@ +DESCRIPTION = "OCF resource agents for use by compatible cluster managers" +LICENSE = "GPL" +DEPENDS = "cluster-glue" + +PR = "r0" + +SRC_URI = " \ + http://hg.linux-ha.org/agents/archive/agents-${PV}.tar.bz2;name=tar \ + file://fix-header-defs-lookup.patch;patch=1 \ + file://disable-doc-build.patch;patch=1 \ + " +SRC_URI_append_libc-uclibc = " file://kill-stack-protector.patch;patch=1" +SRC_URI[tar.md5sum] = "fcaa2cfd83a28d1965200e11db2ddd41" +SRC_URI[tar.sha256sum] = "09b58332e34cf128c8d53d5bb4b3f61e402c2e0c0c809f5abae53ca144ad101e" + +inherit autotools_stage + +S = "${WORKDIR}/Cluster-Resource-Agents-agents-${PV}" + +# ARM build fails on send_arp.linux.c with +# +# cc1: warnings being treated as errors +# send_arp.linux.c: In function 'send_pack': +# send_arp.linux.c:106: error: cast increases required alignment of target type +# send_arp.linux.c: In function 'recv_pack': +# send_arp.linux.c:207: error: cast increases required alignment of target type +# +# The code itself doesn't look that bad, so just disable -Werror +EXTRA_OECONF_arm += "--disable-fatal-warnings" + +PACKAGES =+ "ldirectord ldirectord-doc ocft" + +FILES_ldirectord = " \ + ${sbindir}/ldirectord \ + ${sysconfdir}/ha.d/resource.d/ldirectord \ + ${sysconfdir}/init.d/ldirectord \ + ${sysconfdir}/logrotate.d/ldirectord \ + ${libdir}/ocf/resource.d/heartbeat/ldirectord \ + " +FILES_ldirectord-doc = "${mandir}/man8/ldirectord.8*" + +# Missing: +# Authen::Radius +# Net::LDAP +# Net::IMAP::Simple::SSL +# Net::IMAP::Simple +RDEPENDS_ldirectord += " \ + libdbi-perl \ + libmailtools-perl \ + libnet-dns-perl \ + libsocket6-perl \ + libwww-perl \ + perl \ + perl-module-getopt-long \ + perl-module-net-ftp \ + perl-module-net-smtp \ + perl-module-pod-usage \ + perl-module-posix \ + perl-module-socket \ + perl-module-strict \ + perl-module-sys-hostname \ + perl-module-sys-syslog \ + perl-module-vars \ + " + +FILES_${PN} += " \ + ${libdir}/heartbeat/findif \ + ${libdir}/heartbeat/ocf-returncodes \ + ${libdir}/heartbeat/ocf-shellfuncs \ + ${libdir}/heartbeat/send_arp \ + ${libdir}/heartbeat/sfex_daemon \ + ${libdir}/heartbeat/tickle_tcp \ + ${libdir}/ocf/resource.d/heartbeat/ \ + ${datadir}/resource-agents/ra-api-1.dtd \ + " + +FILES_ocft += " \ + ${datadir}/resource-agents/ocft \ + ${sbindir}/ocft \ + " + +FILES_${PN}-dbg += "/usr/lib/heartbeat/.debug/" -- cgit 1.2.3-korg