[yocto] [meta-cgl][PATCH] heartbeat:Update the patch for new version.
Lei Maohui
leimaohui at cn.fujitsu.com
Mon Sep 30 08:55:08 PDT 2019
To fix the patch error as follwing:
WARNING: heartbeat-3.0.6-r0 do_patch: QA Issue: Patch log indicates that
patches do not apply cleanly. [patch-fuzz
Signed-off-by: Lei Maohui <leimaohui at cn.fujitsu.com>
---
...mbership-ccm-Makefile.am-fix-warning.patch | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/meta-cgl-common/recipes-cgl/heartbeat/heartbeat/membership-ccm-Makefile.am-fix-warning.patch b/meta-cgl-common/recipes-cgl/heartbeat/heartbeat/membership-ccm-Makefile.am-fix-warning.patch
index 19691db..e27ed79 100644
--- a/meta-cgl-common/recipes-cgl/heartbeat/heartbeat/membership-ccm-Makefile.am-fix-warning.patch
+++ b/meta-cgl-common/recipes-cgl/heartbeat/heartbeat/membership-ccm-Makefile.am-fix-warning.patch
@@ -1,9 +1,10 @@
-From 30ee44e75da1bc86901b546ea14233d288ce2309 Mon Sep 17 00:00:00 2001
-From: Li xin <lixin.fnst at cn.fujitsu.com>
-Date: Tue, 9 Dec 2014 18:15:51 +0900
+From a5e1060c233513cdfc494be410032e6d4ed6f916 Mon Sep 17 00:00:00 2001
+From: Lei Maohui <leimaohui at cn.fujitsu.com>
+Date: Mon, 30 Sep 2019 12:42:41 +0900
Subject: [PATCH] membership/ccm/Makefile.am: fix warning
-The compile log indicates that host include and/or library paths were used
+The compile log indicates that host include and/or library paths were
+used
Upstream-Status: pending
@@ -13,18 +14,18 @@ Signed-off-by: Li Xin <lixin.fnst at cn.fujitsu.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/membership/ccm/Makefile.am b/membership/ccm/Makefile.am
-index 105069a..2a89de1 100644
+index eeb8eee..47a6452 100644
--- a/membership/ccm/Makefile.am
+++ b/membership/ccm/Makefile.am
@@ -22,7 +22,7 @@ MAINTAINERCLEANFILES = Makefile.in
- INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
+ AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include \
-I$(top_builddir)/linux-ha -I$(top_srcdir)/linux-ha \
-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl \
- -I$(includedir)/clplumbing
+ -I$(lt_sysroot)$(includedir)/clplumbing
- hadir = $(sysconfdir)/ha.d
- halibdir = $(libdir)/@HB_PKG@
+ halibexecdir = $(libexecdir)/@HB_PKG@
+ ccmlibdir = $(halibexecdir)
--
-1.8.4.2
+2.17.1
--
2.17.2
More information about the yocto
mailing list