Patchwork [meta-oe] vim: Fix packaging of common data files

login
register
mail settings
Submitter Paul Barker
Date May 28, 2014, 10:10 p.m.
Message ID <1401315040-6563-1-git-send-email-paul@paulbarker.me.uk>
Download mbox | patch
Permalink /patch/72917/
State New, archived
Headers show

Comments

Paul Barker - May 28, 2014, 10:10 p.m.
The majority of the vim runtime files have been moved from the package
'vim-data' to the package 'vim-common'. However, 'vim-data' was still in
RRECOMMENDS and 'vim-common' was not, so the runtime files were not being
installed by default.

To fix this, 'vim-data' is removed from RRECOMMENDS and 'vim-common' is added
instead. 'vim-data' is also removed from PACKAGES as it should now be empty.

Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
---
 meta-oe/recipes-support/vim/vim_7.4.258.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Patch

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 2d3b0c2..cfc82b1 100644
--- a/meta-oe/recipes-support/vim/vim_7.4.258.bb
+++ b/meta-oe/recipes-support/vim/vim_7.4.258.bb
@@ -70,7 +70,7 @@  do_install_append() {
 
 PARALLEL_MAKEINST = ""
 
-PACKAGES =+ "${PN}-common ${PN}-syntax ${PN}-help ${PN}-tutor ${PN}-vimrc ${PN}-data"
+PACKAGES =+ "${PN}-common ${PN}-syntax ${PN}-help ${PN}-tutor ${PN}-vimrc"
 FILES_${PN}-syntax = "${datadir}/${PN}/${VIMDIR}/syntax"
 FILES_${PN}-help = "${datadir}/${PN}/${VIMDIR}/doc"
 FILES_${PN}-tutor = "${datadir}/${PN}/${VIMDIR}/tutor ${bindir}/${PN}tutor"
@@ -93,7 +93,7 @@  FILES_${PN}-common = " \
 "
 
 # Recommend that runtime data is installed along with vim
-RRECOMMENDS_${PN} = "${PN}-syntax ${PN}-help ${PN}-tutor ${PN}-vimrc ${PN}-data"
+RRECOMMENDS_${PN} = "${PN}-syntax ${PN}-help ${PN}-tutor ${PN}-vimrc ${PN}-common"
 
 ALTERNATIVE_${PN} = "vi"
 ALTERNATIVE_TARGET[vi] = "${bindir}/${PN}"