diff options
author | Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> | 2013-01-20 00:31:15 +0000 |
---|---|---|
committer | Peter Korsgaard <jacmet@sunsite.dk> | 2013-01-20 21:20:53 +0100 |
commit | 17b85cac50181aea39c35301c69e854e0db77656 (patch) | |
tree | 2985535d9271933e721fb2227067719341742589 | |
parent | 1a111ffd21473c4862c1ce3404c103ac3a46372d (diff) | |
download | buildroot-novena-17b85cac50181aea39c35301c69e854e0db77656.tar.gz buildroot-novena-17b85cac50181aea39c35301c69e854e0db77656.zip |
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>
-rw-r--r-- | package/x11r7/xapp_xinit/Config.in | 2 | ||||
-rw-r--r-- | package/x11r7/xserver_xorg-server/Config.in | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/package/x11r7/xapp_xinit/Config.in b/package/x11r7/xapp_xinit/Config.in index 30981c329..aede5d969 100644 --- a/package/x11r7/xapp_xinit/Config.in +++ b/package/x11r7/xapp_xinit/Config.in @@ -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 diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in index 5b6039818..21b07009a 100644 --- a/package/x11r7/xserver_xorg-server/Config.in +++ b/package/x11r7/xserver_xorg-server/Config.in @@ -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. |