2
1
Эх сурвалжийг харах

weston: improve selection of compositor

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@mind.be>
[yann.morin.1998@free.fr: don't reorder entries, keep alphabetical sort]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Arnout Vandecappelle (Essensium/Mind) 11 жил өмнө
parent
commit
6d8998033f

+ 3 - 6
package/weston/Config.in

@@ -14,6 +14,8 @@ config BR2_PACKAGE_WESTON
 	depends on BR2_TOOLCHAIN_HAS_THREADS # wayland
 	depends on BR2_TOOLCHAIN_HAS_THREADS # wayland
 	# Runtime dependency
 	# Runtime dependency
 	select BR2_PACKAGE_XKEYBOARD_CONFIG
 	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
 	help
 	  Weston is the reference implementation of a Wayland
 	  Weston is the reference implementation of a Wayland
 	  compositor, and a useful compositor in its own right.
 	  compositor, and a useful compositor in its own right.
@@ -24,17 +26,12 @@ config BR2_PACKAGE_WESTON
 
 
 if 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
 config BR2_PACKAGE_WESTON_HAS_COMPOSITOR
 	bool
 	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
 config BR2_PACKAGE_WESTON_FBDEV
 	bool "fbdev compositor"
 	bool "fbdev compositor"
-	default y
 
 
 config BR2_PACKAGE_WESTON_RPI
 config BR2_PACKAGE_WESTON_RPI
 	bool "RPi compositor"
 	bool "RPi compositor"