Skip to contentSkip to conversation

vim: restore the 'chmod -x' workaround in do_install

PATCH New Chen Qi 1 participant 1 message Jun 8, 2020

lore
Share & tools
lore

Chen Qi

author
#0 lore raw

PATCH v2 1/1 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.

---
 meta/recipes-support/vim/vim.inc | 6 ++++++
 1 file changed, 6 insertions(+)
meta/recipes-support/vim/vim.inc +6 -0
index 9f3dc08027..4d2886c19e 100644
@@ -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
 
Signature · 1 line
2.17.1