summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/vim/vim.inc
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2020-06-08 09:36:33 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-06-09 13:18:25 +0100
commitbf3e799e32b4de300887b844b0b7bce3d60ca379 (patch)
treedeecb90faa58c41cd13ea160a03d5e635ec3172d /meta/recipes-support/vim/vim.inc
parent932b282a51f65c99847651ea1399c38b538bf432 (diff)
downloadopenembedded-core-bf3e799e32b4de300887b844b0b7bce3d60ca379.tar.gz
openembedded-core-bf3e799e32b4de300887b844b0b7bce3d60ca379.tar.bz2
openembedded-core-bf3e799e32b4de300887b844b0b7bce3d60ca379.zip
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 <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/vim/vim.inc')
-rw-r--r--meta/recipes-support/vim/vim.inc6
1 files changed, 6 insertions, 0 deletions
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