diff options
author | Chong Lu <Chong.Lu@windriver.com> | 2014-04-18 18:16:30 +0800 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-04-21 13:31:47 +0200 |
commit | 9dfa0411e01bd23df4994627fa0280c407a1aac9 (patch) | |
tree | e511f82f6ef06709e2889a8cd4b4ead66fc45192 /meta-oe/recipes-support | |
parent | 797b517efc12b538fdc8a33a24c99b52a294bc9d (diff) | |
download | meta-openembedded-9dfa0411e01bd23df4994627fa0280c407a1aac9.tar.gz |
vim: add dependency and selinux and acl support control
1. Add explicit selinux and acl support control.
2. Vim depends on gettext-native, add to the dependency list.
3. Split binary file into vim package and put others in vim-common.
Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support')
-rw-r--r-- | meta-oe/recipes-support/vim/vim_7.4.258.bb | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/meta-oe/recipes-support/vim/vim_7.4.258.bb b/meta-oe/recipes-support/vim/vim_7.4.258.bb index 878c79e74..023e8fc6c 100644 --- a/meta-oe/recipes-support/vim/vim_7.4.258.bb +++ b/meta-oe/recipes-support/vim/vim_7.4.258.bb | |||
@@ -1,6 +1,6 @@ | |||
1 | SUMMARY = "Vi IMproved - enhanced vi editor" | 1 | SUMMARY = "Vi IMproved - enhanced vi editor" |
2 | SECTION = "console/utils" | 2 | SECTION = "console/utils" |
3 | DEPENDS = "ncurses" | 3 | DEPENDS = "ncurses gettext-native" |
4 | # vimdiff doesn't like busybox diff | 4 | # vimdiff doesn't like busybox diff |
5 | RSUGGESTS_${PN} = "diffutils" | 5 | RSUGGESTS_${PN} = "diffutils" |
6 | LICENSE = "vim" | 6 | LICENSE = "vim" |
@@ -28,11 +28,14 @@ do_configure () { | |||
28 | 28 | ||
29 | #Available PACKAGECONFIG options are gtkgui, acl, x11, tiny | 29 | #Available PACKAGECONFIG options are gtkgui, acl, x11, tiny |
30 | PACKAGECONFIG ??= "" | 30 | PACKAGECONFIG ??= "" |
31 | PACKAGECONFIG += "${@base_contains('DISTRO_FEATURES', 'acl', 'acl', '', d)}" | ||
32 | PACKAGECONFIG += "${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)}" | ||
31 | 33 | ||
32 | PACKAGECONFIG[gtkgui] = "--enable-gtk2-test --enable-gui=gtk2,--enable-gui=no,gtk+," | 34 | PACKAGECONFIG[gtkgui] = "--enable-gtk2-test --enable-gui=gtk2,--enable-gui=no,gtk+," |
33 | PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl," | 35 | PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl," |
34 | PACKAGECONFIG[x11] = "--with-x,--without-x,xt," | 36 | PACKAGECONFIG[x11] = "--with-x,--without-x,xt," |
35 | PACKAGECONFIG[tiny] = "--with-features=tiny,--with-features=big,," | 37 | PACKAGECONFIG[tiny] = "--with-features=tiny,--with-features=big,," |
38 | PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux," | ||
36 | 39 | ||
37 | EXTRA_OECONF = " \ | 40 | EXTRA_OECONF = " \ |
38 | --disable-gpm \ | 41 | --disable-gpm \ |
@@ -68,6 +71,21 @@ FILES_${PN}-help = "${datadir}/${PN}/${VIMDIR}/doc" | |||
68 | FILES_${PN}-tutor = "${datadir}/${PN}/${VIMDIR}/tutor ${bindir}/${PN}tutor" | 71 | FILES_${PN}-tutor = "${datadir}/${PN}/${VIMDIR}/tutor ${bindir}/${PN}tutor" |
69 | FILES_${PN}-vimrc = "${datadir}/${PN}/vimrc" | 72 | FILES_${PN}-vimrc = "${datadir}/${PN}/vimrc" |
70 | FILES_${PN}-data = "${datadir}/${PN}" | 73 | FILES_${PN}-data = "${datadir}/${PN}" |
74 | FILES_${PN}-common = " \ | ||
75 | ${datadir}/${PN}/${VIMDIR}/*.vim \ | ||
76 | ${datadir}/${PN}/${VIMDIR}/autoload \ | ||
77 | ${datadir}/${PN}/${VIMDIR}/colors \ | ||
78 | ${datadir}/${PN}/${VIMDIR}/compiler \ | ||
79 | ${datadir}/${PN}/${VIMDIR}/ftplugin \ | ||
80 | ${datadir}/${PN}/${VIMDIR}/indent \ | ||
81 | ${datadir}/${PN}/${VIMDIR}/keymap \ | ||
82 | ${datadir}/${PN}/${VIMDIR}/lang \ | ||
83 | ${datadir}/${PN}/${VIMDIR}/macros \ | ||
84 | ${datadir}/${PN}/${VIMDIR}/plugin \ | ||
85 | ${datadir}/${PN}/${VIMDIR}/print \ | ||
86 | ${datadir}/${PN}/${VIMDIR}/spell \ | ||
87 | ${datadir}/${PN}/${VIMDIR}/tools \ | ||
88 | " | ||
71 | 89 | ||
72 | # Recommend that runtime data is installed along with vim | 90 | # Recommend that runtime data is installed along with vim |
73 | RRECOMMENDS_${PN} = "${PN}-syntax ${PN}-help ${PN}-tutor ${PN}-vimrc ${PN}-data" | 91 | RRECOMMENDS_${PN} = "${PN}-syntax ${PN}-help ${PN}-tutor ${PN}-vimrc ${PN}-data" |