diff mbox

[v2,1/2] udev: update udev to new virtual package infra.

Message ID 1393233942-11638-2-git-send-email-eric.le.bihan.dev@free.fr
State Accepted
Commit 5e35c1bedd55c044ab68f3b37738686a951eb9ce
Headers show

Commit Message

Eric Le Bihan Feb. 24, 2014, 9:25 a.m. UTC
The udev virtual package and its current providers (eudev and systemd)
have been updated to use the latest version of virtual package
infrastructure.

A provider should now select BR2_PACKAGE_HAS_UDEV and well as set a
value for BR2_PACKAGE_PROVIDES_UDEV.

Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
---
 package/eudev/Config.in   |    3 +++
 package/systemd/Config.in |    3 +++
 package/udev/Config.in    |    8 ++++----
 package/udev/udev.mk      |   16 ++++------------
 4 files changed, 14 insertions(+), 16 deletions(-)

Comments

Arnout Vandecappelle Feb. 25, 2014, 4:59 p.m. UTC | #1
On 24/02/14 10:25, Eric Le Bihan wrote:
> The udev virtual package and its current providers (eudev and systemd)
> have been updated to use the latest version of virtual package
> infrastructure.
> 
> A provider should now select BR2_PACKAGE_HAS_UDEV and well as set a
> value for BR2_PACKAGE_PROVIDES_UDEV.
> 
> Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>

Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>


 Regards,
 Arnout

> ---
>  package/eudev/Config.in   |    3 +++
>  package/systemd/Config.in |    3 +++
>  package/udev/Config.in    |    8 ++++----
>  package/udev/udev.mk      |   16 ++++------------
>  4 files changed, 14 insertions(+), 16 deletions(-)
> 
> diff --git a/package/eudev/Config.in b/package/eudev/Config.in
> index bfad99a..40ff721 100644
> --- a/package/eudev/Config.in
> +++ b/package/eudev/Config.in
> @@ -21,6 +21,9 @@ config BR2_PACKAGE_EUDEV
>  
>  if BR2_PACKAGE_EUDEV
>  
> +config BR2_PACKAGE_PROVIDES_UDEV
> +	default "eudev"
> +
>  config BR2_PACKAGE_EUDEV_RULES_GEN
>  	bool "enable rules generator"
>  	help
> diff --git a/package/systemd/Config.in b/package/systemd/Config.in
> index e3ea433..eacc23c 100644
> --- a/package/systemd/Config.in
> +++ b/package/systemd/Config.in
> @@ -40,6 +40,9 @@ config BR2_PACKAGE_SYSTEMD
>  
>  if BR2_PACKAGE_SYSTEMD
>  
> +config BR2_PACKAGE_PROVIDES_UDEV
> +	default "systemd"
> +
>  config BR2_PACKAGE_SYSTEMD_ALL_EXTRAS
>  	bool "enable all extras"
>  	select BR2_PACKAGE_XZ
> diff --git a/package/udev/Config.in b/package/udev/Config.in
> index 5cd4051..941a515 100644
> --- a/package/udev/Config.in
> +++ b/package/udev/Config.in
> @@ -1,6 +1,6 @@
>  config BR2_PACKAGE_HAS_UDEV
>  	bool
> -	help
> -	  udev is now a virtual package.
> -	  Packages requiring udevd at run time or libudev/gudev at build time
> -	  should select it.
> +
> +config BR2_PACKAGE_PROVIDES_UDEV
> +	depends on BR2_PACKAGE_HAS_UDEV
> +	string
> diff --git a/package/udev/udev.mk b/package/udev/udev.mk
> index a5d0f80..f5eeeb4 100644
> --- a/package/udev/udev.mk
> +++ b/package/udev/udev.mk
> @@ -5,20 +5,12 @@
>  ################################################################################
>  
>  UDEV_SOURCE =
> +UDEV_DEPENDENCIES = $(call qstrip,$(BR2_PACKAGE_PROVIDES_UDEV))
>  
> -ifeq ($(BR2_PACKAGE_EUDEV),y)
> -UDEV_DEPENDENCIES += eudev
> -endif
> -
> -ifeq ($(BR2_PACKAGE_SYSTEMD),y)
> -UDEV_DEPENDENCIES += systemd
> -endif
> -
> +ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
>  ifeq ($(UDEV_DEPENDENCIES),)
> -define UDEV_CONFIGURE_CMDS
> -	echo "No Udev implementation selected. Configuration error."
> -	exit 1
> -endef
> +$(error No Udev implementation selected. Configuration error)
> +endif
>  endif
>  
>  $(eval $(generic-package))
>
Samuel Martin Feb. 25, 2014, 8:28 p.m. UTC | #2
On Tue, Feb 25, 2014 at 5:59 PM, Arnout Vandecappelle <arnout@mind.be> wrote:
> On 24/02/14 10:25, Eric Le Bihan wrote:
>> The udev virtual package and its current providers (eudev and systemd)
>> have been updated to use the latest version of virtual package
>> infrastructure.
>>
>> A provider should now select BR2_PACKAGE_HAS_UDEV and well as set a
>> value for BR2_PACKAGE_PROVIDES_UDEV.
>>
>> Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
>
> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

