[oe-commits] [meta-openembedded] 06/87: vim: only include when x11 in DISTRO_FEATURES

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

armin_kuster pushed a commit to branch master-next
in repository meta-openembedded.

commit 729cde51429b62a6d0c36569ced7dfdb66e65c37
Author: Armin Kuster <akuster808 at gmail.com>
AuthorDate: Tue Mar 6 07:30:57 2018 -0800

    vim: only include when x11 in DISTRO_FEATURES
    
    fixes:
    
     vim:do_install: 6a98ed60a33e0915e83ddf4411cb98a4 -> fab6a8f9b3c3978de44b458939712d90
          bitbake-diffsigs --task vim do_install --signature 6a98ed60a33e0915e83ddf4411cb98a4 fab6a8f9b3c3978de44b458939712d90
          NOTE: Starting bitbake server...
          basehash changed from 7302bf635913317779cf6e19324032a4 to 4a66ac61a894cf5b09db9afc053c77e6
          Variable do_install value changed:
          @@ -11,3 +11,7 @@
    
               # we use --with-features=big as default
               mv ${D}${bindir}/${BPN} ${D}${bindir}/${BPN}.${BPN}
          +	# The mouse being autoenabled is just annoying in xfce4-terminal (mouse
          +	# drag make vim go into visual mode and there is no right click menu),
          +	# delete the block.
          +	sed -i '/the mouse works just fine/,+4d' ${D}/${datadir}/${BPN}/vimrc
    
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 meta-xfce/recipes-support/vim/vim_%.bbappend                   | 7 +------
 meta-xfce/recipes-support/vim/{vim_%.bbappend => vim_xfce.inc} | 0
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/meta-xfce/recipes-support/vim/vim_%.bbappend b/meta-xfce/recipes-support/vim/vim_%.bbappend
index 25403e6..7b44963 100644
--- a/meta-xfce/recipes-support/vim/vim_%.bbappend
+++ b/meta-xfce/recipes-support/vim/vim_%.bbappend
@@ -1,6 +1 @@
-do_install_append() {
-	# The mouse being autoenabled is just annoying in xfce4-terminal (mouse
-	# drag make vim go into visual mode and there is no right click menu),
-	# delete the block.
-	sed -i '/the mouse works just fine/,+4d' ${D}/${datadir}/${BPN}/vimrc
-}
+require ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '${BPN}_xfce.inc', '', d)}
diff --git a/meta-xfce/recipes-support/vim/vim_%.bbappend b/meta-xfce/recipes-support/vim/vim_xfce.inc
similarity index 100%
copy from meta-xfce/recipes-support/vim/vim_%.bbappend
copy to meta-xfce/recipes-support/vim/vim_xfce.inc

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.