vim: simplify PACKAGECONFIG's default value

GTK+3 UI was disabled [1] by default, and the resulting call to
bb.utils.contains() could be replaced by a bb.utils.filter() as in a
similar change [2].

Better than that, just move 'x11' to the bb.utils.filter() above.

[1] a07763f03d4f ("vim: disable GTK+3 UI by default")
[2] f38320c9646a ("meta: simplify conditional operations with bb.utils.filter")

Signed-off-by: João Marcos Costa <joaomarcos.costa@bootlin.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-support/vim/vim.inc b/meta/recipes-support/vim/vim.inc
index d6fdf457069ab8426df8a5d5e9216113e07d88cd..6e0058b13e94fcadfdea45b50eedeb3a1d43b8fb 100644 (file)
--- a/meta/recipes-support/vim/vim.inc
+++ b/meta/recipes-support/vim/vim.inc
@@ -52,8 +52,7 @@ do_configure () {
 }
 
 PACKAGECONFIG ??= "\
-    ${@bb.utils.filter('DISTRO_FEATURES', 'acl selinux', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
+    ${@bb.utils.filter('DISTRO_FEATURES', 'acl selinux x11', d)} \
     nls \
 "