CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim: remove xfce vim bbappend

Browse Source 
Changing the behavior of a recipe by including a layer is not allowed
by the yocto-check-layer script.

INFO: ======================================================================
INFO: FAIL: test_signatures (common.CommonCheckLayer)
INFO: ----------------------------------------------------------------------
INFO: Traceback (most recent call last):
  File "/poky/scripts/lib/checklayer/cases/common.py", line 53, in test_signatures
    self.fail('Adding layer %s changed signatures.\n%s' % (self.tc.layer['name'], msg))
AssertionError: Adding layer meta-xfce changed signatures.
19 signatures changed, initial differences (first hash before, second after):
   vim:do_install: 7f165dbd724ca0127dfb653ef0ecd8e7fb882713adedfd0e14f59d7f54cb645e -> 6e4a49063534d67f70186bf8bdb313184f42426e2c42b12b127638b586c7ffe8
      bitbake-diffsigs --task vim do_install --signature 7f165dbd724ca0127dfb653ef0ecd8e7fb882713adedfd0e14f59d7f54cb645e

fix by move the logic into recipe vim

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Mark Hatle 2019-02-28 09:39:19 +08:00 committed by Khem Raj
parent 1ccc5f9cc5
commit 41f3f8165b
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
meta-oe/recipes-support/vim/vim_8.1.0347.bb
View File

@ -80,6 +80,13 @@ do_install() {
# we use --with-features=big as default
mv ${D}${bindir}/${BPN} ${D}${bindir}/${BPN}.${BPN}
if ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'true', 'false', d)}; then
# 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
fi
}
PARALLEL_MAKEINST = ""

1
meta-xfce/recipes-support/vim/vim_%.bbappend
View File

@ -1 +0,0 @@
require ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '${BPN}_xfce.inc', '', d)}

6
meta-xfce/recipes-support/vim/vim_xfce.inc
View File

@ -1,6 +0,0 @@
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
}