diff options
| author | eric.le.bihan.dev@free.fr <eric.le.bihan.dev@free.fr> | 2014-02-24 10:25:41 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2014-02-25 21:27:11 +0100 |
| commit | 5e35c1bedd55c044ab68f3b37738686a951eb9ce (patch) | |
| tree | 2eb413155b8218856772d8f77d3e09dcec31a1a4 | |
| parent | 5cc2a89a45ddc34a5dbd863f924dfa12a8274395 (diff) | |
| download | buildroot-5e35c1bedd55c044ab68f3b37738686a951eb9ce.tar.gz buildroot-5e35c1bedd55c044ab68f3b37738686a951eb9ce.zip | |
udev: update udev to new virtual package infra.
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>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
| -rw-r--r-- | package/eudev/Config.in | 3 | ||||
| -rw-r--r-- | package/systemd/Config.in | 3 | ||||
| -rw-r--r-- | package/udev/Config.in | 8 | ||||
| -rw-r--r-- | 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 bfad99a271..40ff721826 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 e3ea433728..eacc23cc6e 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 5cd4051621..941a5152ff 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 a5d0f800ca..f5eeeb494b 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)) |
