xapp_xinit: only makes sense if there is an X server

From: "Arnout Vandecappelle (Essensium/Mind)" <[email protected]>

---
 package/x11r7/xapp_xinit/Config.in |    2 ++
 1 file changed, 2 insertions(+)

index 9ac2817..30981c3 100644
@@ -1,5 +1,7 @@
 config BR2_PACKAGE_XAPP_XINIT
 	bool "xinit"
+	# Runtime dependency: can't start an X server unless there is one
+	depends on BR2_PACKAGE_XSERVER_XORG_SERVER
 	select BR2_PACKAGE_XAPP_XAUTH
 	select BR2_PACKAGE_XLIB_LIBX11
 	help

1.7.10.4

From: "Arnout Vandecappelle (Essensium/Mind)" <[email protected]>

mcookie is not actually used by the Xorg server; it is used by xinit to generate a xauth cookie before starting the server.

Verified with 'ack-grep -a mcookie build/x*' in an output directory with all packages selected. The only other package that matches is x11vnc: it does a runtime check for mcookie and falls back on /dev/random if it's missing.

---
 package/x11r7/xapp_xinit/Config.in          |    2 ++
 package/x11r7/xserver_xorg-server/Config.in |    1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

index 30981c3..aede5d9 100644
@@ -2,6 +2,8 @@ config BR2_PACKAGE_XAPP_XINIT
 	bool "xinit"
 	# Runtime dependency: can't start an X server unless there is one
 	depends on BR2_PACKAGE_XSERVER_XORG_SERVER
+	# Runtime dependency; mcookie is also in util-linux
+	select BR2_PACKAGE_MCOOKIE if !BR2_PACKAGE_UTIL_LINUX
 	select BR2_PACKAGE_XAPP_XAUTH
 	select BR2_PACKAGE_XLIB_LIBX11
 	help

index 5b60398..21b0700 100644
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_XSERVER_XORG_SERVER
 	bool "xorg-server"
 	select BR2_PACKAGE_LIBDRM if BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR
-	select BR2_PACKAGE_MCOOKIE
 	# We need a SHA1 implementation. If either openssl or
 	# libgcrypt are already part of the build, we'll use one of
 	# them, otherwise, use the small libsha1 library.

1.7.10.4

Arnout> From: "Arnout Vandecappelle (Essensium/Mind)" <[email protected]> Arnout> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <[email protected]> Arnout> ---

 Arnout>  package/x11r7/xapp_xinit/Config.in |    2 ++

Arnout> 1 file changed, 2 insertions(+)

Arnout> diff --git a/package/x11r7/xapp_xinit/Config.in b/package/x11r7/xapp_xinit/Config.in Arnout> index 9ac2817..30981c3 100644
Arnout> --- a/package/x11r7/xapp_xinit/Config.in
Arnout> +++ b/package/x11r7/xapp_xinit/Config.in
Arnout> @@ -1,5 +1,7 @@
Arnout> config BR2_PACKAGE_XAPP_XINIT
Arnout> bool "xinit"
Arnout> + # Runtime dependency: can't start an X server unless there is one
Arnout> + depends on BR2_PACKAGE_XSERVER_XORG_SERVER

XAPP_XDM selects XINIT, so I also added the dependency here and committed both patches, thanks.

Bye, Peter Korsgaard

And xdm obviously doesn't make much sense without an X server...

Regards,
Arnout

Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F