From d561c5cb6bbcc0f44baaa65bc8878a121d4c9786 Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Wed, 1 Aug 2018 00:14:41 +0200 Subject: vim, vim-tiny: Make vim provide xxd without vim-tiny doing it too There is no xxd in vim-tiny, so there is no reason to provide vim-tiny-xxd. Besides, it is typically "xxd-native" that one wants to be able to depend on, not "vim-native-xxd" (then the old dependency on vim-native already did the trick). Signed-off-by: Peter Kjellerstedt Signed-off-by: Khem Raj --- meta-oe/recipes-support/vim/vim-tiny_8.1.0172.bb | 2 ++ meta-oe/recipes-support/vim/vim_8.1.0172.bb | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/vim/vim-tiny_8.1.0172.bb b/meta-oe/recipes-support/vim/vim-tiny_8.1.0172.bb index 84ad659e06..23f6aec49a 100644 --- a/meta-oe/recipes-support/vim/vim-tiny_8.1.0172.bb +++ b/meta-oe/recipes-support/vim/vim-tiny_8.1.0172.bb @@ -2,6 +2,8 @@ require vim_${PV}.bb SUMMARY += " (with tiny features)" +PROVIDES_remove = "xxd" + PACKAGECONFIG += "tiny" do_install() { diff --git a/meta-oe/recipes-support/vim/vim_8.1.0172.bb b/meta-oe/recipes-support/vim/vim_8.1.0172.bb index fd2afbc5ae..371fe35eec 100644 --- a/meta-oe/recipes-support/vim/vim_8.1.0172.bb +++ b/meta-oe/recipes-support/vim/vim_8.1.0172.bb @@ -1,5 +1,7 @@ SUMMARY = "Vi IMproved - enhanced vi editor" SECTION = "console/utils" + +PROVIDES = "xxd" DEPENDS = "ncurses gettext-native" # vimdiff doesn't like busybox diff RSUGGESTS_${PN} = "diffutils" @@ -111,5 +113,3 @@ ALTERNATIVE_LINK_NAME[vim] = "${bindir}/vim" ALTERNATIVE_PRIORITY = "100" BBCLASSEXTEND = "native" - -PROVIDES += "${PN}-xxd" -- cgit 1.2.3-korg