Reviewed-by: Samuel Martin <s.martin49@gmail.com>

Regards,
diff mbox

Patch

diff --git a/package/eudev/Config.in b/package/eudev/Config.in
index bfad99a..40ff721 100644
--- a/package/eudev/Config.in
+++ b/package/eudev/Config.in
@@ -21,6 +21,9 @@  config BR2_PACKAGE_EUDEV
 
 if BR2_PACKAGE_EUDEV
 
+config BR2_PACKAGE_PROVIDES_UDEV
+	default "eudev"
+
 config BR2_PACKAGE_EUDEV_RULES_GEN
 	bool "enable rules generator"
 	help
diff --git a/package/systemd/Config.in b/package/systemd/Config.in
index e3ea433..eacc23c 100644
--- a/package/systemd/Config.in
+++ b/package/systemd/Config.in
@@ -40,6 +40,9 @@  config BR2_PACKAGE_SYSTEMD
 
 if BR2_PACKAGE_SYSTEMD
 
+config BR2_PACKAGE_PROVIDES_UDEV
+	default "systemd"
+
 config BR2_PACKAGE_SYSTEMD_ALL_EXTRAS
 	bool "enable all extras"
 	select BR2_PACKAGE_XZ
diff --git a/package/udev/Config.in b/package/udev/Config.in
index 5cd4051..941a515 100644
--- a/package/udev/Config.in
+++ b/package/udev/Config.in
@@ -1,6 +1,6 @@ 
 config BR2_PACKAGE_HAS_UDEV
 	bool
-	help
-	  udev is now a virtual package.
-	  Packages requiring udevd at run time or libudev/gudev at build time
-	  should select it.
+
+config BR2_PACKAGE_PROVIDES_UDEV
+	depends on BR2_PACKAGE_HAS_UDEV
+	string
diff --git a/package/udev/udev.mk b/package/udev/udev.mk
index a5d0f80..f5eeeb4 100644
--- a/package/udev/udev.mk
+++ b/package/udev/udev.mk
@@ -5,20 +5,12 @@ 
 ################################################################################
 
 UDEV_SOURCE =
+UDEV_DEPENDENCIES = $(call qstrip,$(BR2_PACKAGE_PROVIDES_UDEV))
 
-ifeq ($(BR2_PACKAGE_EUDEV),y)
-UDEV_DEPENDENCIES += eudev
-endif
-
-ifeq ($(BR2_PACKAGE_SYSTEMD),y)
-UDEV_DEPENDENCIES += systemd
-endif
-
+ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
 ifeq ($(UDEV_DEPENDENCIES),)
-define UDEV_CONFIGURE_CMDS
-	echo "No Udev implementation selected. Configuration error."
-	exit 1
-endef
+$(error No Udev implementation selected. Configuration error)
+endif
 endif
 
 $(eval $(generic-package))