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: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Arnout Vandecappelle (Essensium/Mind) 2013-01-20 00:31:15 +00:00 committed by Peter Korsgaard
parent 1a111ffd21
commit 17b85cac50
2 changed files with 2 additions and 1 deletions

View File

@ -2,6 +2,8 @@ config BR2_PACKAGE_XAPP_XINIT
bool "xinit" bool "xinit"
# Runtime dependency: can't start an X server unless there is one # Runtime dependency: can't start an X server unless there is one
depends on BR2_PACKAGE_XSERVER_XORG_SERVER 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_XAPP_XAUTH
select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBX11
help help

View File

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