mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-14 21:49:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

vim: Rework things so vim adds features not vim-tiny removes

Browse Source 
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.jansa@gmail.com>
(From OE-Core rev: a9f62ea2c380375c749a28405708bfdb7754f51f)

Signed-off-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Tom Rini
2019-05-18 14:34:13 -04:00
committed by Richard Purdie
parent 6d401d808a
commit 621bf4ef68
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
meta/recipes-support/vim/vim-tiny_8.1.1240.bb
View File

@@ -2,9 +2,6 @@ require vim.inc
SUMMARY += " (with tiny features)" SUMMARY += " (with tiny features)"
PROVIDES_remove = "xxd"
ALTERNATIVE_${PN}_remove = "xxd"
PACKAGECONFIG += "tiny" PACKAGECONFIG += "tiny"
do_install() { do_install() {

8
meta/recipes-support/vim/vim.inc
View File

@@ -1,7 +1,6 @@
SUMMARY = "Vi IMproved - enhanced vi editor" SUMMARY = "Vi IMproved - enhanced vi editor"
SECTION = "console/utils" SECTION = "console/utils"
PROVIDES = "xxd"
DEPENDS = "ncurses gettext-native" DEPENDS = "ncurses gettext-native"
# vimdiff doesn't like busybox diff # vimdiff doesn't like busybox diff
RSUGGESTS_${PN} = "diffutils" RSUGGESTS_${PN} = "diffutils"
@@ -52,7 +51,6 @@ PACKAGECONFIG += " \
${@bb.utils.filter('DISTRO_FEATURES', 'acl selinux', d)} \ ${@bb.utils.filter('DISTRO_FEATURES', 'acl selinux', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 gtkgui', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 gtkgui', '', d)} \
" "
PACKAGECONFIG_class-native = ""
PACKAGECONFIG[gtkgui] = "--enable-gui=gtk2,--enable-gui=no,gtk+," PACKAGECONFIG[gtkgui] = "--enable-gui=gtk2,--enable-gui=no,gtk+,"
PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl," 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 # Recommend that runtime data is installed along with vim
RRECOMMENDS_${BPN} = "${PN}-syntax ${PN}-help ${PN}-tutor ${PN}-vimrc ${PN}-common" 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_PRIORITY = "100"
ALTERNATIVE_TARGET = "${bindir}/${BPN}.${BPN}" ALTERNATIVE_TARGET = "${bindir}/${BPN}.${BPN}"
ALTERNATIVE_LINK_NAME[vi] = "${base_bindir}/vi" ALTERNATIVE_LINK_NAME[vi] = "${base_bindir}/vi"
ALTERNATIVE_LINK_NAME[vim] = "${bindir}/vim" ALTERNATIVE_LINK_NAME[vim] = "${bindir}/vim"
ALTERNATIVE_TARGET[xxd] = "${bindir}/xxd"
ALTERNATIVE_LINK_NAME[xxd] = "${bindir}/xxd"
BBCLASSEXTEND = "native"

9
meta/recipes-support/vim/vim_8.1.1240.bb
View File

@@ -1 +1,10 @@
require vim.inc 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"