[yocto] [PATCH V2][meta-cgl] pacemaker: Upgrade 1.1.16 -> 1.1.19
changqing.li at windriver.com
changqing.li at windriver.com
Mon Aug 20 21:43:49 PDT 2018
From: Changqing Li <changqing.li at windriver.com>
1. Upgrade pacemaker to 1.1.19
2. fence_legacy/fence_pcmk in package pacemaker requires
/usr/bin/perl, but no providers found in
RDEPENDS_pacemaker, so add it
Signed-off-by: Changqing Li <changqing.li at windriver.com>
---
...-pacemaker-fix-compile-error-of-musl-libc.patch | 56 ++++++++++++++++++++++
.../pacemaker/0001-pacemaker-fix-xml-config.patch | 19 +++++---
.../{pacemaker_1.1.16.bb => pacemaker_1.1.19.bb} | 9 ++--
3 files changed, 74 insertions(+), 10 deletions(-)
create mode 100644 meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-pacemaker-fix-compile-error-of-musl-libc.patch
rename meta-cgl-common/recipes-cgl/pacemaker/{pacemaker_1.1.16.bb => pacemaker_1.1.19.bb} (93%)
diff --git a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-pacemaker-fix-compile-error-of-musl-libc.patch b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-pacemaker-fix-compile-error-of-musl-libc.patch
new file mode 100644
index 0000000..f8cbb7e
--- /dev/null
+++ b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-pacemaker-fix-compile-error-of-musl-libc.patch
@@ -0,0 +1,56 @@
+From 51b0df9242bb1e3eb41362381472a00727910f64 Mon Sep 17 00:00:00 2001
+From: Changqing Li <changqing.li at windriver.com>
+Date: Fri, 10 Aug 2018 15:08:31 +0800
+Subject: [PATCH] pacemaker: fix compile error of musl libc
+
+Upstream-Status: Pending
+
+Signed-off-by: Changqing Li <changqing.li at windriver.com>
+---
+ include/crm/stonith-ng.h | 1 +
+ lib/cib/cib_remote.c | 3 ---
+ tools/crm_mon.c | 2 +-
+ 3 files changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/include/crm/stonith-ng.h b/include/crm/stonith-ng.h
+index 56c1ec7..a637b47 100644
+--- a/include/crm/stonith-ng.h
++++ b/include/crm/stonith-ng.h
+@@ -28,6 +28,7 @@
+ # include <dlfcn.h>
+ # include <errno.h>
+ # include <stdbool.h>
++# include <time.h>
+
+ /* TO-DO: Work out how to drop this requirement */
+ # include <libxml/tree.h>
+diff --git a/lib/cib/cib_remote.c b/lib/cib/cib_remote.c
+index 4d7b93b..8be8ecc 100644
+--- a/lib/cib/cib_remote.c
++++ b/lib/cib/cib_remote.c
+@@ -53,9 +53,6 @@ typedef void gnutls_session_t;
+ #endif
+
+ #include <arpa/inet.h>
+-#ifndef ON_BSD
+-# include <sgtty.h>
+-#endif
+
+ #define DH_BITS 1024
+
+diff --git a/tools/crm_mon.c b/tools/crm_mon.c
+index 7c63803..1ae6c21 100644
+--- a/tools/crm_mon.c
++++ b/tools/crm_mon.c
+@@ -553,7 +553,7 @@ main(int argc, char **argv)
+
+ #if !defined (ON_DARWIN) && !defined (ON_BSD)
+ /* prevent zombies */
+- signal(SIGCLD, SIG_IGN);
++ signal(SIGCHLD, SIG_IGN);
+ #endif
+
+ if (crm_ends_with_ext(argv[0], ".cgi") == TRUE) {
+--
+2.7.4
+
diff --git a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-pacemaker-fix-xml-config.patch b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-pacemaker-fix-xml-config.patch
index c27052d..72c3a1e 100644
--- a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-pacemaker-fix-xml-config.patch
+++ b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-pacemaker-fix-xml-config.patch
@@ -1,27 +1,29 @@
-From a55e235f56bc6e894e79fa200c39678e06ef985e Mon Sep 17 00:00:00 2001
-From: Bian Naimeng <biannm at cn.fujitsu.com>
-Date: Fri, 3 Jul 2015 15:48:58 +0900
+From ac1ff1d538d2be205fbcc9676c6497a1395b71d8 Mon Sep 17 00:00:00 2001
+From: Changqing Li <changqing.li at windriver.com>
+Date: Fri, 10 Aug 2018 14:59:33 +0800
Subject: [PATCH] pacemaker: fix xml config
Signed-off-by: Bian Naimeng <biannm at cn.fujitsu.com>
+update to version 1.1.19
+Signed-off-by: Changqing Li <changqing.li at windriver.com>
---
configure.ac | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 7195f9b..5e420f2 100644
+index 3bf1914..345caeb 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -557,7 +557,6 @@ AC_PATH_PROGS(TAR, tar)
+@@ -555,7 +555,6 @@ AC_PATH_PROGS(TAR, tar)
AC_PATH_PROGS(MD5, md5)
AC_PATH_PROGS(TEST, test)
- AC_PATH_PROGS(PKGCONFIG, pkg-config)
+ PKG_PROG_PKG_CONFIG
-AC_PATH_PROGS(XML2CONFIG, xml2-config)
AC_PATH_PROGS(VALGRIND_BIN, valgrind, /usr/bin/valgrind)
AC_DEFINE_UNQUOTED(VALGRIND_BIN, "$VALGRIND_BIN", Valgrind command)
-@@ -807,17 +806,13 @@ dnl AC_CHECK_HEADERS(netinet/icmp6.h)
+@@ -805,17 +804,13 @@ dnl AC_CHECK_HEADERS(netinet/icmp6.h)
dnl AC_CHECK_HEADERS(netinet/ip6.h)
dnl AC_CHECK_HEADERS(netinet/ip_icmp.h)
@@ -45,3 +47,6 @@ index 7195f9b..5e420f2 100644
AC_CHECK_HEADERS(libxml/xpath.h)
AC_CHECK_HEADERS(libxslt/xslt.h)
+--
+2.7.4
+
diff --git a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.16.bb b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.19.bb
similarity index 93%
rename from meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.16.bb
rename to meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.19.bb
index 8726111..181c65f 100644
--- a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.16.bb
+++ b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.19.bb
@@ -24,8 +24,11 @@ SRC_URI = "https://github.com/ClusterLabs/${BPN}/archive/Pacemaker-${PV}.zip \
file://volatiles \
file://tmpfiles \
"
-SRC_URI[md5sum] = "6f60f733823d31acbef4556fb749c457"
-SRC_URI[sha256sum] = "2642264b27c584eff5747a2a34c7f2bff13d52741e4e5cc70f14b2b6cd1fe7d5"
+
+SRC_URI_append_libc-musl = "file://0001-pacemaker-fix-compile-error-of-musl-libc.patch"
+
+SRC_URI[md5sum] = "deb7017c5a9d3f39895d9ea2c34bc8eb"
+SRC_URI[sha256sum] = "6e222046487c2dc6ae61d49089ecbf6a0bcb495e8cdcb76d115fd987d0df8f7f"
inherit autotools-brokensep pkgconfig systemd python-dir useradd
@@ -89,7 +92,7 @@ FILES_${PN} += " ${datadir}/snmp \
${libdir}/${PYTHON_DIR}/site-packages \
"
FILES_${PN}-dbg += "${libdir}/corosync/lcrso/.debug"
-RDEPENDS_${PN} = "bash python libqb ${PN}-cli-utils"
+RDEPENDS_${PN} = "bash python perl libqb ${PN}-cli-utils"
SYSTEMD_AUTO_ENABLE = "disable"
--
2.7.4
More information about the yocto
mailing list