<div dir="ltr"><div dir="ltr">Thanks Tom for quick update.<div><br></div><div>ALTERNATIVE_TARGET[xxd] = "${bindir}/xxd"<br></div><div>ALTERNATIVE_LINK_NAME[xxd] = "${bindir}/xxd"<br></div><div>looks strange, IIRC TARGET and LINK_NAME should always point to different filepath, it was added in meta-oe commit:</div><div><div><br></div><div>commit 897c10b7c17c138a85bdeb36cf72e7201daf0e0e</div><div>Author: Dan McGregor <<a href="mailto:dan.mcgregor@usask.ca">dan.mcgregor@usask.ca</a>></div><div>Date: Thu Oct 18 09:46:27 2018 -0600</div><div><br></div><div> vim: alternatify xxd</div><div><br></div><div> toybox also provides xxd.</div></div><div><br></div><div>but I wonder what u-a does (or is supposed to do in this scenario). Maybe u-a bbclass automatically adds .${BPN} suffix to TARGET and renames the installed file?</div></div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Sat, May 18, 2019 at 8:34 PM Tom Rini <<a href="mailto:trini@konsulko.com">trini@konsulko.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Now that we have a common inc file for both vim and vim-tiny move a few<br>
bits of logic out of vim.inc and in to vim_$VER.bb so that vim adds<br>
things rather than vim-tiny removes them.<br>
<br>
Suggested-by: Martin Jansa <<a href="mailto:martin.jansa@gmail.com" target="_blank">martin.jansa@gmail.com</a>><br>
Signed-off-by: Tom Rini <<a href="mailto:trini@konsulko.com" target="_blank">trini@konsulko.com</a>><br>
---<br>
meta/recipes-support/vim/<a href="http://vim-tiny_8.1.1240.bb" rel="noreferrer" target="_blank">vim-tiny_8.1.1240.bb</a> | 3 ---<br>
meta/recipes-support/vim/vim.inc | 8 +-------<br>
meta/recipes-support/vim/<a href="http://vim_8.1.1240.bb" rel="noreferrer" target="_blank">vim_8.1.1240.bb</a> | 9 +++++++++<br>
3 files changed, 10 insertions(+), 10 deletions(-)<br>
<br>
diff --git a/meta/recipes-support/vim/<a href="http://vim-tiny_8.1.1240.bb" rel="noreferrer" target="_blank">vim-tiny_8.1.1240.bb</a> b/meta/recipes-support/vim/<a href="http://vim-tiny_8.1.1240.bb" rel="noreferrer" target="_blank">vim-tiny_8.1.1240.bb</a><br>
index 139e626e4444..e4c26d23f69d 100644<br>
--- a/meta/recipes-support/vim/<a href="http://vim-tiny_8.1.1240.bb" rel="noreferrer" target="_blank">vim-tiny_8.1.1240.bb</a><br>
+++ b/meta/recipes-support/vim/<a href="http://vim-tiny_8.1.1240.bb" rel="noreferrer" target="_blank">vim-tiny_8.1.1240.bb</a><br>
@@ -2,9 +2,6 @@ require vim.inc<br>
<br>
SUMMARY += " (with tiny features)"<br>
<br>
-PROVIDES_remove = "xxd"<br>
-ALTERNATIVE_${PN}_remove = "xxd"<br>
-<br>
PACKAGECONFIG += "tiny"<br>
<br>
do_install() {<br>
diff --git a/meta/recipes-support/vim/vim.inc b/meta/recipes-support/vim/vim.inc<br>
index f5c74684bfa7..433f23344826 100644<br>
--- a/meta/recipes-support/vim/vim.inc<br>
+++ b/meta/recipes-support/vim/vim.inc<br>
@@ -1,7 +1,6 @@<br>
SUMMARY = "Vi IMproved - enhanced vi editor"<br>
SECTION = "console/utils"<br>
<br>
-PROVIDES = "xxd"<br>
DEPENDS = "ncurses gettext-native"<br>
# vimdiff doesn't like busybox diff<br>
RSUGGESTS_${PN} = "diffutils"<br>
@@ -52,7 +51,6 @@ PACKAGECONFIG += " \<br>
${@bb.utils.filter('DISTRO_FEATURES', 'acl selinux', d)} \<br>
${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 gtkgui', '', d)} \<br>
"<br>
-PACKAGECONFIG_class-native = ""<br>
<br>
PACKAGECONFIG[gtkgui] = "--enable-gui=gtk2,--enable-gui=no,gtk+,"<br>
PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl,"<br>
@@ -130,12 +128,8 @@ RDEPENDS_${BPN} = "ncurses-terminfo-base"<br>
# Recommend that runtime data is installed along with vim<br>
RRECOMMENDS_${BPN} = "${PN}-syntax ${PN}-help ${PN}-tutor ${PN}-vimrc ${PN}-common"<br>
<br>
-ALTERNATIVE_${PN} = "vi vim xxd"<br>
+ALTERNATIVE_${PN} = "vi vim"<br>
ALTERNATIVE_PRIORITY = "100"<br>
ALTERNATIVE_TARGET = "${bindir}/${BPN}.${BPN}"<br>
ALTERNATIVE_LINK_NAME[vi] = "${base_bindir}/vi"<br>
ALTERNATIVE_LINK_NAME[vim] = "${bindir}/vim"<br>
-ALTERNATIVE_TARGET[xxd] = "${bindir}/xxd"<br>
-ALTERNATIVE_LINK_NAME[xxd] = "${bindir}/xxd"<br>
-<br>
-BBCLASSEXTEND = "native"<br>
diff --git a/meta/recipes-support/vim/<a href="http://vim_8.1.1240.bb" rel="noreferrer" target="_blank">vim_8.1.1240.bb</a> b/meta/recipes-support/vim/<a href="http://vim_8.1.1240.bb" rel="noreferrer" target="_blank">vim_8.1.1240.bb</a><br>
index baaaacc0b77f..60946a181f42 100644<br>
--- a/meta/recipes-support/vim/<a href="http://vim_8.1.1240.bb" rel="noreferrer" target="_blank">vim_8.1.1240.bb</a><br>
+++ b/meta/recipes-support/vim/<a href="http://vim_8.1.1240.bb" rel="noreferrer" target="_blank">vim_8.1.1240.bb</a><br>
@@ -1 +1,10 @@<br>
require vim.inc<br>
+<br>
+PROVIDES = "xxd"<br>
+<br>
+PACKAGECONFIG_class-native = ""<br>
+BBCLASSEXTEND = "native"<br>
+<br>
+ALTERNATIVE_${PN}_append = " xxd"<br>
+ALTERNATIVE_TARGET[xxd] = "${bindir}/xxd"<br>
+ALTERNATIVE_LINK_NAME[xxd] = "${bindir}/xxd"<br>
-- <br>
2.7.4<br>
<br>
-- <br>
_______________________________________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org" target="_blank">Openembedded-core@lists.openembedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/mailman/listinfo/openembedded-core</a><br>
</blockquote></div>