summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/vim
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2019-05-18 14:34:13 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-05-21 12:56:33 +0100
commit621bf4ef6842eedeb92ec42ce6fe45d98ed48903 (patch)
tree9113f60f20dfe7145c590053d4efad84a00a5a94 /meta/recipes-support/vim
parent6d401d808a8edee8ffb2d5abe843214057b3189b (diff)
downloadpoky-621bf4ef6842eedeb92ec42ce6fe45d98ed48903.tar.gz
vim: Rework things so vim adds features not vim-tiny removes
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>
Diffstat (limited to 'meta/recipes-support/vim')
-rw-r--r--meta/recipes-support/vim/vim-tiny_8.1.1240.bb3
-rw-r--r--meta/recipes-support/vim/vim.inc8
-rw-r--r--meta/recipes-support/vim/vim_8.1.1240.bb9
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 139e626e44..e4c26d23f6 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
2 2
3SUMMARY += " (with tiny features)" 3SUMMARY += " (with tiny features)"
4 4
5PROVIDES_remove = "xxd"
6ALTERNATIVE_${PN}_remove = "xxd"
7
8PACKAGECONFIG += "tiny" 5PACKAGECONFIG += "tiny"
9 6
10do_install() { 7do_install() {
diff --git a/meta/recipes-support/vim/vim.inc b/meta/recipes-support/vim/vim.inc
index f5c74684bf..433f233448 100644
--- a/meta/recipes-support/vim/vim.inc
+++ b/meta/recipes-support/vim/vim.inc
@@ -1,7 +1,6 @@
1SUMMARY = "Vi IMproved - enhanced vi editor" 1SUMMARY = "Vi IMproved - enhanced vi editor"
2SECTION = "console/utils" 2SECTION = "console/utils"
3 3
4PROVIDES = "xxd"
5DEPENDS = "ncurses gettext-native" 4DEPENDS = "ncurses gettext-native"
6# vimdiff doesn't like busybox diff 5# vimdiff doesn't like busybox diff
7RSUGGESTS_${PN} = "diffutils" 6RSUGGESTS_${PN} = "diffutils"
@@ -52,7 +51,6 @@ PACKAGECONFIG += " \
52 ${@bb.utils.filter('DISTRO_FEATURES', 'acl selinux', d)} \ 51 ${@bb.utils.filter('DISTRO_FEATURES', 'acl selinux', d)} \
53 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 gtkgui', '', d)} \ 52 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 gtkgui', '', d)} \
54" 53"
55PACKAGECONFIG_class-native = ""
56 54
57PACKAGECONFIG[gtkgui] = "--enable-gui=gtk2,--enable-gui=no,gtk+," 55PACKAGECONFIG[gtkgui] = "--enable-gui=gtk2,--enable-gui=no,gtk+,"
58PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl," 56PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl,"
@@ -130,12 +128,8 @@ RDEPENDS_${BPN} = "ncurses-terminfo-base"
130# Recommend that runtime data is installed along with vim 128# Recommend that runtime data is installed along with vim
131RRECOMMENDS_${BPN} = "${PN}-syntax ${PN}-help ${PN}-tutor ${PN}-vimrc ${PN}-common" 129RRECOMMENDS_${BPN} = "${PN}-syntax ${PN}-help ${PN}-tutor ${PN}-vimrc ${PN}-common"
132 130
133ALTERNATIVE_${PN} = "vi vim xxd" 131ALTERNATIVE_${PN} = "vi vim"
134ALTERNATIVE_PRIORITY = "100" 132ALTERNATIVE_PRIORITY = "100"
135ALTERNATIVE_TARGET = "${bindir}/${BPN}.${BPN}" 133ALTERNATIVE_TARGET = "${bindir}/${BPN}.${BPN}"
136ALTERNATIVE_LINK_NAME[vi] = "${base_bindir}/vi" 134ALTERNATIVE_LINK_NAME[vi] = "${base_bindir}/vi"
137ALTERNATIVE_LINK_NAME[vim] = "${bindir}/vim" 135ALTERNATIVE_LINK_NAME[vim] = "${bindir}/vim"
138ALTERNATIVE_TARGET[xxd] = "${bindir}/xxd"
139ALTERNATIVE_LINK_NAME[xxd] = "${bindir}/xxd"
140
141BBCLASSEXTEND = "native"
diff --git a/meta/recipes-support/vim/vim_8.1.1240.bb b/meta/recipes-support/vim/vim_8.1.1240.bb
index baaaacc0b7..60946a181f 100644
--- a/meta/recipes-support/vim/vim_8.1.1240.bb
+++ b/meta/recipes-support/vim/vim_8.1.1240.bb
@@ -1 +1,10 @@
1require vim.inc 1require vim.inc
2
3PROVIDES = "xxd"
4
5PACKAGECONFIG_class-native = ""
6BBCLASSEXTEND = "native"
7
8ALTERNATIVE_${PN}_append = " xxd"
9ALTERNATIVE_TARGET[xxd] = "${bindir}/xxd"
10ALTERNATIVE_LINK_NAME[xxd] = "${bindir}/xxd"