From: Chen Qi Date: Mon, 8 Jun 2020 01:36:33 +0000 (+0800) Subject: vim: restore the 'chmod -x' workaround in do_install X-Git-Tag: uninative-2.9~505 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=bf3e799e32b4de300887b844b0b7bce3d60ca379;p=openembedded-core.git vim: restore the 'chmod -x' workaround in do_install These workarounds are removed because a previous patch solve the host path reference for gawk and perl, and it skips the do_package_qa issue by setting the INSANE_SKIP. But it introduces regression for do_rootfs. The dependencies are calculated and will require packages like python, perl, gawk and csh. The error is like below. Error: Problem: conflicting requests - nothing provides /bin/csh needed by vim-tools-8.2-r0.corei7_64 - nothing provides /usr/bin/nawk needed by vim-tools-8.2-r0.corei7_64 - nothing provides /usr/bin/python needed by vim-tools-8.2-r0.corei7_64 So we keep the previous patch which solve the host path reference problem and restore the long-used 'chmod -x' workaround here. Signed-off-by: Chen Qi Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-support/vim/vim.inc b/meta/recipes-support/vim/vim.inc index 9f3dc08027..4d2886c19e 100644 --- a/meta/recipes-support/vim/vim.inc +++ b/meta/recipes-support/vim/vim.inc @@ -83,6 +83,12 @@ EXTRA_OECONF = " \ do_install() { autotools_do_install + # Work around file-rdeps picking up csh, awk, perl or python as a dep + chmod -x ${D}${datadir}/${BPN}/${VIMDIR}/tools/vim132 + chmod -x ${D}${datadir}/${BPN}/${VIMDIR}/tools/mve.awk + chmod -x ${D}${datadir}/${BPN}/${VIMDIR}/tools/*.pl + chmod -x ${D}${datadir}/${BPN}/${VIMDIR}/tools/*.py + # Install example vimrc from runtime files install -m 0644 runtime/vimrc_example.vim ${D}/${datadir}/${BPN}/vimrc