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_ere...@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 -- _______________________________________________ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto