Skip to contentSkip to conversation

package/*: test for BR2_PACKAGE_LIBGUDEV for dependency

PATCH New Baruch Siach 2 participants 3 messages Nov 18, 2015

lore
Share & tools
lore

Baruch Siach

author
#0 lore raw

PATCH 1/2 package/*: test for BR2_PACKAGE_LIBGUDEV for dependency

Make the case of adding libgudev as a dependency more consistent with all other dependency packages. The <pkg>_DEPENDENCIES variable sets the build order which is conceptually independent of the underlying reason for that dependency.

Also, remove the comments in hidapi.mk and udisks.mk. These comments explain why BR2_PACKAGE_LIBGUDEV is selected, so the comments in corresponding Config.in files are enough.

Cc Vicente Olivert Riera <[email protected]>
Signed-off-by Baruch Siach <[email protected]>
---
 package/hidapi/hidapi.mk                   | 7 +------
 package/libmbim/libmbim.mk                 | 2 +-
 package/modem-manager/modem-manager.mk     | 2 +-
 package/network-manager/network-manager.mk | 2 +-
 package/udisks/udisks.mk                   | 7 +------
 5 files changed, 5 insertions(+), 15 deletions(-)
package/hidapi/hidapi.mk +1 -6
index 2457554748ba..eb5d5c35564f 100644
@@ -16,12 +16,7 @@ HIDAPI_LICENSE_FILES = LICENSE.txt LICENSE-gpl3.txt LICENSE-bsd.txt LICENSE-orig
 
 HIDAPI_DEPENDENCIES = 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 depend on the libgudev package only if
-# systemd is used.
-ifeq ($(BR2_INIT_SYSTEMD),y)
+ifeq ($(BR2_PACKAGE_LIBGUDEV),y)
 HIDAPI_DEPENDENCIES += libgudev
 endif
package/libmbim/libmbim.mk +1 -1
index cfba08e7e36d..cb6c9055ccee 100644
@@ -13,7 +13,7 @@ LIBMBIM_INSTALL_STAGING = YES
 
 LIBMBIM_DEPENDENCIES = libglib2 udev
 
-ifeq ($(BR2_INIT_SYSTEMD),y)
+ifeq ($(BR2_PACKAGE_LIBGUDEV),y)
 LIBMBIM_DEPENDENCIES += libgudev
 endif
package/modem-manager/modem-manager.mk +1 -1
index f38dee36bcb3..6d8dc10d905a 100644
@@ -12,7 +12,7 @@ MODEM_MANAGER_LICENSE_FILES = COPYING
 MODEM_MANAGER_DEPENDENCIES = host-pkgconf udev dbus-glib host-intltool
 MODEM_MANAGER_INSTALL_STAGING = YES
 
-ifeq ($(BR2_INIT_SYSTEMD),y)
+ifeq ($(BR2_PACKAGE_LIBGUDEV),y)
 MODEM_MANAGER_DEPENDENCIES += libgudev
 endif
package/network-manager/network-manager.mk +1 -1
index 2c19a7de0fbe..f2fe1477b0c7 100644
@@ -63,7 +63,7 @@ ifeq ($(BR2_PACKAGE_DHCPCD),y)
 NETWORK_MANAGER_CONF_OPTS += --with-dhcpcd=/sbin/dhcpcd
 endif
 
-ifeq ($(BR2_INIT_SYSTEMD),y)
+ifeq ($(BR2_PACKAGE_LIBGUDEV),y)
 NETWORK_MANAGER_DEPENDENCIES += libgudev
 endif
package/udisks/udisks.mk +1 -6
index bea94522a6dd..eccfbd25b0a5 100644
@@ -22,12 +22,7 @@ UDISKS_DEPENDENCIES = 	\
 
 UDISKS_CONF_OPTS = --disable-remote-access --disable-man-pages
 
-# 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.
-ifeq ($(BR2_PACKAGE_SYSTEMD),y)
+ifeq ($(BR2_PACKAGE_LIBGUDEV),y)
 UDISKS_DEPENDENCIES += libgudev
 endif
Signature · 1 line
2.6.2
author
#1 lore raw

PATCH 2/2 udisks: make libgudev selection consistent

In all other package the condition for BR2_PACKAGE_LIBGUDEV selection is BR2_INIT_SYSTEMD. Do the same for udisks.

Signed-off-by Baruch Siach <[email protected]>
---
 package/udisks/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/udisks/Config.in +1 -1
index f24df03ab714..c9664afdf872 100644
@@ -17,7 +17,7 @@ config BR2_PACKAGE_UDISKS
 	# 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_PACKAGE_SYSTEMD
+	select BR2_PACKAGE_LIBGUDEV if BR2_INIT_SYSTEMD
 	help
 	  The udisks project provides
Signature · 1 line
2.6.2
#2 lore raw

PATCH 1/2 package/*: test for BR2_PACKAGE_LIBGUDEV for dependency

In reply to Baruch Siach

Dear Baruch Siach,

Quoted 11 lines · Baruch Siach

Make the case of adding libgudev as a dependency more consistent with all other dependency packages. The <pkg>_DEPENDENCIES variable sets the build order which is conceptually independent of the underlying reason for that dependency.

Also, remove the comments in hidapi.mk and udisks.mk. These comments explain why BR2_PACKAGE_LIBGUDEV is selected, so the comments in corresponding Config.in files are enough.

Cc Vicente Olivert Riera <[email protected]>
Signed-off-by Baruch Siach <[email protected]>
Quoted 7 lines
---
 package/hidapi/hidapi.mk                   | 7 +------
 package/libmbim/libmbim.mk                 | 2 +-
 package/modem-manager/modem-manager.mk     | 2 +-
 package/network-manager/network-manager.mk | 2 +-
 package/udisks/udisks.mk                   | 7 +------
 5 files changed, 5 insertions(+), 15 deletions(-)

Both patches applied to next, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com