[Buildroot] [git commit] weston: improve selection of compositor

Peter Korsgaard peter at korsgaard.com
Mon Oct 14 20:13:05 UTC 2013


commit: http://git.buildroot.net/buildroot/commit/?id=6d8998033fdbbcb513120f6ca5a1c9d2daf026ff
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master

The way the compositor was selected in Config.in was counter-intuitive,
because the fbdev backend is selected by default even if a different one
is available.

Instead, select the fbdev backend only if no other one was selected by
the user.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout at mind.be>
[yann.morin.1998 at free.fr: don't reorder entries, keep alphabetical sort]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998 at free.fr>
Signed-off-by: Peter Korsgaard <peter at korsgaard.com>
---
 package/weston/Config.in |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/package/weston/Config.in b/package/weston/Config.in
index 4532c28..2cd5ced 100644
--- a/package/weston/Config.in
+++ b/package/weston/Config.in
@@ -14,6 +14,8 @@ config BR2_PACKAGE_WESTON
 	depends on BR2_TOOLCHAIN_HAS_THREADS # wayland
 	# Runtime dependency
 	select BR2_PACKAGE_XKEYBOARD_CONFIG
+	# Make sure at least one compositor is selected.
+	select BR2_PACKAGE_WESTON_FBDEV if !BR2_PACKAGE_WESTON_HAS_COMPOSITOR
 	help
 	  Weston is the reference implementation of a Wayland
 	  compositor, and a useful compositor in its own right.
@@ -24,17 +26,12 @@ config BR2_PACKAGE_WESTON
 
 if BR2_PACKAGE_WESTON
 
-# These two options make sure at least one compositor is selected.
+# Helper to make sure at least one compositor is selected.
 config BR2_PACKAGE_WESTON_HAS_COMPOSITOR
 	bool
-config BR2_PACKAGE_WESTON_NEEDS_ONE_COMPOSITOR
-	def_bool y
-	depends on ! BR2_PACKAGE_WESTON_HAS_COMPOSITOR
-	select BR2_PACKAGE_WESTON_FBDEV
 
 config BR2_PACKAGE_WESTON_FBDEV
 	bool "fbdev compositor"
-	default y
 
 config BR2_PACKAGE_WESTON_RPI
 	bool "RPi compositor"


More information about the buildroot mailing list