Skip to contentSkip to conversation

resource-agents: fix configure issue

PATCH New Armin Kuster 1 participant 2 messages May 29, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 resource-agents: fix configure issue

From: Armin Kuster <[email protected]>

| checking for pkg-config... no
| configure: error: You need pkgconfig installed in order to build
| ERROR: Function failed: do_configure (log file is located at /home/akuster/oss/maint/oe-test-distro/build/tmp-glibc-glibc/work/i586-dummy-linux/resource-agents/3.9.7-r0/temp/log.do_configure.3415)

ERROR: Task (/home/akuster/oss/maint/oe-test-distro/openembedded-core/../meta-cgl/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents_3.9.7.bb:do_configure) failed with exit code '1

add inherit pkgconfig

---
 .../recipes-cgl/cluster-resource-agents/resource-agents_3.9.7.bb        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents_3.9.7.bb +1 -1
index a0d4e1f..e6f127b 100644
@@ -30,7 +30,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
 DEPENDS = "cluster-glue"
 RDEPENDS_${PN} += "bash"
 
-inherit autotools systemd
+inherit autotools systemd pkgconfig
 
 EXTRA_OECONF += "--disable-fatal-warnings \
                  --with-rsctmpdir=/var/run/heartbeat/rsctmp"
Signature · 1 line
2.7.4
#1 lore raw

PATCH 2/2 pacemaker: add missing header file

From: Armin Kuster <[email protected]>

mainloop.c:406:8: error: unknown type name 'qb_array_t'
| static qb_array_t *gio_map = NULL;

---
 .../pacemaker/pacemaker/fix_missing_qb_array.patch  | 21 +++++++++++++++++++++
 .../recipes-cgl/pacemaker/pacemaker_1.1.15.bb       |  1 +
 2 files changed, 22 insertions(+)
 create mode 100644 meta-cgl-common/recipes-cgl/pacemaker/pacemaker/fix_missing_qb_array.patch
meta-cgl-common/recipes-cgl/pacemaker/pacemaker/fix_missing_qb_array.patch new file +21 -0
new file mode 100644
index 0000000..9f29ffa
@@ -0,0 +1,21 @@
+fix missing header file
+
+ mainloop.c:406:8: error: unknown type name 'qb_array_t'
+|  static qb_array_t *gio_map = NULL;
+
+Upstream-status: Pending
+
+Signed-off-by: Armin Kuster <[email protected]>
+
+Index: pacemaker-Pacemaker-1.1.15/lib/common/mainloop.c
+===================================================================
+--- pacemaker-Pacemaker-1.1.15.orig/lib/common/mainloop.c
++++ pacemaker-Pacemaker-1.1.15/lib/common/mainloop.c
+@@ -32,6 +32,7 @@
+ #include <crm/common/xml.h>
+ #include <crm/common/mainloop.h>
+ #include <crm/common/ipcs.h>
++#include <qb/qbarray.h>
+ 
+ struct mainloop_child_s {
+     pid_t pid;
meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.15.bb +1 -0
index 17c9fe4..3e610ec 100755
@@ -20,6 +20,7 @@ SRC_URI = "https://github.com/ClusterLabs/${PN}/archive/Pacemaker-${PV}.zip \
            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://fix_missing_qb_array.patch \
            file://volatiles \
            file://tmpfiles \
           "
Signature · 1 line
2.7.4