[yocto] [meta-cgl-common][PATCH 3/3] pacemaker: set OCF_ROOT_DIR to $libdir/ocf
mingli.yu at windriver.com
mingli.yu at windriver.com
Thu Dec 28 22:04:28 PST 2017
From: Mingli Yu <Mingli.Yu at windriver.com>
* Set the default OCF_ROOT_DIR to $libdir/ocf
to make the resource agents components more
compatible
Signed-off-by: Mingli Yu <Mingli.Yu at windriver.com>
---
.../pacemaker/set-OCF_ROOT_DIR-to-libdir-ocf.patch | 30 ++++++++++++++++++++++
.../recipes-cgl/pacemaker/pacemaker_1.1.16.bb | 1 +
2 files changed, 31 insertions(+)
create mode 100644 meta-cgl-common/recipes-cgl/pacemaker/pacemaker/set-OCF_ROOT_DIR-to-libdir-ocf.patch
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
new file mode 100644
index 0000000..4898389
--- /dev/null
+++ b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/set-OCF_ROOT_DIR-to-libdir-ocf.patch
@@ -0,0 +1,30 @@
+From 24c1ddc572df59061c1f4fcec6e764dcb3edac80 Mon Sep 17 00:00:00 2001
+From: Mingli Yu <Mingli.Yu at 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 at 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
+--
+2.11.0
+
diff --git a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.16.bb b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.16.bb
index 9ef29b9..328bf88 100755
--- a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.16.bb
+++ b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.16.bb
@@ -21,6 +21,7 @@ SRC_URI = "https://github.com/ClusterLabs/${BPN}/archive/Pacemaker-${PV}.zip \
file://0005-pacemaker-do-not-execute-target-program-while-cross-.patch \
file://0006-pacemaker-do-not-use-libgnutls-config.patch \
file://fix_missing_qb_array.patch \
+ file://set-OCF_ROOT_DIR-to-libdir-ocf.patch \
file://volatiles \
file://tmpfiles \
"
--
2.13.3
More information about the yocto
mailing list