From patchwork Sun Jan 20 10:31:15 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnout Vandecappelle X-Patchwork-Id: 213951 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 9F4932C0084 for ; Sun, 20 Jan 2013 21:31:33 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 630B530D82; Sun, 20 Jan 2013 10:31:32 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Cr-Lh1PoLqnG; Sun, 20 Jan 2013 10:31:31 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 9A2012C88C; Sun, 20 Jan 2013 10:31:30 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 0A4948F74B for ; Sun, 20 Jan 2013 10:31:31 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 578AE8C1DD for ; Sun, 20 Jan 2013 10:31:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id oDon1rNuNaHY for ; Sun, 20 Jan 2013 10:31:21 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from viper.mind.be (132.79-246-81.adsl-static.isp.belgacom.be [81.246.79.132]) by whitealder.osuosl.org (Postfix) with ESMTPS id 8442E8C1E1 for ; Sun, 20 Jan 2013 10:31:20 +0000 (UTC) Received: from [172.16.2.6] (helo=vandecaa-laptop) by viper.mind.be with esmtp (Exim 4.69) (envelope-from ) id 1TwsBJ-0002qI-KZ; Sun, 20 Jan 2013 11:31:18 +0100 Received: from arnout by vandecaa-laptop with local (Exim 4.80) (envelope-from ) id 1TwsBH-0007mi-HH; Sun, 20 Jan 2013 11:31:15 +0100 From: "Arnout Vandecappelle (Essensium/Mind)" To: buildroot@busybox.net Date: Sun, 20 Jan 2013 11:31:15 +0100 Message-Id: <1358677875-29889-2-git-send-email-arnout@mind.be> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1358677875-29889-1-git-send-email-arnout@mind.be> References: <1358677875-29889-1-git-send-email-arnout@mind.be> Subject: [Buildroot] [PATCH 2/2] xapp_xinit depends on mcookie, not xserver_xorg-server X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net From: "Arnout Vandecappelle (Essensium/Mind)" 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) --- package/x11r7/xapp_xinit/Config.in | 2 ++ package/x11r7/xserver_xorg-server/Config.in | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package/x11r7/xapp_xinit/Config.in b/package/x11r7/xapp_xinit/Config.in index 30981c3..aede5d9 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 5b60398..21b0700 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.