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