From patchwork Sun Jan 6 21:29:13 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 209807 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 537872C0084 for ; Mon, 7 Jan 2013 08:30:34 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 3819C8C25B; Sun, 6 Jan 2013 21:30:32 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id c6qfLmpfy3Ol; Sun, 6 Jan 2013 21:30:17 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 3FEF38C281; Sun, 6 Jan 2013 21:30:02 +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 E6CD78F753 for ; Sun, 6 Jan 2013 21:29:54 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id B7C418BF23 for ; Sun, 6 Jan 2013 21:29:48 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id PREafHHMDEi6 for ; Sun, 6 Jan 2013 21:29:48 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.free-electrons.com (mail.free-electrons.com [94.23.32.191]) by whitealder.osuosl.org (Postfix) with ESMTP id CF7ED8BB93 for ; Sun, 6 Jan 2013 21:29:47 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 106) id 79C49161; Sun, 6 Jan 2013 22:29:48 +0100 (CET) Received: from localhost (humanoidz.org [82.247.183.72]) by mail.free-electrons.com (Postfix) with ESMTPSA id EEA1710F for ; Sun, 6 Jan 2013 22:29:46 +0100 (CET) From: Thomas Petazzoni To: buildroot@busybox.net Date: Sun, 6 Jan 2013 22:29:13 +0100 Message-Id: <909b81d257e7f2f45760325cbd316bc8b66320cf.1357507764.git.thomas.petazzoni@free-electrons.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: In-Reply-To: References: Subject: [Buildroot] [PATCH 01/28] x11r7: move X.org server style option 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 The selection between "modular" server and "Kdrive" server really belongs as a sub-option of the X.org server itself, rather than as a global x11r7 option. So we move it under the X.org server option. Signed-off-by: Thomas Petazzoni Acked-by: Arnout Vandecappelle (Essensium/Mind) --- package/x11r7/Config.in | 18 ------------------ package/x11r7/xserver_xorg-server/Config.in | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in index 2aac5a2..dc84798 100644 --- a/package/x11r7/Config.in +++ b/package/x11r7/Config.in @@ -13,24 +13,6 @@ menuconfig BR2_PACKAGE_XORG7 if BR2_PACKAGE_XORG7 -choice - prompt "X Window System server type" - default BR2_PACKAGE_XSERVER_tinyx - help - Select the X Window System server to use - -config BR2_PACKAGE_XSERVER_xorg - bool "Modular X.org" - depends on BR2_LARGEFILE && BR2_INSTALL_LIBSTDCPP - -comment 'X.org requires largefile and C++ support' - depends on !(BR2_LARGEFILE && BR2_INSTALL_LIBSTDCPP) - -config BR2_PACKAGE_XSERVER_tinyx - bool "TinyX" - -endchoice - menu "X11R7 Servers" source package/x11r7/xserver_xorg-server/Config.in endmenu diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in index 02c2828..bea0ffa 100644 --- a/package/x11r7/xserver_xorg-server/Config.in +++ b/package/x11r7/xserver_xorg-server/Config.in @@ -59,6 +59,24 @@ comment "xorg-xserver is BROKEN on AVR32" if BR2_PACKAGE_XSERVER_XORG_SERVER +choice + prompt "X Window System server type" + default BR2_PACKAGE_XSERVER_tinyx + help + Select the X Window System server to use + +config BR2_PACKAGE_XSERVER_xorg + bool "Modular X.org" + depends on BR2_LARGEFILE && BR2_INSTALL_LIBSTDCPP + +comment "X.org requires largefile and C++ support" + depends on !(BR2_LARGEFILE && BR2_INSTALL_LIBSTDCPP) + +config BR2_PACKAGE_XSERVER_tinyx + bool "TinyX" + +endchoice + config BR2_PACKAGE_XSERVER_XORG_SERVER_NULL_CURSOR bool "Null root cursor" help