Patchwork [1/2] udev: replace UDEV_ALL_EXTRAS with more fine-grained options

login
register
mail settings
Submitter Sven Neumann
Date April 17, 2012, 10:19 a.m.
Message ID <1334657953-29113-1-git-send-email-s.neumann@raumfeld.com>
Download mbox | patch
Permalink /patch/153116/
State Rejected
Headers show

Comments

Sven Neumann - April 17, 2012, 10:19 a.m.
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 <s.neumann@raumfeld.com>
---
 package/udev/Config.in |   39 ++++++++++++++++++++++++++++++---------
 package/udev/udev.mk   |   41 ++++++++++++++++++++++++++++++-----------
 2 files changed, 60 insertions(+), 20 deletions(-)
Arnout Vandecappelle - April 28, 2012, 3:26 p.m.
On Tuesday 17 April 2012 12:19:12 Sven Neumann wrote:
> Replace the BR2_PACKAGE_UDEV_ALL_EXTRAS options with a bunch of
> configuration choices that allow more fine-grainded control over
                                                  ^ Spelling

> the features that should be built into udev.
> 
> Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
> ---
>  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"
	select BR2_PACKAGE_ACL

> +	help
> +	  Enable enable local user acl permissions support
> +
> +config BR2_PACKAGE_UDEV_GUDEV
> +	bool "enable GObject libudev support"
	select BR2_PACKAGE_LIBGLIB2

> +	help
> +	  Enable GObject libudev support
> +
> +config BR2_PACKAGE_UDEV_HWDATA
> +	bool "enable hardware data"
	select BR2_PACKAGE_HWDATA

> +	help
> +	  Enable hardware identification and configuration data
> +
> +config BR2_PACKAGE_UDEV_INTROSPECTION
> +	bool "enable GObject introspection"
	select BR2_PACKAGE_LIBGLIB2

 And doesn't this depend on BR2_PACKAGE_UDEV_GUDEV?

> +	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

 I guess this reordering of the config options is meaningless?

>  
>  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
 Probably cleaner to explicitly disable it in the else case.

> +endif
> +
> +ifeq ($(BR2_PACKAGE_UDEV_GUDEV),y)
 Probably cleaner to explicitly enable it.

> +UDEV_DEPENDENCIES += libglib2
> +else
> +UDEV_CONF_OPT += --disable-gudev
> +endif
> +
> +ifeq ($(BR2_PACKAGE_UDEV_HWDATA),y)
> +UDEV_DEPENDENCIES += hwdata
 Is there no enable/disable option for this?

>  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
 Probably cleaner to explicitly enable it.

>  else
> -UDEV_CONF_OPT +=		\
> -	--disable-gudev
> +UDEV_CONF_OPT += --disable-introspection
> +endif
> +
> +ifneq ($(BR2_PACKAGE_UDEV_KEYMAP),y)
 Probably cleaner to explicitly enable it.

> +UDEV_CONF_OPT += --disable-keymap
> +endif
> +
> +ifneq ($(BR2_PACKAGE_UDEV_MTD),y)
 Probably cleaner to explicitly enable it.

> +UDEV_CONF_OPT += --disable-mtd_probe
> +endif
> +
> +ifeq ($(BR2_PACKAGE_UDEV_RULES_GEN),y)
 Probably cleaner to explicitly disable it.

> +UDEV_CONF_OPT += --enable-rule_generator
>  endif
>  
>  ifeq ($(BR2_PACKAGE_SYSTEMD),y)
> 

 Regards,
 Arnout
Thomas Petazzoni - March 24, 2013, 11:41 a.m.
Dear Sven Neumann,

On Tue, 17 Apr 2012 12:19:12 +0200, Sven Neumann wrote:
> 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 <s.neumann@raumfeld.com>

This patch is rather old, and with the movement around systemd/udev, I
don't think there is really too much incentive to put efforts into the
legacy udev package. Therefore, I've removed this patch, as well as
your PATCH 2/2 that depended on this one, from the patchwork.

If you're still interested by this feature, do not hesitate to come
back with updated versions of those patches, taking into account the
comments that were raised during the review.

Thanks,

Thomas

Patch

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)