diff options
| author |   Chen Qi <Qi.Chen@windriver.com> | 2020-06-08 09:36:33 +0800 |
|---|---|---|
| committer |   Steve Sakoman <steve@sakoman.com> | 2020-06-18 06:23:00 -1000 |
| commit | 68b2dc03e55b4977b8647e8d36c40c851414c13b (patch) | |
| tree | bc30b579e64c89c5db4bf3128271a59ced89e693 /meta/recipes-support | |
| parent | ba94c908b99713ce115e9240df525c6442a60c7a (diff) | |
| download | openembedded-core-contrib-68b2dc03e55b4977b8647e8d36c40c851414c13b.tar.gz | |
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>
(cherry picked from commit bf3e799e32b4de300887b844b0b7bce3d60ca379)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Diffstat (limited to 'meta/recipes-support')
| -rw-r--r-- | meta/recipes-support/vim/vim.inc | 6 |
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 |