diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2020-06-08 09:36:33 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-06-26 18:26:48 +0100 |
commit | f59c4f0b836cc8ab3d83e154d8fdc885f81a019b (patch) | |
tree | a173a5c480cf8464511507c1cf3c76edf453889f | |
parent | a846496cf3601d44f99125d6487f4fa8001f3c54 (diff) | |
download | poky-f59c4f0b836cc8ab3d83e154d8fdc885f81a019b.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.
(From OE-Core rev: 68b2dc03e55b4977b8647e8d36c40c851414c13b)
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>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 = " \ | |||
83 | do_install() { | 83 | do_install() { |
84 | autotools_do_install | 84 | autotools_do_install |
85 | 85 | ||
86 | # Work around file-rdeps picking up csh, awk, perl or python as a dep | ||
87 | chmod -x ${D}${datadir}/${BPN}/${VIMDIR}/tools/vim132 | ||
88 | chmod -x ${D}${datadir}/${BPN}/${VIMDIR}/tools/mve.awk | ||
89 | chmod -x ${D}${datadir}/${BPN}/${VIMDIR}/tools/*.pl | ||
90 | chmod -x ${D}${datadir}/${BPN}/${VIMDIR}/tools/*.py | ||
91 | |||
86 | # Install example vimrc from runtime files | 92 | # Install example vimrc from runtime files |
87 | install -m 0644 runtime/vimrc_example.vim ${D}/${datadir}/${BPN}/vimrc | 93 | install -m 0644 runtime/vimrc_example.vim ${D}/${datadir}/${BPN}/vimrc |
88 | 94 | ||