[meta-cgl][PATCH 17/20] pacemaker: Update to 2.0.3

["Jeremy Puhlman" <jpuhlman@mvista.com>]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=y, Size: 22853 bytes --]

Drop unneeded patches moving some in to metadata.
Fix up for building 2.0.3

Signed-off-by: Jeremy A. Puhlman <jpuhlman@mvista.com>
---
 .../pacemaker/0001-pacemaker-fix-xml-config.patch  |  52 --------
 ...earch-header-from-STAGING_INCDIR-to-walka.patch |  37 ------
 .../0003-pacemaker-fix-header-defs-lookup.patch    |  27 ----
 .../0004-pacemaker-do-not-build-help.patch         |  27 ----
 ...o-not-execute-target-program-while-cross-.patch |  44 -------
 ...-Fix-definition-of-curses_indented_printf.patch |  30 +++++
 ...006-pacemaker-do-not-use-libgnutls-config.patch |  35 ------
 ...-Make-the-testing-infrastructure-optional.patch | 137 ---------------------
 .../pacemaker/set-OCF_ROOT_DIR-to-libdir-ocf.patch |  28 -----
 .../{pacemaker_1.1.21.bb => pacemaker_2.0.3.bb}    |  26 ++--
 10 files changed, 43 insertions(+), 400 deletions(-)
 delete mode 100644 meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-pacemaker-fix-xml-config.patch
 delete mode 100644 meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0002-pacemaker-search-header-from-STAGING_INCDIR-to-walka.patch
 delete mode 100644 meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0003-pacemaker-fix-header-defs-lookup.patch
 delete mode 100644 meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0004-pacemaker-do-not-build-help.patch
 delete mode 100644 meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0005-pacemaker-do-not-execute-target-program-while-cross-.patch
 create mode 100644 meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0006-Fix-tools-Fix-definition-of-curses_indented_printf.patch
 delete mode 100644 meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0006-pacemaker-do-not-use-libgnutls-config.patch
 delete mode 100644 meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0007-Make-the-testing-infrastructure-optional.patch
 delete mode 100644 meta-cgl-common/recipes-cgl/pacemaker/pacemaker/set-OCF_ROOT_DIR-to-libdir-ocf.patch
 rename meta-cgl-common/recipes-cgl/pacemaker/{pacemaker_1.1.21.bb => pacemaker_2.0.3.bb} (82%)

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
deleted file mode 100644
index 72c3a1e..0000000
--- a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-pacemaker-fix-xml-config.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From ac1ff1d538d2be205fbcc9676c6497a1395b71d8 Mon Sep 17 00:00:00 2001
-From: Changqing Li <changqing.li@windriver.com>
-Date: Fri, 10 Aug 2018 14:59:33 +0800
-Subject: [PATCH] pacemaker: fix xml config
-
-Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com>
-
-update to version 1.1.19
-Signed-off-by: Changqing Li <changqing.li@windriver.com>
----
- configure.ac | 17 ++++++-----------
- 1 file changed, 6 insertions(+), 11 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 3bf1914..345caeb 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -555,7 +555,6 @@ AC_PATH_PROGS(TAR, tar)
- AC_PATH_PROGS(MD5, md5)
- AC_PATH_PROGS(TEST, test)
- 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)
- 
-@@ -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)
- 
--AC_MSG_CHECKING(for special libxml2 includes)
--if test "x$XML2CONFIG" = "x"; then
--   AC_MSG_ERROR(libxml2 config not found)
--else
--   XML2HEAD="`$XML2CONFIG --cflags`"
--   AC_MSG_RESULT($XML2HEAD)
--   AC_CHECK_LIB(xml2, xmlReadMemory)
--   AC_CHECK_LIB(xslt, xsltApplyStylesheet)
--fi
-+PKG_CHECK_MODULES([XML], [libxml-2.0])
-+PKG_CHECK_MODULES([XSLT], [libxslt])
-+
-+AC_CHECK_LIB(xml2, xmlReadMemory)
-+AC_CHECK_LIB(xslt, xsltApplyStylesheet)
- 
--CPPFLAGS="$CPPFLAGS $XML2HEAD"
-+CPPFLAGS="$CPPFLAGS $XML_CFLAGS"
- 
- 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/0002-pacemaker-search-header-from-STAGING_INCDIR-to-walka.patch b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0002-pacemaker-search-header-from-STAGING_INCDIR-to-walka.patch
deleted file mode 100644
index 83940d1..0000000
--- a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0002-pacemaker-search-header-from-STAGING_INCDIR-to-walka.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 844ec301031b0e6a3000c793906ba476f08a1e65 Mon Sep 17 00:00:00 2001
-From: Li xin <lixin.fnst@cn.fujitsu.com>
-Date: Wed, 27 Dec 2017 05:20:45 +0000
-Subject: [PATCH] pacemaker: search header from STAGING_INCDIR to walkaround
- error
-
-** -I/usr/include/ is unsafe for cross-compilation
-
- ... ...
-
- ** This autoconf log indicates errors, it looked at host include and/or library paths
- ** while determining system capabilities
-
-Upstream-Status: pending
-
-Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com>
-Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
-Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com>
-
----
- configure.ac | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 5e420f2..5d442a5 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -484,6 +484,9 @@ esac
- dnl Eventually remove this
- if test "$cross_compiling" != "yes"; then
-    CPPFLAGS="$CPPFLAGS -I${prefix}/include/heartbeat"
-+else
-+   CFLAGS="$CFLAGS -I${STAGING_INCDIR}/heartbeat"
-+   CPPFLAGS="$CPPFLAGS -I${STAGING_INCDIR}/heartbeat"
- fi
- 
- AC_SUBST(INIT_EXT)
diff --git a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0003-pacemaker-fix-header-defs-lookup.patch b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0003-pacemaker-fix-header-defs-lookup.patch
deleted file mode 100644
index 6dc4663..0000000
--- a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0003-pacemaker-fix-header-defs-lookup.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 9236fa746d43adb098c2946e72e8b29ffbc78865 Mon Sep 17 00:00:00 2001
-From: Bian Naimeng <biannm@cn.fujitsu.com>
-Date: Fri, 3 Jul 2015 16:30:25 +0900
-Subject: [PATCH] pacemaker: fix header defs lookup
-
-Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com>
-
----
- configure.ac | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 5d442a5..1429b01 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -147,9 +147,8 @@ extract_header_define() {
- 	  Cfile=$srcdir/extract_define.$2.${$}
- 	  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}
--	  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 -rf ${Cfile}.c ${Cfile} ${Cfile}.dSYM ${Cfile}.gcno
diff --git a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0004-pacemaker-do-not-build-help.patch b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0004-pacemaker-do-not-build-help.patch
deleted file mode 100644
index 4234fe5..0000000
--- a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0004-pacemaker-do-not-build-help.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From cda171512fc8dc0aa385290e1f7644ff222e5f18 Mon Sep 17 00:00:00 2001
-From: Bian Naimeng <biannm@cn.fujitsu.com>
-Date: Fri, 3 Jul 2015 17:27:52 +0900
-Subject: [PATCH] pacemaker: do not build help
-
-Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com>
-
----
- configure.ac | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 1429b01..e930e33 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -574,10 +574,7 @@ if test x"${MAKE}" = x""; then
-    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
--   PCMK_FEATURES="$PCMK_FEATURES generated-manpages"
--fi
-+AM_CONDITIONAL(BUILD_HELP, test x"Do not build help" = x"")
- 
- MANPAGE_XSLT=""
- if test x"${XSLTPROC}" != x""; then
diff --git a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0005-pacemaker-do-not-execute-target-program-while-cross-.patch b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0005-pacemaker-do-not-execute-target-program-while-cross-.patch
deleted file mode 100644
index b600fec..0000000
--- a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0005-pacemaker-do-not-execute-target-program-while-cross-.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 6d59090df5856d32163f256912ddf1c897590447 Mon Sep 17 00:00:00 2001
-From: Changqing Li <changqing.li@windriver.com>
-Date: Wed, 21 Aug 2019 13:12:13 +0800
-Subject: [PATCH] pacemaker: do not execute target program while cross compile
-
-Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com>
-
-refresh patch to new version 1.1.21
-Signed-off-by: Changqing Li <changqing.li@windriver.com>
----
- Makefile.common | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile.common b/Makefile.common
-index 469417f..9f19a53 100644
---- a/Makefile.common
-+++ b/Makefile.common
-@@ -36,18 +36,20 @@ if BUILD_HELP
- man8_MANS		= $(sbin_PROGRAMS:%=%.8) $(sbin_SCRIPTS:%=%.8)
- endif
- 
-++man7_MANS              =
-+
- %.8:	% $(MAN8DEPS)
- 	chmod a+x $(abs_builddir)/$<
- 	$(AM_V_MAN)PATH=$(abs_builddir):$$PATH $(HELP2MAN) --output $@ --no-info --section 8 --name "Part of the Pacemaker cluster resource manager" $(abs_builddir)/$<
- 
- %.xml:  %
--	$(AM_V_GEN)$(abs_builddir)/$< metadata > $@
-+        @echo "xml for $<: Do not try to execute target program here"
- 
- %.dbook: %.xml
--	$(AM_V_XSL)$(XSLTPROC) --nonet --novalid --stringparam man.name $* $(DBOOK_OPTS) $(top_srcdir)/xml/ocf-meta2man.xsl $(abs_builddir)/$< > $(abs_builddir)/$@
-+        @echo "dbook for $<: Do not try to execute target program here"
- 
- %.7:	%.dbook
--	$(AM_V_XSL)$(XSLTPROC) $(MANPAGE_XSLT) $(abs_builddir)/$< $(PCMK_quiet)
-+        @echo "man7 for $<: Do not try to execute target program here"
- 
- # Build docbook from asciidoc because XML is a PITA to edit
- #
--- 
-2.7.4
-
diff --git a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0006-Fix-tools-Fix-definition-of-curses_indented_printf.patch b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0006-Fix-tools-Fix-definition-of-curses_indented_printf.patch
new file mode 100644
index 0000000..f5e1829
--- /dev/null
+++ b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0006-Fix-tools-Fix-definition-of-curses_indented_printf.patch
@@ -0,0 +1,30 @@
+From 426f06cc088d11d6db0c45b434e5ce6b69da78b4 Mon Sep 17 00:00:00 2001
+From: Chris Lumens <clumens@redhat.com>
+Date: Thu, 2 Jan 2020 15:08:58 -0500
+Subject: [PATCH 006/207] Fix: tools: Fix definition of curses_indented_printf.
+
+The placeholder version that is built if curses is not enabled does not
+have a type that matches the header file.  Correct that.
+
+Signed-off-by: Jeremy A. Puhlman <jpuhlman@mvista.com>
+Upstream-Status: Backport[git]
+---
+ tools/crm_mon_curses.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/crm_mon_curses.c b/tools/crm_mon_curses.c
+index c0dbedbf0..ecd0584fe 100644
+--- a/tools/crm_mon_curses.c
++++ b/tools/crm_mon_curses.c
+@@ -368,7 +368,7 @@ curses_indented_vprintf(pcmk__output_t *out, const char *format, va_list args) {
+ 
+ G_GNUC_PRINTF(2, 3)
+ void
+-curses_indented_printf(pcmk__output_t *out, const char *format, va_list args) {
++curses_indented_printf(pcmk__output_t *out, const char *format, ...) {
+     return;
+ }
+ 
+-- 
+2.23.0
+
diff --git a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0006-pacemaker-do-not-use-libgnutls-config.patch b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0006-pacemaker-do-not-use-libgnutls-config.patch
deleted file mode 100644
index c1ffc86..0000000
--- a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0006-pacemaker-do-not-use-libgnutls-config.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 5148e0a7e3cd4293416b969f2c563faa6aca27b2 Mon Sep 17 00:00:00 2001
-From: Joe Slater <jslater@windriver.com>
-Date: Mon, 11 Mar 2013 15:47:54 -0700
-Subject: [PATCH] pacemaker: do not use libgnutls-config
-
-Do not try to use libgnutls-config when configuring.
-It has been deprecated and we do not supply it.  If a
-host version is found, bad things can happen.
-
-Upstream-Status: Inappropriate [OE specific]
-
-Signed-off-by: Joe Slater <jslater@windriver.com>
-Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
-
----
- configure.ac | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index e930e33..2eade3c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1707,9 +1707,9 @@ dnl ========================================================================
- AC_CHECK_HEADERS(gnutls/gnutls.h)
- AC_CHECK_HEADERS(security/pam_appl.h pam/pam_appl.h)
- 
--dnl GNUTLS library: Attempt to determine by 'libgnutls-config' program.
--dnl If no 'libgnutls-config', try traditional autoconf means.
--AC_PATH_PROGS(LIBGNUTLS_CONFIG, libgnutls-config)
-+dnl libgnutls-config has been deprecated, so we use pkg-config
-+
-+LIBGNUTLS_CONFIG="pkg-config gnutls"
- 
- if test -n "$LIBGNUTLS_CONFIG"; then
- 	AC_MSG_CHECKING(for gnutls header flags)
diff --git a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0007-Make-the-testing-infrastructure-optional.patch b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0007-Make-the-testing-infrastructure-optional.patch
deleted file mode 100644
index 3417aae..0000000
--- a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0007-Make-the-testing-infrastructure-optional.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-From 8a7c861e746ef13a2ffe74388891d7ea5709614b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ferenc=20W=C3=A1gner?= <wferi@debian.org>
-Date: Thu, 29 Sep 2016 10:47:49 +0200
-Subject: [PATCH] Make the testing infrastructure optional
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream does not want this option, unfortunately.
-https://github.com/ClusterLabs/pacemaker/pull/1149
-
-Signed-off-by: Ferenc Wágner <wferi@debian.org>
-
-It does not install test case by default
-Backport the patch from ubuntu
-http://archive.ubuntu.com/ubuntu/pool/main/p/pacemaker/pacemaker_1.1.18-0ubuntu1.debian.tar.xz
-Upstream-Status: Deny [https://github.com/ClusterLabs/pacemaker/pull/1149]
-
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
----
- Makefile.am         | 2 ++
- configure.ac        | 5 +++++
- fencing/Makefile.am | 2 ++
- lrmd/Makefile.am    | 2 ++
- pengine/Makefile.am | 2 ++
- tools/Makefile.am   | 2 ++
- 6 files changed, 15 insertions(+)
-
-diff --git a/Makefile.am b/Makefile.am
-index 874f6ed..9ce8b12 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -35,6 +35,7 @@ ACLOCAL_AMFLAGS  = -I m4
- licensedir              = $(docdir)/licenses/
- license_DATA            = $(wildcard licenses/*)
- 
-+if ENABLE_TESTS
- # Test components
- SUBDIRS	+= cts
- 
-@@ -46,6 +47,7 @@ test_DATA		= valgrind-pcmk.suppressions
- noinst_PROGRAMS = scratch
- nodist_scratch_SOURCES	= scratch.c
- scratch_LDADD	= $(top_builddir)/lib/common/libcrmcommon.la -lm
-+endif
- 
- scratch.c:
- 	echo 'int main(void){}' >$@
-diff --git a/configure.ac b/configure.ac
-index b87e61b..a0cf3e2 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -330,6 +330,11 @@ AC_ARG_WITH(configdir,
-     [ CONFIGDIR="$withval" ]
- )
- 
-+AC_ARG_ENABLE([tests],
-+    [AS_HELP_STRING([--disable-tests],[don't build and install the testing components])],,
-+    [enable_tests=yes])
-+AM_CONDITIONAL([ENABLE_TESTS],[test "x$enable_tests" != xno])
-+
- dnl ===============================================
- dnl General Processing
- dnl ===============================================
-diff --git a/fencing/Makefile.am b/fencing/Makefile.am
-index 3bb628f..8c06502 100644
---- a/fencing/Makefile.am
-+++ b/fencing/Makefile.am
-@@ -18,8 +18,10 @@
- include $(top_srcdir)/Makefile.common
- 
- ## binary progs
-+if ENABLE_TESTS
- testdir			= $(datadir)/$(PACKAGE)/tests/fencing
- test_SCRIPTS		= regression.py
-+endif
- 
- halibdir	= $(CRM_DAEMON_DIR)
- halib_PROGRAMS	= stonithd stonith-test
-diff --git a/lrmd/Makefile.am b/lrmd/Makefile.am
-index 33611cb..ad6b88d 100644
---- a/lrmd/Makefile.am
-+++ b/lrmd/Makefile.am
-@@ -19,11 +19,13 @@ include $(top_srcdir)/Makefile.common
- lrmdlibdir		= $(CRM_DAEMON_DIR)
- lrmdlib_PROGRAMS	= lrmd lrmd_internal_ctl
- 
-+if ENABLE_TESTS
- # Test components
- lrmdlib_PROGRAMS	+= lrmd_test
- 
- testdir			= $(datadir)/$(PACKAGE)/tests/lrmd
- test_SCRIPTS		= regression.py
-+endif
- 
- initdir			= $(INITDIR)
- init_SCRIPTS		= pacemaker_remote
-diff --git a/pengine/Makefile.am b/pengine/Makefile.am
-index 861946c..3faae3a 100644
---- a/pengine/Makefile.am
-+++ b/pengine/Makefile.am
-@@ -21,6 +21,7 @@ AM_CPPFLAGS	+= -I$(top_builddir) -I$(top_srcdir)
- 
- halibdir	= $(CRM_DAEMON_DIR)
- 
-+if ENABLE_TESTS
- PE_TESTS	= $(wildcard test10/*.scores)
- 
- testdir			= $(datadir)/$(PACKAGE)/tests/pengine
-@@ -29,6 +30,7 @@ test_DATA		= regression.core.sh
- 
- test10dir		= $(datadir)/$(PACKAGE)/tests/pengine/test10
- test10_DATA		= $(PE_TESTS) $(PE_TESTS:%.scores=%.xml) $(PE_TESTS:%.scores=%.exp) $(PE_TESTS:%.scores=%.dot) $(PE_TESTS:%.scores=%.summary) $(wildcard test10/*.stderr)
-+endif
- 
- beekhof:
- 	echo $(shell ls -1 test10/*.xml)
-diff --git a/tools/Makefile.am b/tools/Makefile.am
-index 3548035..826396d 100644
---- a/tools/Makefile.am
-+++ b/tools/Makefile.am
-@@ -40,10 +40,12 @@ EXTRA_DIST		= $(sbin_SCRIPTS)
- sbin_PROGRAMS		= crm_simulate crmadmin cibadmin crm_node crm_attribute crm_resource crm_verify \
- 			 crm_shadow attrd_updater crm_diff crm_mon iso8601 crm_ticket crm_error
- 
-+if ENABLE_TESTS
- testdir			= $(datadir)/$(PACKAGE)/tests/cli
- test_SCRIPTS		= regression.sh
- test_DATA               = regression.dates.exp regression.tools.exp regression.acls.exp \
- 			  regression.validity.exp
-+endif
- 
- if BUILD_HEARTBEAT_SUPPORT
- sbin_PROGRAMS           += crm_uuid
--- 
-2.7.4
-
diff --git a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/set-OCF_ROOT_DIR-to-libdir-ocf.patch b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/set-OCF_ROOT_DIR-to-libdir-ocf.patch
deleted file mode 100644
index 98c3475..0000000
--- a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/set-OCF_ROOT_DIR-to-libdir-ocf.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 588800f0e2fe52a677a19b7c59636e9f391a6e75 Mon Sep 17 00:00:00 2001
-From: Mingli Yu <Mingli.Yu@windriver.com>
-Date: Wed, 27 Dec 2017 07:14:21 +0000
-Subject: [PATCH] pacemaker: set OCF_ROOT_DIR to $libdir/ocf
-
-* Set the default OCF_ROOT_DIR to $libdir/ocf
-  to make the resource agents components more
-  compatible
-
-Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com>
-
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 2eade3c..ba290cc 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1152,7 +1152,7 @@ AC_SUBST(HA_VARLIBHBDIR)
- 
- AC_DEFINE_UNQUOTED(UUID_FILE,"$localstatedir/lib/heartbeat/hb_uuid", Location of Heartbeat's UUID file)
- 
--OCF_ROOT_DIR=`try_extract_header_define $GLUE_HEADER OCF_ROOT_DIR /usr/lib/ocf`
-+OCF_ROOT_DIR=`try_extract_header_define $GLUE_HEADER OCF_ROOT_DIR $libdir/ocf`
- if test "X$OCF_ROOT_DIR" = X; then
-   AC_MSG_ERROR(Could not locate OCF directory)
- fi
diff --git a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.21.bb b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_2.0.3.bb
similarity index 82%
rename from meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.21.bb
rename to meta-cgl-common/recipes-cgl/pacemaker/pacemaker_2.0.3.bb
index 3a8db77..9b63acd 100644
--- a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.21.bb
+++ b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_2.0.3.bb
@@ -13,24 +13,20 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=000212f361a81b100d9d0f0435040663"
 
 DEPENDS = "corosync libxslt libxml2 gnutls resource-agents libqb python3-native"
 
-SRC_URI = "git://github.com/ClusterLabs/${BPN}.git;branch=1.1 \
-           file://0001-pacemaker-fix-xml-config.patch \
-           file://0002-pacemaker-search-header-from-STAGING_INCDIR-to-walka.patch \
-           file://0003-pacemaker-fix-header-defs-lookup.patch \
-           file://0004-pacemaker-do-not-build-help.patch \
-           file://0005-pacemaker-do-not-execute-target-program-while-cross-.patch \
-           file://0006-pacemaker-do-not-use-libgnutls-config.patch \
-           file://set-OCF_ROOT_DIR-to-libdir-ocf.patch \
-           file://0007-Make-the-testing-infrastructure-optional.patch \
+SRC_URI = "git://github.com/ClusterLabs/${BPN}.git \
+           file://0006-Fix-tools-Fix-definition-of-curses_indented_printf.patch \
+           file://0001-Fix-python3-usage.patch \
            file://volatiles \
            file://tmpfiles \
           "
 
+CFLAGS += "-I${STAGING_INCDIR}/heartbeat"
+CPPFLAGS +="-I${STAGING_INCDIR}/heartbeat"
 SRC_URI_append_libc-musl = "file://0001-pacemaker-fix-compile-error-of-musl-libc.patch"
 
-SRCREV = "f14e36fd4336874705b34266c7cddbe12119106c"
+SRCREV = "4b1f869f0f64ef0d248b6aa4781d38ecccf83318"
 
-inherit autotools-brokensep pkgconfig systemd python3-dir useradd
+inherit autotools-brokensep pkgconfig systemd python3native python3-dir useradd
 
 S = "${WORKDIR}/git"
 
@@ -48,7 +44,11 @@ EXTRA_OECONF += "STAGING_INCDIR=${STAGING_INCDIR} \
                  --without-heartbeat \
                  --disable-pretty \
                  --disable-tests \
-                "
+                 "
+
+CACHED_CONFIGUREVARS += " \
+    ac_cv_path_BASH_PATH=/bin/bash \
+"
 
 do_install_append() {
     install -d ${D}${sysconfdir}/default
@@ -92,7 +92,7 @@ FILES_${PN} += " ${datadir}/snmp                             \
                  ${libdir}/corosync/lcrso/pacemaker.lcrso    \
                  ${libdir}/${PYTHON_DIR}/dist-packages/cts/  \
                  ${libdir}/ocf/resource.d/ \
-                 ${libdir}/${PYTHON_DIR}/site-packages \
+                 ${libdir}/${PYTHON_DIR}/site-packages/cts/ \
                "
 FILES_${PN}-dbg += "${libdir}/corosync/lcrso/.debug"
 RDEPENDS_${PN} = "bash python3-core perl libqb ${PN}-cli-utils"
-- 
2.13.3