From patchwork Tue Apr 17 10:19:12 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Neumann X-Patchwork-Id: 153116 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 330FDB6FC3 for ; Tue, 17 Apr 2012 20:19:47 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id ADBDF1016F5; Tue, 17 Apr 2012 10:19:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id cxoriFGQUfSB; Tue, 17 Apr 2012 10:19:37 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id EA3D4101655; Tue, 17 Apr 2012 10:19:31 +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 8AD598F75B for ; Tue, 17 Apr 2012 10:19:29 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 73D4D828EF for ; Tue, 17 Apr 2012 10:19:29 +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 iybGqWvadw6y for ; Tue, 17 Apr 2012 10:19:24 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail.zonque.de (svenfoo.org [82.94.215.22]) by whitealder.osuosl.org (Postfix) with ESMTPS id D41C1863F9 for ; Tue, 17 Apr 2012 10:19:23 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.zonque.de (Postfix) with ESMTP id 7EAC4C01FB; Tue, 17 Apr 2012 12:19:20 +0200 (CEST) Received: from mail.zonque.de ([127.0.0.1]) by localhost (rambrand.c2342.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id EQF+Z-O0LUFC; Tue, 17 Apr 2012 12:19:20 +0200 (CEST) Received: from sven.BERLIN.TEUFEL.LOCAL (pd907dbf4.dip0.t-ipconnect.de [217.7.219.244]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.zonque.de (Postfix) with ESMTPSA id 1EC3EC01BD; Tue, 17 Apr 2012 12:19:20 +0200 (CEST) From: Sven Neumann To: buildroot@busybox.net Date: Tue, 17 Apr 2012 12:19:12 +0200 Message-Id: <1334657953-29113-1-git-send-email-s.neumann@raumfeld.com> X-Mailer: git-send-email 1.7.9.5 Subject: [Buildroot] [PATCH 1/2] udev: replace UDEV_ALL_EXTRAS with more fine-grained options 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 Replace the BR2_PACKAGE_UDEV_ALL_EXTRAS options with a bunch of configuration choices that allow more fine-grainded control over the features that should be built into udev. Signed-off-by: Sven Neumann --- package/udev/Config.in | 39 ++++++++++++++++++++++++++++++--------- package/udev/udev.mk | 41 ++++++++++++++++++++++++++++++----------- 2 files changed, 60 insertions(+), 20 deletions(-) diff --git a/package/udev/Config.in b/package/udev/Config.in index d3244d1..55daa01 100644 --- a/package/udev/Config.in +++ b/package/udev/Config.in @@ -15,20 +15,41 @@ config BR2_PACKAGE_UDEV if BR2_PACKAGE_UDEV +config BR2_PACKAGE_UDEV_ACL + bool "enable acl permissions" + help + Enable enable local user acl permissions support + +config BR2_PACKAGE_UDEV_GUDEV + bool "enable GObject libudev support" + help + Enable GObject libudev support + +config BR2_PACKAGE_UDEV_HWDATA + bool "enable hardware data" + help + Enable hardware identification and configuration data + +config BR2_PACKAGE_UDEV_INTROSPECTION + bool "enable GObject introspection" + help + Enable GObject introspection support + +config BR2_PACKAGE_UDEV_KEYMAP + bool "enable keymap fixup" + help + Enable keymap fixup support + +config BR2_PACKAGE_UDEV_MTD + bool "enable MTD support" + help + Enable MTD probe support + config BR2_PACKAGE_UDEV_RULES_GEN bool "enable rules generator" help Enable persistant rules generator -config BR2_PACKAGE_UDEV_ALL_EXTRAS - bool "enable all extras" - select BR2_PACKAGE_ACL - select BR2_PACKAGE_HWDATA - select BR2_PACKAGE_LIBGLIB2 - help - Enable all extras with external dependencies like - libacl, hwdata and libglib2 - endif comment "udev requires /dev mgmnt set to udev under System configuration" diff --git a/package/udev/udev.mk b/package/udev/udev.mk index 726aed6..13c0895 100644 --- a/package/udev/udev.mk +++ b/package/udev/udev.mk @@ -15,24 +15,43 @@ UDEV_CONF_OPT = \ --sbindir=/sbin \ --with-rootlibdir=/lib \ --libexecdir=/lib \ - --with-usb-ids-path=/usr/share/hwdata/usb.ids \ - --with-pci-ids-path=/usr/share/hwdata/pci.ids \ --with-firmware-path=/lib/firmware \ - --disable-introspection + --with-usb-ids-path=/usr/share/hwdata/usb.ids \ + --with-pci-ids-path=/usr/share/hwdata/pci.ids UDEV_DEPENDENCIES = host-gperf host-pkg-config util-linux kmod -ifeq ($(BR2_PACKAGE_UDEV_RULES_GEN),y) -UDEV_CONF_OPT += --enable-rule_generator +ifeq ($(BR2_PACKAGE_UDEV_ACL),y) +UDEV_CONF_OPT += --enable-udev_acl +UDEV_DEPENDENCIES += acl +endif + +ifeq ($(BR2_PACKAGE_UDEV_GUDEV),y) +UDEV_DEPENDENCIES += libglib2 +else +UDEV_CONF_OPT += --disable-gudev +endif + +ifeq ($(BR2_PACKAGE_UDEV_HWDATA),y) +UDEV_DEPENDENCIES += hwdata endif -ifeq ($(BR2_PACKAGE_UDEV_ALL_EXTRAS),y) -UDEV_DEPENDENCIES += acl hwdata libglib2 -UDEV_CONF_OPT += \ - --enable-udev_acl +ifeq ($(BR2_PACKAGE_UDEV_INTROSPECTION),y) +UDEV_DEPENDENCIES += libglib2 else -UDEV_CONF_OPT += \ - --disable-gudev +UDEV_CONF_OPT += --disable-introspection +endif + +ifneq ($(BR2_PACKAGE_UDEV_KEYMAP),y) +UDEV_CONF_OPT += --disable-keymap +endif + +ifneq ($(BR2_PACKAGE_UDEV_MTD),y) +UDEV_CONF_OPT += --disable-mtd_probe +endif + +ifeq ($(BR2_PACKAGE_UDEV_RULES_GEN),y) +UDEV_CONF_OPT += --enable-rule_generator endif ifeq ($(BR2_PACKAGE_SYSTEMD),y)