Re: [OE-core][PATCH] Revert "vim: do not adjust script paths building for target"

["Chen Qi" <Qi.Chen@windriver.com>]

On 06/08/2020 01:16 AM, Slater, Joseph wrote:
> The INSANE_SKIP is intended to avoid the script dependencies.  Perhaps it is of the
> wrong form or there is now some other sanity check producing the error?
>
> Joe

It solves do_package_qa issue but introduces do_rootfs problem if 
vim-tools is installed.
The dependencies will calculated anyway at do_rootfs step, and it will 
report the 'nothing provides xxx' error.


Best Regards,
Chen Qi

>
> -----Original Message-----
> From: openembedded-core@lists.openembedded.org <openembedded-core@lists.openembedded.org> On Behalf Of Richard Purdie
> Sent: Thursday, June 4, 2020 11:40 PM
> To: Chen, Qi <Qi.Chen@windriver.com>; openembedded-core@lists.openembedded.org
> Subject: Re: [OE-core][PATCH] Revert "vim: do not adjust script paths building for target"
>
> On Fri, 2020-06-05 at 10:13 +0800, Chen Qi wrote:
>> This reverts commit 8972fe5581b9fe8ef14d539001758bb13bca6737.
>>
>> The above commit causes regression when vim-tools is installed.
>> 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
>>
>> Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
>> ---
>>   .../vim/files/no-path-adjust.patch            | 27 -------------------
>>   meta/recipes-support/vim/vim.inc              | 12 ++++-----
>>   2 files changed, 6 insertions(+), 33 deletions(-)  delete mode 100644
>> meta/recipes-support/vim/files/no-path-adjust.patch
>>
>> diff --git a/meta/recipes-support/vim/files/no-path-adjust.patch
>> b/meta/recipes-support/vim/files/no-path-adjust.patch
>> deleted file mode 100644
>> index 05c2d803f6..0000000000
>> --- a/meta/recipes-support/vim/files/no-path-adjust.patch
>> +++ /dev/null
>> @@ -1,27 +0,0 @@
>> -vim: do not adjust script pathnames
>> -
>> -When cross-compiling, we do not want to reference the host versions
>> of -things like perl and awk.
>> -
>> -Upstream-Status: Pending
>> -
>> -Signed-off-by: Joe Slater <joe.slater@windriver.com>
>> -
>> ---- a/src/Makefile
>> -+++ b/src/Makefile
>> -@@ -2507,11 +2507,14 @@ installtools: $(TOOLS) $(DESTDIR)$(exec_
>> - 		 rm -rf $$cvs; \
>> - 	      fi
>> - 	-chmod $(FILEMOD) $(DEST_TOOLS)/*
>> --# replace the path in some tools
>> -+
>> -+# replace the path in some tools, but not when cross-compiling ifneq
>> -+($(CROSS_COMPILING),1)
>> - 	perlpath=`./which.sh perl` && sed -e "s+/usr/bin/perl+$$perlpath+" $(TOOLSSOURCE)/efm_perl.pl >$(DEST_TOOLS)/efm_perl.pl
>> - 	awkpath=`./which.sh nawk` && sed -e "s+/usr/bin/nawk+$$awkpath+" $(TOOLSSOURCE)/mve.awk >$(DEST_TOOLS)/mve.awk; if test -z "$$awkpath"; then \
>> - 		awkpath=`./which.sh gawk` && sed -e "s+/usr/bin/nawk+$$awkpath+" $(TOOLSSOURCE)/mve.awk >$(DEST_TOOLS)/mve.awk; if test -z "$$awkpath"; then \
>> - 		awkpath=`./which.sh awk` && sed -e "s+/usr/bin/nawk+$$awkpath+" $(TOOLSSOURCE)/mve.awk >$(DEST_TOOLS)/mve.awk; fi; fi
>> -+endif
>> - 	-chmod $(SCRIPTMOD) `grep -l "^#!" $(DEST_TOOLS)/*`
>> -
>> - # install the language specific files for tools, if they were
>> unpacked
>
> If we're going to install these files which you're still doing, we want to use target paths, not host ones?
>
> I suspect we therefore need this and your changes rather than removing this patch?
>
> Cheers,
>
> Richard
>
>
>> diff --git a/meta/recipes-support/vim/vim.inc
>> b/meta/recipes-support/vim/vim.inc
>> index 9f3dc08027..78e3f9528d 100644
>> --- a/meta/recipes-support/vim/vim.inc
>> +++ b/meta/recipes-support/vim/vim.inc
>> @@ -11,7 +11,6 @@ SRC_URI = "git://github.com/vim/vim.git \
>>              file://disable_acl_header_check.patch \
>>              file://vim-add-knob-whether-elf.h-are-checked.patch \
>>              file://0001-src-Makefile-improve-reproducibility.patch \
>> -           file://no-path-adjust.patch \
>>   "
>>   SRCREV = "98056533b96b6b5d8849641de93185dd7bcadc44"
>>   
>> @@ -83,6 +82,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
>>   
>> @@ -105,12 +110,7 @@ FILES_${PN}-help = "${datadir}/${BPN}/${VIMDIR}/doc"
>>   FILES_${PN}-tutor = "${datadir}/${BPN}/${VIMDIR}/tutor ${bindir}/${BPN}tutor"
>>   FILES_${PN}-vimrc = "${datadir}/${BPN}/vimrc"
>>   FILES_${PN}-data = "${datadir}/${BPN}"
>> -
>> -# We do not want to complain if perl or gawk are not on the target.
>> -#
>>   FILES_${PN}-tools = "${datadir}/${BPN}/${VIMDIR}/tools"
>> -INSANE_SKIP_${PN}-tools = "file-rdeps"
>> -
>>   FILES_${PN}-common = " \
>>       ${datadir}/${BPN}/${VIMDIR}/*.vim \
>>       ${datadir}/${BPN}/${VIMDIR}/autoload \
>>