* [meta-cgl][PATCH 1/9] packagegroup-cgl-*: fix LIC_FILES_CHKSUM variables
@ 2015-04-24 20:29 Dmitry Eremin-Solenikov
2015-04-24 20:29 ` [meta-cgl][PATCH 2/9] packagegroup-cgl-swdevtools: don't depend on numactl on arm Dmitry Eremin-Solenikov
` (7 more replies)
0 siblings, 8 replies; 9+ messages in thread
From: Dmitry Eremin-Solenikov @ 2015-04-24 20:29 UTC (permalink / raw)
To: yocto
LIC_FILES_CHKSUM variables in all packagegroup files reference wrong
location of the COPYING.MIT file resulting in warnings during build. Fix
them by pointing to the main COPYING.MIT file in OE-Core.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry_eremin@mentor.com>
---
meta-cgl-common/packagegroups/packagegroup-cgl-applications.bb | 2 +-
meta-cgl-common/packagegroups/packagegroup-cgl-kernel.bb | 2 +-
meta-cgl-common/packagegroups/packagegroup-cgl-middleware.bb | 2 +-
meta-cgl-common/packagegroups/packagegroup-cgl-swdevtools.bb | 2 +-
meta-cgl-common/packagegroups/packagegroup-cgl.bb | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/meta-cgl-common/packagegroups/packagegroup-cgl-applications.bb b/meta-cgl-common/packagegroups/packagegroup-cgl-applications.bb
index 532712e..f823ece 100644
--- a/meta-cgl-common/packagegroups/packagegroup-cgl-applications.bb
+++ b/meta-cgl-common/packagegroups/packagegroup-cgl-applications.bb
@@ -2,7 +2,7 @@ SUMMARY = "Application packages required to satisfy the Carrier Grade Linux (CGL
DESCRIPTION = "This package group includes the application with which the user interacts \
when using a Linux operation system."
LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta-cgl/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
inherit packagegroup
inherit pkgconfig
diff --git a/meta-cgl-common/packagegroups/packagegroup-cgl-kernel.bb b/meta-cgl-common/packagegroups/packagegroup-cgl-kernel.bb
index 2925535..bff7c4c 100644
--- a/meta-cgl-common/packagegroups/packagegroup-cgl-kernel.bb
+++ b/meta-cgl-common/packagegroups/packagegroup-cgl-kernel.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "This package group contains hardened device drivers, HW configura
management, standard, high availability, service and co-processor interfaces."
LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta-cgl/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
inherit packagegroup
diff --git a/meta-cgl-common/packagegroups/packagegroup-cgl-middleware.bb b/meta-cgl-common/packagegroups/packagegroup-cgl-middleware.bb
index d0a5213..effdb81 100644
--- a/meta-cgl-common/packagegroups/packagegroup-cgl-middleware.bb
+++ b/meta-cgl-common/packagegroups/packagegroup-cgl-middleware.bb
@@ -2,7 +2,7 @@ SUMMARY = "Middleware packages required to satisfy the Carrier Grade Linux (CGL)
DESCRIPTION = "This package group contains high availability application and platform \
interfaces, databases, application servers, communication protocols etc."
LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta-cgl/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
inherit packagegroup
diff --git a/meta-cgl-common/packagegroups/packagegroup-cgl-swdevtools.bb b/meta-cgl-common/packagegroups/packagegroup-cgl-swdevtools.bb
index 591f120..84e747f 100644
--- a/meta-cgl-common/packagegroups/packagegroup-cgl-swdevtools.bb
+++ b/meta-cgl-common/packagegroups/packagegroup-cgl-swdevtools.bb
@@ -2,7 +2,7 @@ SUMMARY = "Software development tools packages required to satisfy the Carrier G
DESCRIPTION = "This package group contains programs or applications used to create, debug, maintain, \
or otherwise support other programs and applications."
LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta-cgl/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
inherit packagegroup
diff --git a/meta-cgl-common/packagegroups/packagegroup-cgl.bb b/meta-cgl-common/packagegroups/packagegroup-cgl.bb
index 3a64bbf..2c999e0 100644
--- a/meta-cgl-common/packagegroups/packagegroup-cgl.bb
+++ b/meta-cgl-common/packagegroups/packagegroup-cgl.bb
@@ -2,7 +2,7 @@ SUMMARY = "Packages required to satisfy the Carrier Grade Linux (CGL) specificat
DESCRIPTION = "This package group is the one that gathers all the available \
package groups."
LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta-cgl/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20421"
inherit packagegroup
--
2.1.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [meta-cgl][PATCH 2/9] packagegroup-cgl-swdevtools: don't depend on numactl on arm
2015-04-24 20:29 [meta-cgl][PATCH 1/9] packagegroup-cgl-*: fix LIC_FILES_CHKSUM variables Dmitry Eremin-Solenikov
@ 2015-04-24 20:29 ` Dmitry Eremin-Solenikov
2015-04-24 20:29 ` [meta-cgl][PATCH 3/9] cluster-glue: add openhpi and net-snmp to DEPENDS Dmitry Eremin-Solenikov
` (6 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Dmitry Eremin-Solenikov @ 2015-04-24 20:29 UTC (permalink / raw)
To: yocto
Package numactl is disabled on ARM platform. Do no depend on it if we
are building for this platform.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry_eremin@mentor.com>
---
meta-cgl-common/packagegroups/packagegroup-cgl-swdevtools.bb | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/meta-cgl-common/packagegroups/packagegroup-cgl-swdevtools.bb b/meta-cgl-common/packagegroups/packagegroup-cgl-swdevtools.bb
index 84e747f..9f9ae03 100644
--- a/meta-cgl-common/packagegroups/packagegroup-cgl-swdevtools.bb
+++ b/meta-cgl-common/packagegroups/packagegroup-cgl-swdevtools.bb
@@ -9,6 +9,9 @@ inherit packagegroup
PACKAGES = "packagegroup-cgl-swdevtools"
+NUMACTL = "numactl"
+NUMACTL_arm = ""
+
RDEPENDS_packagegroup-cgl-swdevtools = " \
libuio \
libcap-ng \
@@ -17,7 +20,7 @@ RDEPENDS_packagegroup-cgl-swdevtools = " \
libsocket6-perl \
libmailtools-perl \
libhtml-tagset-perl \
- numactl \
+ ${NUMACTL} \
"
RRECOMMENDS_packagegroup-cgl-swdevtools = ""
--
2.1.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [meta-cgl][PATCH 3/9] cluster-glue: add openhpi and net-snmp to DEPENDS
2015-04-24 20:29 [meta-cgl][PATCH 1/9] packagegroup-cgl-*: fix LIC_FILES_CHKSUM variables Dmitry Eremin-Solenikov
2015-04-24 20:29 ` [meta-cgl][PATCH 2/9] packagegroup-cgl-swdevtools: don't depend on numactl on arm Dmitry Eremin-Solenikov
@ 2015-04-24 20:29 ` Dmitry Eremin-Solenikov
2015-04-24 20:29 ` [meta-cgl][PATCH 4/9] cluster-resource-agents: add sha256 sum of the tarball Dmitry Eremin-Solenikov
` (5 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Dmitry Eremin-Solenikov @ 2015-04-24 20:29 UTC (permalink / raw)
To: yocto
cluster-glue makes use of openhpi and net-snmp libraries, so DEPEND on
them as pointed by the following QA warnings:
cluster-glue-1.0.5: cluster-glue-plugin-stonith2 rdepends on net-snmp-libs, but it isn't a build dependency? [build-deps]
cluster-glue-1.0.5: cluster-glue-plugin-stonith2 rdepends on openhpi, but it isn't a build dependency? [build-deps]
Signed-off-by: Dmitry Eremin-Solenikov <dmitry_eremin@mentor.com>
---
meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue_1.0.5.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue_1.0.5.bb b/meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue_1.0.5.bb
index de348e8..c31c85d 100644
--- a/meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue_1.0.5.bb
+++ b/meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue_1.0.5.bb
@@ -4,7 +4,7 @@ is not the cluster messaging layer (Heartbeat), nor the cluster resource manager
(Pacemaker), nor a Resource Agent."
LICENSE = "GPLv2"
-DEPENDS = "libxml2 libtool glib-2.0 bzip2 util-linux"
+DEPENDS = "libxml2 libtool glib-2.0 bzip2 util-linux net-snmp openhpi"
SRC_URI = " \
http://hg.linux-ha.org/glue/archive/glue-${PV}.tar.bz2 \
--
2.1.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [meta-cgl][PATCH 4/9] cluster-resource-agents: add sha256 sum of the tarball
2015-04-24 20:29 [meta-cgl][PATCH 1/9] packagegroup-cgl-*: fix LIC_FILES_CHKSUM variables Dmitry Eremin-Solenikov
2015-04-24 20:29 ` [meta-cgl][PATCH 2/9] packagegroup-cgl-swdevtools: don't depend on numactl on arm Dmitry Eremin-Solenikov
2015-04-24 20:29 ` [meta-cgl][PATCH 3/9] cluster-glue: add openhpi and net-snmp to DEPENDS Dmitry Eremin-Solenikov
@ 2015-04-24 20:29 ` Dmitry Eremin-Solenikov
2015-04-24 20:29 ` [meta-cgl][PATCH 5/9] cluster-resource-agents: add bash to RDEPENDS for ocft and ${PN} Dmitry Eremin-Solenikov
` (4 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Dmitry Eremin-Solenikov @ 2015-04-24 20:29 UTC (permalink / raw)
To: yocto
Signed-off-by: Dmitry Eremin-Solenikov <dmitry_eremin@mentor.com>
---
.../recipes-cgl/cluster-resource-agents/cluster-resource-agents_1.0.3.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta-cgl-common/recipes-cgl/cluster-resource-agents/cluster-resource-agents_1.0.3.bb b/meta-cgl-common/recipes-cgl/cluster-resource-agents/cluster-resource-agents_1.0.3.bb
index 0ac89b2..5372786 100644
--- a/meta-cgl-common/recipes-cgl/cluster-resource-agents/cluster-resource-agents_1.0.3.bb
+++ b/meta-cgl-common/recipes-cgl/cluster-resource-agents/cluster-resource-agents_1.0.3.bb
@@ -13,6 +13,7 @@ SRC_URI = " \
"
SRC_URI_append_libc-uclibc = " file://kill-stack-protector.patch"
SRC_URI[md5sum] = "fcaa2cfd83a28d1965200e11db2ddd41"
+SRC_URI[sha256sum] = "09b58332e34cf128c8d53d5bb4b3f61e402c2e0c0c809f5abae53ca144ad101e"
inherit autotools
--
2.1.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [meta-cgl][PATCH 5/9] cluster-resource-agents: add bash to RDEPENDS for ocft and ${PN}
2015-04-24 20:29 [meta-cgl][PATCH 1/9] packagegroup-cgl-*: fix LIC_FILES_CHKSUM variables Dmitry Eremin-Solenikov
` (2 preceding siblings ...)
2015-04-24 20:29 ` [meta-cgl][PATCH 4/9] cluster-resource-agents: add sha256 sum of the tarball Dmitry Eremin-Solenikov
@ 2015-04-24 20:29 ` Dmitry Eremin-Solenikov
2015-04-24 20:29 ` [meta-cgl][PATCH 6/9] ocfs2-tools: drop clutter-1.0 dependency Dmitry Eremin-Solenikov
` (3 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Dmitry Eremin-Solenikov @ 2015-04-24 20:29 UTC (permalink / raw)
To: yocto
Add bash to respective RDEPENDS as pointed by QA WARNINGS:
cluster-resource-agents-1.0.3: /usr/sbin/ocft_ocft contained in package ocft requires /bin/bash, but no providers found in its RDEPENDS [file-rdeps]
cluster-resource-agents-1.0.3: /usr/lib/ocf/resource.d/heartbeat/AoEtarget_cluster-resource-agents contained in package cluster-resource-agents requires /bin/bash, but no providers found in its RDEPENDS [file-rdeps]
Signed-off-by: Dmitry Eremin-Solenikov <dmitry_eremin@mentor.com>
---
.../cluster-resource-agents/cluster-resource-agents_1.0.3.bb | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/meta-cgl-common/recipes-cgl/cluster-resource-agents/cluster-resource-agents_1.0.3.bb b/meta-cgl-common/recipes-cgl/cluster-resource-agents/cluster-resource-agents_1.0.3.bb
index 5372786..ee733f7 100644
--- a/meta-cgl-common/recipes-cgl/cluster-resource-agents/cluster-resource-agents_1.0.3.bb
+++ b/meta-cgl-common/recipes-cgl/cluster-resource-agents/cluster-resource-agents_1.0.3.bb
@@ -76,9 +76,17 @@ FILES_${PN} += " \
${datadir}/resource-agents/ra-api-1.dtd \
"
+RDEPENDS_ocft += " \
+ bash \
+"
+
FILES_ocft += " \
${datadir}/resource-agents/ocft \
${sbindir}/ocft \
"
+RDEPENDS_${PN} += " \
+ bash \
+"
+
FILES_${PN}-dbg += "${libdir}/heartbeat/.debug/ ${libdir}/ocf/resource.d/heartbeat/.debug/"
--
2.1.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [meta-cgl][PATCH 6/9] ocfs2-tools: drop clutter-1.0 dependency
2015-04-24 20:29 [meta-cgl][PATCH 1/9] packagegroup-cgl-*: fix LIC_FILES_CHKSUM variables Dmitry Eremin-Solenikov
` (3 preceding siblings ...)
2015-04-24 20:29 ` [meta-cgl][PATCH 5/9] cluster-resource-agents: add bash to RDEPENDS for ocft and ${PN} Dmitry Eremin-Solenikov
@ 2015-04-24 20:29 ` Dmitry Eremin-Solenikov
2015-04-24 20:29 ` [meta-cgl][PATCH 7/9] openais: make openais script use sh instead of bash Dmitry Eremin-Solenikov
` (2 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Dmitry Eremin-Solenikov @ 2015-04-24 20:29 UTC (permalink / raw)
To: yocto
There is nothing in ocfs2-tools that depends on clutter. Drop
corresponding package from DEPENDS list.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry_eremin@mentor.com>
---
meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools_1.4.3.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools_1.4.3.bb b/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools_1.4.3.bb
index 92d79d3..4e171f4 100644
--- a/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools_1.4.3.bb
+++ b/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools_1.4.3.bb
@@ -24,7 +24,7 @@ SRC_URI[md5sum] = "296f1242f4d00d188231d726d7a1d148"
SRC_URI[sha256sum] = "a809f03c62e515a4c23e98c4b4c3f8150377af2cf44cd2a2ee56e175b0e4d0b3"
S = "${WORKDIR}/ocfs2-tools-ocfs2-tools-1.4.3"
inherit autotools-brokensep pkgconfig
-DEPENDS = "corosync openais clutter-1.0 cluster-glue pacemaker libxml2 linux-libc-headers e2fsprogs"
+DEPENDS = "corosync openais cluster-glue pacemaker libxml2 linux-libc-headers e2fsprogs"
RDEPENDS_${PN} = "bash coreutils net-tools module-init-tools e2fsprogs chkconfig glib-2.0"
ASNEEDED_pn-${PN} = ""
PARALLEL_MAKE = ""
--
2.1.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [meta-cgl][PATCH 7/9] openais: make openais script use sh instead of bash
2015-04-24 20:29 [meta-cgl][PATCH 1/9] packagegroup-cgl-*: fix LIC_FILES_CHKSUM variables Dmitry Eremin-Solenikov
` (4 preceding siblings ...)
2015-04-24 20:29 ` [meta-cgl][PATCH 6/9] ocfs2-tools: drop clutter-1.0 dependency Dmitry Eremin-Solenikov
@ 2015-04-24 20:29 ` Dmitry Eremin-Solenikov
2015-04-24 20:29 ` [meta-cgl][PATCH 8/9] pacemaker: fix building with xml-config now being disabled Dmitry Eremin-Solenikov
2015-04-24 20:29 ` [meta-cgl][PATCH 9/9] pacemaker: fix runtime dependencies on bash Dmitry Eremin-Solenikov
7 siblings, 0 replies; 9+ messages in thread
From: Dmitry Eremin-Solenikov @ 2015-04-24 20:29 UTC (permalink / raw)
To: yocto
There is no point in using bash for the openais script, if just sh is
enough. In addition this fixes the following QA warning:
openais-1.1.3: /etc/init.d/openais_openais contained in package openais requires /bin/bash, but no providers found in its RDEPENDS [file-rdeps]
Signed-off-by: Dmitry Eremin-Solenikov <dmitry_eremin@mentor.com>
---
.../recipes-cgl/openais/files/openais-fix-bash.patch | 10 ++++++++++
meta-cgl-common/recipes-cgl/openais/openais_1.1.3.bb | 1 +
2 files changed, 11 insertions(+)
create mode 100644 meta-cgl-common/recipes-cgl/openais/files/openais-fix-bash.patch
diff --git a/meta-cgl-common/recipes-cgl/openais/files/openais-fix-bash.patch b/meta-cgl-common/recipes-cgl/openais/files/openais-fix-bash.patch
new file mode 100644
index 0000000..ede77e8
--- /dev/null
+++ b/meta-cgl-common/recipes-cgl/openais/files/openais-fix-bash.patch
@@ -0,0 +1,10 @@
+Index: openais-1.1.3/init/generic.in
+===================================================================
+--- openais-1.1.3.orig/init/generic.in
++++ openais-1.1.3/init/generic.in
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+
+ # Authors:
+ # Andrew Beekhof <abeekhof@redhat.com>
diff --git a/meta-cgl-common/recipes-cgl/openais/openais_1.1.3.bb b/meta-cgl-common/recipes-cgl/openais/openais_1.1.3.bb
index 2a03b9a..f4563c9 100644
--- a/meta-cgl-common/recipes-cgl/openais/openais_1.1.3.bb
+++ b/meta-cgl-common/recipes-cgl/openais/openais_1.1.3.bb
@@ -9,6 +9,7 @@ SRC_URI = " \
ftp://ftp@tux.rainside.sk/gentoo/distfiles/openais-${PV}.tar.gz \
file://fix-lcrso-linkage.patch \
file://build-cleanup-configure-ac.patch \
+ file://openais-fix-bash.patch \
"
SRC_URI[md5sum] = "13d8d590f806fb396d750b086c6c0b78"
SRC_URI[sha256sum] = "eeef58dd2df3eb16ba68b3fbdc6f0d4dfb537443f1c091ec6f0431594f2f00b6"
--
2.1.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [meta-cgl][PATCH 8/9] pacemaker: fix building with xml-config now being disabled
2015-04-24 20:29 [meta-cgl][PATCH 1/9] packagegroup-cgl-*: fix LIC_FILES_CHKSUM variables Dmitry Eremin-Solenikov
` (5 preceding siblings ...)
2015-04-24 20:29 ` [meta-cgl][PATCH 7/9] openais: make openais script use sh instead of bash Dmitry Eremin-Solenikov
@ 2015-04-24 20:29 ` Dmitry Eremin-Solenikov
2015-04-24 20:29 ` [meta-cgl][PATCH 9/9] pacemaker: fix runtime dependencies on bash Dmitry Eremin-Solenikov
7 siblings, 0 replies; 9+ messages in thread
From: Dmitry Eremin-Solenikov @ 2015-04-24 20:29 UTC (permalink / raw)
To: yocto
OE-Core now forbids using of xml-config, thus pacemaker is now broken.
Rewrite configure.ac to use pkg-config instead of xml-config.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry_eremin@mentor.com>
---
.../pacemaker-fix-xml-config.patch | 53 ++++++++++++++++++++++
.../recipes-cgl/pacemaker/pacemaker_1.0.9.1.bb | 3 +-
2 files changed, 55 insertions(+), 1 deletion(-)
create mode 100644 meta-cgl-common/recipes-cgl/pacemaker/pacemaker-1.0.9.1/pacemaker-fix-xml-config.patch
diff --git a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker-1.0.9.1/pacemaker-fix-xml-config.patch b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker-1.0.9.1/pacemaker-fix-xml-config.patch
new file mode 100644
index 0000000..553c3f3
--- /dev/null
+++ b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker-1.0.9.1/pacemaker-fix-xml-config.patch
@@ -0,0 +1,53 @@
+Index: pacemaker-1.0-Pacemaker-1.0.9.1/configure.ac
+===================================================================
+--- pacemaker-1.0-Pacemaker-1.0.9.1.orig/configure.ac
++++ pacemaker-1.0-Pacemaker-1.0.9.1/configure.ac
+@@ -22,6 +22,7 @@ dnl checks for system services
+ AC_INIT(pacemaker, 1.0.9, pacemaker@oss.clusterlabs.org)
+ CRM_DTD_VERSION="1.0"
+
++m4_pattern_allow([PKG_FEATURES])
+ PKG_FEATURES=""
+ HB_PKG=heartbeat
+
+@@ -97,7 +98,7 @@ dnl ====================================
+ cc_supports_flag() {
+ local CFLAGS="$@"
+ AC_MSG_CHECKING(whether $CC supports "$@")
+- AC_COMPILE_IFELSE([int main(){return 0;}] ,[RC=0; AC_MSG_RESULT(yes)],[RC=1; AC_MSG_RESULT(no)])
++ AC_COMPILE_IFELSE([AC_LANG_SOURCE([int main(){return 0;}])] ,[RC=0; AC_MSG_RESULT(yes)],[RC=1; AC_MSG_RESULT(no)])
+ return $RC
+ }
+
+@@ -502,7 +503,6 @@ AC_PATH_PROGS(TAR, tar)
+ AC_PATH_PROGS(MD5, md5)
+ AC_PATH_PROGS(TEST, test)
+ AC_PATH_PROGS(PKGCONFIG, 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)
+
+@@ -671,17 +671,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)
diff --git a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.0.9.1.bb b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.0.9.1.bb
index e492102..174ebd1 100644
--- a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.0.9.1.bb
+++ b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.0.9.1.bb
@@ -25,12 +25,13 @@ SRC_URI = " \
file://pacemaker-dont-use-help2man.patch \
file://fix-header-defs-lookup.patch \
file://pacemaker-remove-ptest-functionality.patch \
+ file://pacemaker-fix-xml-config.patch \
file://volatiles \
"
SRC_URI_append_libc-uclibc = " file://kill-stack-protector.patch"
SRC_URI[md5sum] = "103fb2e804be3f8ace17021c5d9ad15d"
SRC_URI[sha256sum] = "aabfc9ee1c66804151d973d0ed0323798ffebe49e1c2219fa804dc6898a69a1e"
-inherit autotools-brokensep python-dir
+inherit autotools-brokensep python-dir pkgconfig
S = "${WORKDIR}/pacemaker-1.0-Pacemaker-${PV}"
--
2.1.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [meta-cgl][PATCH 9/9] pacemaker: fix runtime dependencies on bash
2015-04-24 20:29 [meta-cgl][PATCH 1/9] packagegroup-cgl-*: fix LIC_FILES_CHKSUM variables Dmitry Eremin-Solenikov
` (6 preceding siblings ...)
2015-04-24 20:29 ` [meta-cgl][PATCH 8/9] pacemaker: fix building with xml-config now being disabled Dmitry Eremin-Solenikov
@ 2015-04-24 20:29 ` Dmitry Eremin-Solenikov
7 siblings, 0 replies; 9+ messages in thread
From: Dmitry Eremin-Solenikov @ 2015-04-24 20:29 UTC (permalink / raw)
To: yocto
Add bash to the pacemaker-tests RDEPENDS. Also make all scripts that are
installed in main pacemaker package use sh instead of bash.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry_eremin@mentor.com>
---
.../pacemaker-1.0.9.1/pacemaker-no-bash.patch | 40 ++++++++++++++++++++++
.../recipes-cgl/pacemaker/pacemaker_1.0.9.1.bb | 3 +-
2 files changed, 42 insertions(+), 1 deletion(-)
create mode 100644 meta-cgl-common/recipes-cgl/pacemaker/pacemaker-1.0.9.1/pacemaker-no-bash.patch
diff --git a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker-1.0.9.1/pacemaker-no-bash.patch b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker-1.0.9.1/pacemaker-no-bash.patch
new file mode 100644
index 0000000..6f9639d
--- /dev/null
+++ b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker-1.0.9.1/pacemaker-no-bash.patch
@@ -0,0 +1,40 @@
+Index: pacemaker-1.0-Pacemaker-1.0.9.1/tools/crm_failcount
+===================================================================
+--- pacemaker-1.0-Pacemaker-1.0.9.1.orig/tools/crm_failcount
++++ pacemaker-1.0-Pacemaker-1.0.9.1/tools/crm_failcount
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+
+ options=""
+ target=`uname -n`
+Index: pacemaker-1.0-Pacemaker-1.0.9.1/tools/crm_master
+===================================================================
+--- pacemaker-1.0-Pacemaker-1.0.9.1.orig/tools/crm_master
++++ pacemaker-1.0-Pacemaker-1.0.9.1/tools/crm_master
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+
+ TEMP=`getopt -o DGQVN:U:v:i:l:r: --long resource:,node:,uname:,attr-value:,delete-attr,get-value,attr-id:,lifetime:,quiet \
+ -n 'crm_master' -- "$@"`
+Index: pacemaker-1.0-Pacemaker-1.0.9.1/tools/crm_standby
+===================================================================
+--- pacemaker-1.0-Pacemaker-1.0.9.1.orig/tools/crm_standby
++++ pacemaker-1.0-Pacemaker-1.0.9.1/tools/crm_standby
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+
+ op=""
+ options=""
+Index: pacemaker-1.0-Pacemaker-1.0.9.1/extra/resources/o2cb
+===================================================================
+--- pacemaker-1.0-Pacemaker-1.0.9.1.orig/extra/resources/o2cb
++++ pacemaker-1.0-Pacemaker-1.0.9.1/extra/resources/o2cb
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ # Copyright (c) 2005,2008 Oracle
+ # Copyright (c) 2008 Andrew Beekhof
+ # All Rights Reserved.
diff --git a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.0.9.1.bb b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.0.9.1.bb
index 174ebd1..43769bf 100644
--- a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.0.9.1.bb
+++ b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.0.9.1.bb
@@ -26,6 +26,7 @@ SRC_URI = " \
file://fix-header-defs-lookup.patch \
file://pacemaker-remove-ptest-functionality.patch \
file://pacemaker-fix-xml-config.patch \
+ file://pacemaker-no-bash.patch \
file://volatiles \
"
SRC_URI_append_libc-uclibc = " file://kill-stack-protector.patch"
@@ -80,5 +81,5 @@ RDEPENDS_${PN}-hb2openais += "python-core"
FILES_${PN}-haresources2cib = "${libdir}/heartbeat/haresources2cib.py"
RDEPENDS_${PN}-haresources2cib += "python-core"
FILES_${PN}-tests = "${datadir}/pacemaker/tests ${datadir}/pacemaker/stonithdtest ${libdir}/heartbeat/atest ${libdir}/heartbeat/stonithdtest/*"
-RDEPENDS_${PN}-test += "python-core"
+RDEPENDS_${PN}-tests += "python-core bash"
FILES_${PN}-snmp = "${datadir}/snmp/mibs/PCMK-MIB.txt"
--
2.1.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2015-04-24 20:29 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-04-24 20:29 [meta-cgl][PATCH 1/9] packagegroup-cgl-*: fix LIC_FILES_CHKSUM variables Dmitry Eremin-Solenikov
2015-04-24 20:29 ` [meta-cgl][PATCH 2/9] packagegroup-cgl-swdevtools: don't depend on numactl on arm Dmitry Eremin-Solenikov
2015-04-24 20:29 ` [meta-cgl][PATCH 3/9] cluster-glue: add openhpi and net-snmp to DEPENDS Dmitry Eremin-Solenikov
2015-04-24 20:29 ` [meta-cgl][PATCH 4/9] cluster-resource-agents: add sha256 sum of the tarball Dmitry Eremin-Solenikov
2015-04-24 20:29 ` [meta-cgl][PATCH 5/9] cluster-resource-agents: add bash to RDEPENDS for ocft and ${PN} Dmitry Eremin-Solenikov
2015-04-24 20:29 ` [meta-cgl][PATCH 6/9] ocfs2-tools: drop clutter-1.0 dependency Dmitry Eremin-Solenikov
2015-04-24 20:29 ` [meta-cgl][PATCH 7/9] openais: make openais script use sh instead of bash Dmitry Eremin-Solenikov
2015-04-24 20:29 ` [meta-cgl][PATCH 8/9] pacemaker: fix building with xml-config now being disabled Dmitry Eremin-Solenikov
2015-04-24 20:29 ` [meta-cgl][PATCH 9/9] pacemaker: fix runtime dependencies on bash Dmitry Eremin-Solenikov
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.