Use libgudev as regular dependency

Since eudev 3.1.3 libgudev is not shipped with this package,
so libgudev can be used as regular dependency regardless of
udev implementation selected.

Fixes following build error:
  http://autobuild.buildroot.net/results/320/320c052bda0f1b5afb1e5c83a7fb4dca6227c5a1//
  http://autobuild.buildroot.net/results/3b0/3b096f882030325b9290ad8860bd9cd373a11dc2//

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Tested-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --git a/package/hidapi/Config.in b/package/hidapi/Config.in
index 5d025bfec50b225d8fd8b7911741ca791f74c7c1..c48a096d99ddcb7b42d6c880c270a0930ecbfed4 100644 (file)
--- a/package/hidapi/Config.in
+++ b/package/hidapi/Config.in
@@ -3,12 +3,7 @@ config BR2_PACKAGE_HIDAPI
        depends on BR2_PACKAGE_HAS_UDEV
        depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
        select BR2_PACKAGE_LIBUSB
-       # When eudev is used as the udev provider, libgudev is
-       # automatically provided as it is part of eudev. However, when
-       # systemd is used as the udev provider, libgudev is not
-       # provided, and needs to be built separately. This is why we
-       # select the libgudev package only if systemd is used.
-       select BR2_PACKAGE_LIBGUDEV if BR2_INIT_SYSTEMD
+       select BR2_PACKAGE_LIBGUDEV
        help
          HIDAPI is a multi-platform library which allows an application
          to interface with USB and Bluetooth HID-Class devices on

diff --git a/package/hidapi/hidapi.mk b/package/hidapi/hidapi.mk
index eb5d5c35564fdd75c063bfceff13e96bf3a06c56..b16e4ae5494ed7c9b5156b82e619c35e6a458c78 100644 (file)
--- a/package/hidapi/hidapi.mk
+++ b/package/hidapi/hidapi.mk
@@ -14,10 +14,6 @@ HIDAPI_AUTORECONF = YES
 HIDAPI_LICENSE = GPLv3 or BSD-3c or HIDAPI license
 HIDAPI_LICENSE_FILES = LICENSE.txt LICENSE-gpl3.txt LICENSE-bsd.txt LICENSE-orig.txt
 
-HIDAPI_DEPENDENCIES = libusb
-
-ifeq ($(BR2_PACKAGE_LIBGUDEV),y)
-HIDAPI_DEPENDENCIES += libgudev
-endif
+HIDAPI_DEPENDENCIES = libusb libgudev
 
 $(eval $(autotools-package))

diff --git a/package/libmbim/Config.in b/package/libmbim/Config.in
index e79d51f3a9b52b42796b4439abcb585b225646e8..0ef28db125c52d2d4a68f522db3c2c883d115bfa 100644 (file)
--- a/package/libmbim/Config.in
+++ b/package/libmbim/Config.in
@@ -3,7 +3,7 @@ config BR2_PACKAGE_LIBMBIM
        depends on BR2_USE_WCHAR # libglib2
        depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
        depends on BR2_PACKAGE_HAS_UDEV
-       select BR2_PACKAGE_LIBGUDEV if BR2_INIT_SYSTEMD
+       select BR2_PACKAGE_LIBGUDEV
        select BR2_PACKAGE_LIBGLIB2
        help
          libmbim is a glib-based library for talking to WWAN modems and

diff --git a/package/libmbim/libmbim.mk b/package/libmbim/libmbim.mk
index cb6c9055cceec70c71890b69cf1090d07f6498d0..3cb9235ecfaf2906bb76962849c55fdbec80a2de 100644 (file)
--- a/package/libmbim/libmbim.mk
+++ b/package/libmbim/libmbim.mk
@@ -11,11 +11,7 @@ LIBMBIM_LICENSE = LGPLv2+ (library), GPLv2+ (programs)
 LIBMBIM_LICENSE_FILES = COPYING
 LIBMBIM_INSTALL_STAGING = YES
 
-LIBMBIM_DEPENDENCIES = libglib2 udev
-
-ifeq ($(BR2_PACKAGE_LIBGUDEV),y)
-LIBMBIM_DEPENDENCIES += libgudev
-endif
+LIBMBIM_DEPENDENCIES = libglib2 udev libgudev
 
 # we don't want -Werror
 LIBMBIM_CONF_OPTS = --enable-more-warnings=no

diff --git a/package/modem-manager/Config.in b/package/modem-manager/Config.in
index 1cd502b3ac2e48816ffdfedcde6dc8c5b9c6f565..aa7ed1e2fa23c461edf227762a11bc4c0f0abb72 100644 (file)
--- a/package/modem-manager/Config.in
+++ b/package/modem-manager/Config.in
@@ -6,7 +6,7 @@ config BR2_PACKAGE_MODEM_MANAGER
        depends on BR2_USE_MMU # dbus
        select BR2_PACKAGE_DBUS
        select BR2_PACKAGE_DBUS_GLIB
-       select BR2_PACKAGE_LIBGUDEV if BR2_INIT_SYSTEMD
+       select BR2_PACKAGE_LIBGUDEV
        help
          ModemManager is a DBus-activated daemon which controls mobile
          broadband (2G/3G/4G) devices and connections.

