[meta-cgl] pacemaker: upgrade 1.1.19 -> 1.1.21

Submitted by changqing.li@windriver.com on Sept. 2, 2019, 9:38 a.m. | Patch ID: 164540

Details

Message ID 1567417134-282605-3-git-send-email-changqing.li@windriver.com
State New
Headers show

Commit Message

changqing.li@windriver.com Sept. 2, 2019, 9:38 a.m.
From: Changqing Li <changqing.li@windriver.com>

License-Update:  update e-mail address and URL

Signed-off-by: Changqing Li <changqing.li@windriver.com>
---
 ...o-not-execute-target-program-while-cross-.patch | 25 ++++++++++++----------
 .../{pacemaker_1.1.19.bb => pacemaker_1.1.21.bb}   |  6 ++++--
 2 files changed, 18 insertions(+), 13 deletions(-)
 rename meta-cgl-common/recipes-cgl/pacemaker/{pacemaker_1.1.19.bb => pacemaker_1.1.21.bb} (95%)

Patch hide | download patch | download mbox

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
index e749f9a..b600fec 100644
--- 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
@@ -1,41 +1,44 @@ 
-From e8c4b9d98ef15aa7fb02a68b1d7fe9c008cc8bfd Mon Sep 17 00:00:00 2001
-From: Bian Naimeng <biannm@cn.fujitsu.com>
-Date: Mon, 6 Jul 2015 12:20:17 +0900
+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 d73ad04..8973f91 100644
+index 469417f..9f19a53 100644
 --- a/Makefile.common
 +++ b/Makefile.common
-@@ -36,6 +36,8 @@ if BUILD_HELP
+@@ -36,18 +36,20 @@ if BUILD_HELP
  man8_MANS		= $(sbin_PROGRAMS:%=%.8) $(sbin_SCRIPTS:%=%.8)
  endif
  
-+man7_MANS		=
+++man7_MANS              =
 +
  %.8:	% $(MAN8DEPS)
  	chmod a+x $(abs_builddir)/$<
- 	$(PCMK_V)  PATH=$(abs_builddir):$$PATH $(abs_builddir)/$< --help
-@@ -43,13 +45,13 @@ endif
  	$(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"
++        @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"
++        @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"
++        @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_1.1.19.bb b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.21.bb
similarity index 95%
rename from meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.19.bb
rename to meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.21.bb
index a7c38df..feed53d 100644
--- a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.19.bb
+++ b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.21.bb
@@ -9,7 +9,7 @@  check resource health."
 HOMEPAGE = "http://www.clusterlabs.org"
 
 LICENSE = "GPLv2+ & LGPLv2.1+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=19a64afd3a35d044a80579d7aafc30ff"
+LIC_FILES_CHKSUM = "file://COPYING;md5=000212f361a81b100d9d0f0435040663"
 
 DEPENDS = "corosync libxslt libxml2 gnutls resource-agents libqb python-native"
 
@@ -28,12 +28,14 @@  SRC_URI = "git://github.com/ClusterLabs/${BPN}.git;branch=1.1 \
 
 SRC_URI_append_libc-musl = "file://0001-pacemaker-fix-compile-error-of-musl-libc.patch"
 
-SRCREV = "c3c624ea3d98a74a8a287671a156db126c99a7bb"
+SRCREV = "f14e36fd4336874705b34266c7cddbe12119106c"
 
 inherit autotools-brokensep pkgconfig systemd python-dir useradd
 
 S = "${WORKDIR}/git"
 
+UPSTREAM_CHECK_GITTAGREGEX = "Pacemaker-(?P<pver>\d+(\.\d+)+)"
+
 CLEANBROKEN = "1"
 
 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"