From patchwork Sat Jul 19 13:56:12 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 371811 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 70D25140180 for ; Sat, 19 Jul 2014 23:56:44 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 9395D8A4CA; Sat, 19 Jul 2014 13:56:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id goxwtnnvM+sk; Sat, 19 Jul 2014 13:56:41 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id B5BFF8A3B0; Sat, 19 Jul 2014 13:56:41 +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 3E2261BF970 for ; Sat, 19 Jul 2014 13:56:37 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 39F9F8BF6D for ; Sat, 19 Jul 2014 13:56:37 +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 KnXrP+IdzTWH for ; Sat, 19 Jul 2014 13:56:36 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wg0-f51.google.com (mail-wg0-f51.google.com [74.125.82.51]) by whitealder.osuosl.org (Postfix) with ESMTPS id 5EE368C0AB for ; Sat, 19 Jul 2014 13:56:36 +0000 (UTC) Received: by mail-wg0-f51.google.com with SMTP id b13so4652299wgh.22 for ; Sat, 19 Jul 2014 06:56:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=proa2Dau6S8lez/zpnArwNaUCcZSyOOeYtpKXYr7ON8=; b=PPMtxdE3B67vnIYvTnP5d0hkmoJxsU9LGmPzVr5sATIK/T8VFSj5jxRE0Bj3D+9JC9 0oPnwnsnoi8KlQMj0dHh18wxSHE9/jZTwn96qaihGJngyJAlOYqitlOPtxWH3Ml4bPwR bmPA1u1yaNAx6FgtceFag+5OAbfEfhwbsNuiFzXSZCrEdrkQWsfpWSicPzbSbKgM9jqf 6VUlPm2vTl1hOnYV4E7YeZKNFPp6v0w/SOM4zzWyxWHAy42zCFaVXCA2iNqnuzCsJQM4 kHLdnZNsM77tNxNhlQ3Bhhnd7EhJUZH2Ca3qGM9ad10lHhmlOsGtn3FS7I4fNdhOn4QK 0PXg== X-Received: by 10.194.219.225 with SMTP id pr1mr5541004wjc.34.1405778194898; Sat, 19 Jul 2014 06:56:34 -0700 (PDT) Received: from gourin.bzh.lan (ks3095497.kimsufi.com. [94.23.60.27]) by mx.google.com with ESMTPSA id v4sm18638545wiz.16.2014.07.19.06.56.33 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 19 Jul 2014 06:56:34 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Sat, 19 Jul 2014 15:56:12 +0200 Message-Id: X-Mailer: git-send-email 1.9.1 In-Reply-To: References: Cc: Thomas Petazzoni , Bernd Kuhls , "Yann E. MORIN" Subject: [Buildroot] [PATCH 05/20 v3] package/eudev: remove the prompt 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 package eudev depends on DEVICE_CREATION_DYNAMIC_EUDEV, and is also selected by DEVICE_CREATION_DYNAMIC_EUDEV. This means that: - eudev is not visible when DEVICE_CREATION_DYNAMIC_EUDEV is not set - eudev is visible but forced when DEVICE_CREATION_DYNAMIC_EUDEV is set As a consequence, eudev is never user-selectable. Since the user already made the decision to use eudev in the /dev management choice, there is no point in showing the eudev package at all in the menuconfig. Just remove the prompt. Also remove the comments, since anyway the user can't do anything about it. Although not strictly required, we anyway keep the dependencies expressed in eudev, to explain where they come from (fork, util-linux...), so it is explicit their duplication in the .dev management choice entry comes from eudev itself. So, update the comments there. Also, move the help text to the /dev macnagement choice, so the user has a chance to look at it! ;-) Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Bernd Kuhls --- package/eudev/Config.in | 30 +++++++++--------------------- system/Config.in | 21 ++++++++++++++++----- 2 files changed, 25 insertions(+), 26 deletions(-) diff --git a/package/eudev/Config.in b/package/eudev/Config.in index 40ff721..b204a90 100644 --- a/package/eudev/Config.in +++ b/package/eudev/Config.in @@ -1,7 +1,13 @@ +# Note: being prompt-less, and selected in the /dev management choice, +# it is not needed to have dependencies on this symbol, since the +# choice entry already have those dependencies. +# However, it seems more logical to have the dependencies listed here, +# so it is easier to uderstand why we have those, and duplicate them in +# the choice entry. + config BR2_PACKAGE_EUDEV - bool "eudev" + bool depends on !BR2_avr32 # no epoll_create1 - depends on BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV depends on BR2_USE_MMU # uses fork() depends on BR2_LARGEFILE # util-linux depends on BR2_USE_WCHAR # util-linux @@ -10,14 +16,6 @@ config BR2_PACKAGE_EUDEV select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBBLKID select BR2_PACKAGE_KMOD - help - Userspace device daemon. This is a standalone version, - independent of systemd. It is a fork maintained by Gentoo. - - eudev requires a Linux kernel >= 2.6.34: it relies on devtmpfs - and inotify. - - http://github.com/gentoo/eudev/ if BR2_PACKAGE_EUDEV @@ -25,18 +23,8 @@ config BR2_PACKAGE_PROVIDES_UDEV default "eudev" config BR2_PACKAGE_EUDEV_RULES_GEN - bool "enable rules generator" + bool "eudev rules generator" help Enable persistent rules generator endif - -comment "eudev needs eudev /dev management" - depends on !BR2_avr32 - depends on BR2_USE_MMU - depends on !BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV - -comment "eudev needs a toolchain w/ largefile, wchar, dynamic library" - depends on !BR2_avr32 - depends on BR2_USE_MMU - depends on !BR2_LARGEFILE || !BR2_USE_WCHAR || BR2_PREFER_STATIC_LIB diff --git a/system/Config.in b/system/Config.in index 1be7e5d..89ae46e 100644 --- a/system/Config.in +++ b/system/Config.in @@ -124,12 +124,23 @@ config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV bool "Dynamic using eudev" - depends on !BR2_avr32 # eudev - depends on BR2_LARGEFILE - depends on BR2_USE_WCHAR - depends on !BR2_PREFER_STATIC_LIB - depends on BR2_USE_MMU # eudev + depends on !BR2_avr32 # eudev (no epoll_create1) + depends on BR2_USE_MMU # eudev (fork) + depends on BR2_LARGEFILE # eudev (util-linux) + depends on BR2_USE_WCHAR # eudev (util-linux) + depends on !BR2_PREFER_STATIC_LIB # eudev select BR2_PACKAGE_EUDEV + help + Userspace device daemon. This is a standalone version, + independent of systemd. It is a fork maintained by Gentoo. + + eudev requires a Linux kernel >= 2.6.34: it relies on devtmpfs + and inotify. + + You can further configure systemd in: + Target packages --> Hardware handling + + http://github.com/gentoo/eudev/ comment "eudev needs a toolchain w/ largefile, wchar, dynamic library" depends on !BR2_avr32 # eudev