| Message ID | 20240826112603.844107-1-elinor.montmasson@savoirfairelinux.com |
|---|---|
| State | New |
| Headers | show |
| Series | [meta-cgl] pacemaker: fix build host path removal | expand |
diff --git a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_2.0.5.bb b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_2.0.5.bb index 49d741e..420f477 100644 --- a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_2.0.5.bb +++ b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_2.0.5.bb @@ -87,8 +87,8 @@ do_install:append() { hostdir=$(grep -Rn ${HOSTTOOLS_DIR} ${D}/* | awk -F: '{print $1}' | uniq) for tmpdir in $hostdir - do - sed -i "s:${HOSTTOOLS_DIR}::g" $tmpdir + do + sed -i "s:${HOSTTOOLS_DIR}/::g" $tmpdir done }
Commit [1] added the removal of host tools directory paths from built scripts. Pacemaker build these scripts with the host path of some runtime dependencies such as getopt. However, the sed regex did not remove the trailing '/' after the host tool dir path. This makes crm_master, crm_standby, crm_report and crm_failcount scripts call "/getopt" which fails. Fix sed regex to delete trailing '/' after host tools path. The script will then be able to call tools such as getopt from PATH. Also fix indent error. [1]: https://git.yoctoproject.org/meta-cgl/commit/?id=9c4639cd21f0ee11fdecb171c3173a0214a23612 Signed-off-by: Elinor Montmasson <elinor.montmasson@savoirfairelinux.com> --- meta-cgl-common/recipes-cgl/pacemaker/pacemaker_2.0.5.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)