libgudev: New package

PATCH Superseded Nathaniel Roach 2 participants 2 messages Jul 12, 2015 – Aug 16, 2015

lore

Share & tools

lore

Nathaniel Roach

author

2015-07-12 07:24 UTC #0 lore raw

PATCH v2 1/1 libgudev: New package

As libgudev recently was split from the main systemd/udev source,
this library is now required to build NetworkManager.

This library is only relevant to systemd, as the code it contains
is still contained in eudev.

Add the package; add it as a dependency to NetworkManager; and
tweak systemd's Config.in message accordingly.

---
Changes v1 -> v2
(Changes as suggested by Peter Korsgaard)
- Added the toolchain dependencies
- Dropped NM references in package
- Added _LICENSE_FILEs
- Conditionally depend on libgudev in NM if using systemd

Signed-off-by Nathaniel Roach <[email protected]>

---
 package/Config.in                          |  1 +
 package/libgudev/Config.in                 | 19 +++++++++++++++++++
 package/libgudev/libgudev.mk               | 17 +++++++++++++++++
 package/network-manager/Config.in          |  1 +
 package/network-manager/network-manager.mk |  4 ++++
 package/systemd/Config.in                  |  1 -
 6 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 package/libgudev/Config.in
 create mode 100644 package/libgudev/libgudev.mk

package/Config.in +1 -0

index 714e2bd..a7264fc 100644
@@ -831,6 +831,7 @@ menu "Hardware handling"
 	source "package/libfreefare/Config.in"
 	source "package/libftdi/Config.in"
 	source "package/libftdi1/Config.in"
+	source "package/libgudev/Config.in"
 	source "package/libhid/Config.in"
 	source "package/libiio/Config.in"
 	source "package/libinput/Config.in"

package/libgudev/Config.in new file +19 -0

new file mode 100644
index 0000000..bb74e9d
@@ -0,0 +1,19 @@
+config BR2_PACKAGE_LIBGUDEV
+	bool "libgudev"
+	depends on BR2_INIT_SYSTEMD
+	depends on BR2_USE_WCHAR # gettext
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_USE_MMU # fork()
+	select BR2_PACKAGE_LIBGLIB2
+	help
+	  This library provides GObject bindings for libudev.
+	  It was originally part of udev-extras, then udev, then systemd.
+	  It's now a project on its own.
+	  Required for building some programs that use udev, when using
+	  systemd.
+
+	  https://wiki.gnome.org/Projects/libgudev
+
+comment "libgudev needs a toolchain w/ wchar, threads, and systemd"
+	depends on BR2_USE_MMU
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INIT_SYSTEMD

package/libgudev/libgudev.mk new file +17 -0

new file mode 100644
index 0000000..fa15b56
@@ -0,0 +1,17 @@
+################################################################################
+#
+# libgudev
+#
+################################################################################
+
+LIBGUDEV_VERSION = 230
+LIBGUDEV_SOURCE = libgudev-$(LIBGUDEV_VERSION).tar.xz
+LIBGUDEV_SITE = http://ftp.gnome.org/pub/GNOME/sources/libgudev/$(LIBGUDEV_VERSION)
+LIBGUDEV_INSTALL_STAGING = YES
+
+LIBGUDEV_DEPENDENCIES = host-pkgconf udev libglib2
+
+LIBGUDEV_LICENSE = GPLv2+
+LIBGUDEV_LICENSE_FILES = COPYING
+
+$(eval $(autotools-package))

package/network-manager/Config.in +1 -0

index bcf8f90..5a0e636 100644
@@ -11,6 +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_UTIL_LINUX
 	select BR2_PACKAGE_UTIL_LINUX_LIBUUID
 	select BR2_PACKAGE_WIRELESS_TOOLS

package/network-manager/network-manager.mk +4 -0

index c118a92..04135c2 100644
@@ -63,6 +63,10 @@ ifeq ($(BR2_PACKAGE_DHCPCD),y)
 NETWORK_MANAGER_CONF_OPTS += --with-dhcpcd=/sbin/dhcpcd
 endif
 
+ifeq ($(BR2_INIT_SYSTEMD),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

package/systemd/Config.in +0 -1

index 38353d0..1c32052 100644
@@ -52,7 +52,6 @@ config BR2_PACKAGE_SYSTEMD
 
 	  The selection of other packages will enable some features:
 
-	  - libglib2 package will add support for gudev.
 	  - acl package will add support for multi-seat.
 
 	  http://freedesktop.org/wiki/Software/systemd

Signature · 1 line

2.1.4

Yann E. MORIN

2015-08-16 15:02 UTC #1 lore raw

PATCH v2 1/1 libgudev: New package

Nathaniel, All,

On 2015-07-12 15:24 +0800, Nathaniel Roach spake thusly:

Quoted 8 lines

As libgudev recently was split from the main systemd/udev source,
this library is now required to build NetworkManager.
This library is only relevant to systemd, as the code it contains
is still contained in eudev.
Add the package; add it as a dependency to NetworkManager; and
tweak systemd's Config.in message accordingly.

Please split this patch in two:
- one to add libgudev alone as a new package,
- one to add NM dependency on libgudev

Also, NM is not the only package that needs gudev; libmbim seems to also need it:
http://autobuild.buildroot.org/results/638/638dbf05b785a276a33983b0237b7cad54777b85/build-end.log

checking for LIBMBIM_GLIB... no
configure: error: Package requirements (glib-2.0 >= 2.32
gobject-2.0
gio-2.0
gio-unix-2.0
gudev-1.0 >= 147) were not met:

Package gudev-1.0 was not found in the pkg-config search path. Perhaps you should add the directory containing `gudev-1.0.pc' to the PKG_CONFIG_PATH environment variable
No package 'gudev-1.0' found

Care to fix as I suggest above, and add a third patch to fix libmbim too, please?

Regards,
Yann E. MORIN.

Quoted 126 lines