diff --git a/package/modem-manager/modem-manager.mk b/package/modem-manager/modem-manager.mk
index 6d8dc10d905a5374f9d4b2da68ab4f8284676cd3..451752c4fffda21881347888bfed7e360dc8f1c6 100644 (file)
--- a/package/modem-manager/modem-manager.mk
+++ b/package/modem-manager/modem-manager.mk
@@ -9,13 +9,9 @@ MODEM_MANAGER_SOURCE = ModemManager-$(MODEM_MANAGER_VERSION).tar.xz
 MODEM_MANAGER_SITE = http://www.freedesktop.org/software/ModemManager
 MODEM_MANAGER_LICENSE = GPLv2+ (programs, plugins), LGPLv2+ (libmm-glib)
 MODEM_MANAGER_LICENSE_FILES = COPYING
-MODEM_MANAGER_DEPENDENCIES = host-pkgconf udev dbus-glib host-intltool
+MODEM_MANAGER_DEPENDENCIES = host-pkgconf udev dbus-glib host-intltool libgudev
 MODEM_MANAGER_INSTALL_STAGING = YES
 
-ifeq ($(BR2_PACKAGE_LIBGUDEV),y)
-MODEM_MANAGER_DEPENDENCIES += libgudev
-endif
-
 ifeq ($(BR2_PACKAGE_MODEM_MANAGER_LIBQMI),y)
 MODEM_MANAGER_DEPENDENCIES += libqmi
 MODEM_MANAGER_CONF_OPTS += --with-qmi

diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in
index 5a0e636c954ec11fd675eca5239ed38258f5c7d6..8b4607c7ce28635799442eb53f357b046e76f297 100644 (file)
--- a/package/network-manager/Config.in
+++ b/package/network-manager/Config.in
@@ -11,7 +11,7 @@ config BR2_PACKAGE_NETWORK_MANAGER
        select BR2_PACKAGE_GNUTLS
        select BR2_PACKAGE_LIBGCRYPT
        select BR2_PACKAGE_LIBNL
-       select BR2_PACKAGE_LIBGUDEV if BR2_INIT_SYSTEMD
+       select BR2_PACKAGE_LIBGUDEV
        select BR2_PACKAGE_UTIL_LINUX
        select BR2_PACKAGE_UTIL_LINUX_LIBUUID
        select BR2_PACKAGE_WIRELESS_TOOLS

diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk
index f2fe1477b0c79c27c9a0b4a9341fa8f6bddba03c..98879d655b37fd2aff55d6426e05ed49fa6b9c7d 100644 (file)
--- a/package/network-manager/network-manager.mk
+++ b/package/network-manager/network-manager.mk
@@ -10,7 +10,7 @@ NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.xz
 NETWORK_MANAGER_SITE = http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/$(NETWORK_MANAGER_VERSION_MAJOR)
 NETWORK_MANAGER_INSTALL_STAGING = YES
 NETWORK_MANAGER_DEPENDENCIES = host-pkgconf udev dbus-glib libnl gnutls \
-       libgcrypt wireless_tools util-linux host-intltool readline libndp
+       libgcrypt wireless_tools util-linux host-intltool readline libndp libgudev
 NETWORK_MANAGER_LICENSE = GPLv2+ (app), LGPLv2+ (libnm-util)
 NETWORK_MANAGER_LICENSE_FILES = COPYING libnm-util/COPYING
 
@@ -63,10 +63,6 @@ ifeq ($(BR2_PACKAGE_DHCPCD),y)
 NETWORK_MANAGER_CONF_OPTS += --with-dhcpcd=/sbin/dhcpcd
 endif
 
-ifeq ($(BR2_PACKAGE_LIBGUDEV),y)
-NETWORK_MANAGER_DEPENDENCIES += libgudev
-endif
-
 # uClibc by default doesn't have backtrace support, so don't use it
 ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y)
 NETWORK_MANAGER_CONF_OPTS += --disable-crashtrace

diff --git a/package/udisks/Config.in b/package/udisks/Config.in
index c9664afdf8727acfbbb9717a6977a0684101f778..8b8fd2880e8395cc95417b583e4d9f9185fd3a76 100644 (file)
--- a/package/udisks/Config.in
+++ b/package/udisks/Config.in
@@ -12,12 +12,7 @@ config BR2_PACKAGE_UDISKS
        select BR2_PACKAGE_PARTED
        select BR2_PACKAGE_LVM2
        select BR2_PACKAGE_LIBATASMART
-       # When eudev is used as the udev provider, libgudev is automatically
-       # provided as it is part of eudev. However, when systemd is used as
-       # the udev provider, libgudev is not provided, and needs to be built
-       # separately. This is why we select the libgudev package only if
-       # systemd is used.
-       select BR2_PACKAGE_LIBGUDEV if BR2_INIT_SYSTEMD
+       select BR2_PACKAGE_LIBGUDEV
        help
          The udisks project provides
 

diff --git a/package/udisks/udisks.mk b/package/udisks/udisks.mk
index eccfbd25b0a5461ba0188e7a4296ae87392c5bb0..eea79e5659e7441df001d39fe0d56f4a8e128015 100644 (file)
--- a/package/udisks/udisks.mk
+++ b/package/udisks/udisks.mk
@@ -18,14 +18,11 @@ UDISKS_DEPENDENCIES =       \
        polkit          \
        parted          \
        lvm2            \
-       libatasmart
+       libatasmart     \
+       libgudev
 
 UDISKS_CONF_OPTS = --disable-remote-access --disable-man-pages
 
-ifeq ($(BR2_PACKAGE_LIBGUDEV),y)
-UDISKS_DEPENDENCIES += libgudev
-endif
-
 ifeq ($(BR2_PACKAGE_UDISKS_LVM2),y)
 UDISKS_CONF_OPTS += --enable-lvm2
 endif