Commit 17b85cac authored by Arnout Vandecappelle (Essensium/Mind)'s avatar Arnout Vandecappelle (Essensium/Mind) Committed by Peter Korsgaard
Browse files

xapp_xinit depends on mcookie, not xserver_xorg-server 



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.

Signed-off-by: default avatarArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 1a111ffd

package/x11r7/xapp_xinit/Config.in

+2 −0
Original line number Diff line number Diff line
@@ -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

package/x11r7/xserver_xorg-server/Config.in

+0 −1
Original line number Diff line number Diff line 
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.