Skip to contentSkip to conversation

Introduce libudev (branch yem/libudev2)

PATCH Superseded Yann E. MORIN 3 participants 18 messages Sep 1, 2014 – Oct 12, 2014

v5 of 7 Superseded Latest is v7 →

lore
Share & tools
lore

Yann E. MORIN

author
#0 lore raw

v5 cover Introduce libudev (branch yem/libudev2)

Hello All!

This series introduces the possibility to just build and install libudev, without requiring that the /dev management be handled by eudev or systemd.

A lot of packages that have a dependency on udev, in fact only require a libudev, not a udev daemon. That's the case for e.g. libinput, libcec, mesa3d...

The series contains:

- a patch to fix generating the list of virtual packages for the manual

- three patches to introduce the libudev virtual package, and its
providers: eudev and systemd

- a patch to make eudev only build libudev if /dev management is handled by neither eudev nor systemd

- four patches to convert packages to depend on libusb instead of a udev daemon; those packages have been confirmed by Bernd to indeed only need libudev and not a udev daemon

- five RFC patches to convert packages we are not sure whether they would be happy with only a libudev, and which would need run-time testing to check

Not all packages that reference udev have been switched over to depend on libudev, though, since it is unclear to me whether they require a udev daemon, or would be happy with just libudev.

On your keyboards, get set, ready... Comment! :-)

Changes v4 -> v5:
- bump to eudev 1.10 (Bernd)

Changes v3 -> v4:
- do not remove the prompts for eudev and systemd (Thomas P.)
- patch to convert xserver_xorg-server dropped (Bernd)

Changes RFCv2 -> v3:
- some typoes (Samuel)
- misc fixes in gen-manual-lists.py (Samuel)

Changes RFCv1 -> RFCv2:
- have eudev and systemd be providers for libudev, instead of having udev be the provider (Thomas, on IRC)
- fix the manual lists after bugs were uncovered with the removal of the eudev and systemd prompts
- convert some packages

Regards,
Yann E. MORIN.

The following changes since commit fcd720dfcf702d796fbc625b9abc4c06cb848d84:

Update for 2014.08 (2014-09-01 13:20:56 +0200)

are available in the git repository at:

git://ymorin.is-a-geek.org/buildroot yem/libudev2

for you to fetch changes up to 3b319ddea8c364db04b3553fa6433c3d843fe5a0:

[RFC] package/weston: needs libudev, not a udev daemon (2014-09-01 15:31:17 +0200)

----------------------------------------------------------------
Yann E. MORIN (15):
support/gen-manual-lists.py: rework generating the virtual package list package/libudev: new virtual package
package/eudev: is a provider for libudev
package/systemd: is a provider for libudev
package/eudev: bump to 1.10
package/eudev: split udev/libudev
package/mesa3d: depends on libudev, not udev package/libcec: needs libudev, not a udev daemon package/libdrm: can also use only libudev package/xdriver_xf86-input-evdev: needs libudev, not a udev daemon [RFC] package/libatasmart: needs libudev, not a udev daemon [RFC] package/libinput: needs libudev, not a udev daemon [RFC] package/libusb: needs libudev, not a udev daemon [RFC] package/vlc: needs libudev, not a udev daemon
[RFC] package/weston: needs libudev, not a udev daemon

 package/Config.in                                  |  1 +
 package/eudev/Config.in                            | 36 +++++++--
 ...y-use-pragma-for-ignoring-diagnostics-if-.patch |  8 +-
 package/eudev/eudev.mk                             | 55 +++++++++++--
 package/libatasmart/Config.in                      |  4 +-
 package/libcec/libcec.mk                           |  4 +-
 package/libdrm/libdrm.mk                           |  4 +-
 package/libinput/Config.in                         |  6 +-
 package/libinput/libinput.mk                       |  2 +-
 package/libudev/Config.in                          |  6 ++
 package/libudev/libudev.mk                         |  7 ++
 package/libusb/libusb.mk                           |  5 +-
 package/mesa3d/Config.in                           |  6 +-
 package/mesa3d/mesa3d.mk                           |  4 +-
 package/systemd/Config.in                          |  4 +
 package/systemd/systemd.mk                         |  2 +-
 package/vlc/vlc.mk                                 |  4 +-
 package/weston/Config.in                           |  6 +-
 package/weston/weston.mk                           |  2 +-
 package/x11r7/xdriver_xf86-input-evdev/Config.in   |  5 +-
 .../xdriver_xf86-input-evdev.mk                    |  3 +-
 package/xbmc/Config.in                             |  6 +-
 support/scripts/gen-manual-lists.py                | 93 ++++++++++++++++++----
 system/Config.in                                   | 26 ++++--
 24 files changed, 232 insertions(+), 67 deletions(-)
 create mode 100644 package/libudev/Config.in
 create mode 100644 package/libudev/libudev.mk
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
author
#1 lore raw

PATCH v5 1/15 support/gen-manual-lists.py: rework generating the virtual package list

To get the list of providers of a virtual pacakge, we currently scan all the symbols to see if they select the virtual package _HAS symbol.

Then, for all such selecting symbols, we iterate through the select chain, up to the uppermost symbol that has a prompt, to get the actual user-selectable symbol that ultimately will select the virtual package. This handles blind symbols that are options to a package.

So far, this is working relatively OK, except we do not account for a special type of providers: virtual packages. There is nothing that prevents a virtual package to declare itself as a provider for another virtual package.

Additionally, another case that is not handled is actual packages that are actually promptless. So far, we expected symbols with no prompt to be an option to a package, and we would ultimately (via the backward select recursion, above) end up finding a package symbol with a prompt.

But we're soon removing the prompts of eudev and systemd [*], so the previously valid heuristic is no longer valid.

So, we need a brand-new heuristic to build up the list of providers.

Fortunately, instead of _blindly_ looking for selecting symbols, we can actually extract the providing packages from the list of 'default' values of the _PROVIDES_XXX symbol. This gives us the list of packages, but not sub-options.

Then, we can go on hunting for any selecting symbol. Each such symbol that is not a known package gets treated like an option, as was done up until now.

What this additional complexity brings, is that prompt-less packages are automatically found, from the list of 'default' values, and this includes real prompt-less packages, as well as virtual packages. These are what we were missing previously.

[*] because they are not directly user-selectable, see the corresponding following changesets for the rationale.

Signed-off-by "Yann E. MORIN" <[email protected]>
Cc Samuel Martin <[email protected]>
---
 support/scripts/gen-manual-lists.py | 93 +++++++++++++++++++++++++++++++------
 1 file changed, 78 insertions(+), 15 deletions(-)
support/scripts/gen-manual-lists.py +78 -15
index 95c10dc..0f1906d 100644
@@ -384,28 +384,91 @@ class Buildroot:
                     return s
             return None
 
-        def _get_providers(symbol):
-            providers = list()
+        # This functions return a list of all symbols that have a prompt,
+        # and that 'select' the given symbol
+        def _get_selecting_symbols_with_prompt(symbol):
+            syms = list()
             for sym in self.config:
                 if not sym.is_symbol():
                     continue
-                if _symbol_is_legacy(sym):
-                    continue
                 selects = sym.get_selected_symbols()
                 if not selects:
                     continue
+                # Does this symbol selects us?
                 for s in selects:
-                    if s == symbol:
-                        if sym.prompts:
-                            l = self._get_symbol_label(sym,False)
-                            parent_pkg = _get_parent_package(sym)
-                            if parent_pkg is not None:
-                                l = self._get_symbol_label(parent_pkg, False) \
-                                  + " (w/ " + l + ")"
-                            providers.append(l)
-                        else:
-                            providers.extend(_get_providers(sym))
-            return providers
+                    if not s == symbol:
+                        continue
+                    if sym.prompts:
+                        syms.append(sym)
+                    else:
+                        syms.extend(_get_selecting_symbols_with_prompt(sym))
+            return syms
+
+        # This function returns a list of providers for the specified symbol.
+        # 'symbol' must be a _HAS_XXX symbol.
+        # Each element is a string.
+        # Each element is the name of the providing package, with any
+        # sub-option of that package.
+        # E.g.:  "rpi-userland"   "mesa3d (w/ OpenGL ES)"
+        #
+        # We consider the provider packages by looking at all the default "foo"
+        # for the corresponding _PROVIDES_XXX symbol, which gives us all the
+        # packages.
+        # Then we look at all the symbols that 'select' the _HAS_XXX symbol.
+        # If a selecting symbol is also a package symbol, this is a cut.
+        # Otherwise, we iterate the 'selected by' chain until we find a symbol
+        # with a prompt, which we consider the enabling sub-option, or we end
+        # up with the providing-package's symbol.
+        def _get_providers(symbol):
+            providers_syms = list()
+            providers_syms_names = list()
+            providers_syms_w_opts = list()
+
+            # Get all providing packages
+            _provides_pkg = re.sub(r"^(BR2_PACKAGE)_HAS_(.+)$",
+                                   r"\1_PROVIDES_\2",
+                                   symbol.get_name())
+            _provides_sym = self.config.get_symbol(_provides_pkg)
+            for (pn, _) in _provides_sym.def_exprs:
+                ps = self.config._expr_val_str(pn, get_val_instead_of_eval=True)
+                ps = re.sub(r"-", r"_", ps.strip('"'))
+                ps = self.config.get_symbol("BR2_PACKAGE_" + ps.upper())
+                providers_syms.append(ps)
+                providers_syms_names.append( (ps, pn) )
+
+            # Now, try to get sub-options
+            # Iterate across all symbols, to see if any selects us
+            for sym in _get_selecting_symbols_with_prompt(symbol):
+                if _symbol_is_legacy(sym):
+                    continue
+                if sym in providers_syms:
+                    # The symbol is a package that provides us, and we already
+                    # know of it
+                    continue
+                # The symbol is unknown, we suppose it is an option, so find
+                # the package it comes from
+                parent_pkg = _get_parent_package(sym)
+                if parent_pkg is not None:
+                    providers_syms_w_opts.append( (parent_pkg, sym) )
+
+            # Now, build a list of providers with option
+            seen = list()
+            providers_str = list()
+            for (p, o) in providers_syms_w_opts:
+                if not p in seen:
+                    seen.append(p)
+                l = self._get_symbol_label(p, False) + " (w/ " \
+                  + self._get_symbol_label(o, False) + ")"
+                providers_str.append(l)
+
+            # Finally, complete with the list of providers without option
+            for (ps, pn) in providers_syms_names:
+                if ps in seen:
+                    continue
+                if not pn in providers_str:
+                    providers_str.append(pn)
+
+            return providers_str
 
         if what == "layout":
             return ( "100%", "^1,4,4" )
Signature · 1 line
1.9.1
author
#2 lore raw

PATCH v5 2/15 package/libudev: new virtual package

In reply to Yann E. MORIN

Not all packages that currently depend on udev really need an udev daemon; most may only require a libudev.so to be available. For example, libcec, mesa3d...

Currently, we conflate udev and libudev into a single virtual package.

Introduce a new virtual package 'libudev' that packages can select if they provide libudev.so (obviously, systemd and eudev are such packages) and which packages can depend on if they just need libudev.so and not an udev daemon.

Note: only the virtual package is added for now, providers and users will be converted in followup patches.

Signed-off-by "Yann E. MORIN" <[email protected]>
Cc Bernd Kuhls <[email protected]>
Reviewed-by Bernd Kuhls <[email protected]>
---
 package/Config.in          | 1 +
 package/libudev/Config.in  | 6 ++++++
 package/libudev/libudev.mk | 7 +++++++
 3 files changed, 14 insertions(+)
 create mode 100644 package/libudev/Config.in
 create mode 100644 package/libudev/libudev.mk
package/Config.in +1 -0
index 4520ba6..7734a4e 100644
@@ -674,6 +674,7 @@ menu "Hardware handling"
 	source "package/librtlsdr/Config.in"
 	source "package/libserial/Config.in"
 	source "package/libsoc/Config.in"
+	source "package/libudev/Config.in"
 	source "package/libusb/Config.in"
 	source "package/libusb-compat/Config.in"
 	source "package/libv4l/Config.in"
package/libudev/Config.in new file +6 -0
new file mode 100644
index 0000000..2745fcc
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_HAS_LIBUDEV
+	bool
+
+config BR2_PACKAGE_PROVIDES_LIBUDEV
+	depends on BR2_PACKAGE_HAS_LIBUDEV
+	string
package/libudev/libudev.mk new file +7 -0
new file mode 100644
index 0000000..af1b3dd
@@ -0,0 +1,7 @@
+################################################################################
+#
+# libudev
+#
+################################################################################
+
+$(eval $(virtual-package))
Signature · 1 line
1.9.1
author
#3 lore raw

PATCH v5 3/15 package/eudev: is a provider for libudev

In reply to Yann E. MORIN
Signed-off-by "Yann E. MORIN" <[email protected]>
Cc Bernd Kuhls <[email protected]>
Reviewed-by Bernd Kuhls <[email protected]>
[ Compiled for x86 target with glibc 2.18 and Kernel headers 3.15.x ]
Tested-by Cedric Chedaleux <[email protected]>
---
 package/eudev/Config.in | 4 ++++
 package/eudev/eudev.mk  | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)
package/eudev/Config.in +4 -0
index 6101d6d..fa28a9f 100644
@@ -6,6 +6,7 @@ config BR2_PACKAGE_EUDEV
 	depends on BR2_LARGEFILE # util-linux
 	depends on BR2_USE_WCHAR # util-linux
 	depends on !BR2_PREFER_STATIC_LIB # kmod
+	select BR2_PACKAGE_HAS_LIBUDEV
 	select BR2_PACKAGE_HAS_UDEV
 	select BR2_PACKAGE_UTIL_LINUX
 	select BR2_PACKAGE_UTIL_LINUX_LIBBLKID

@@ -21,6 +22,9 @@ config BR2_PACKAGE_EUDEV
 
 if BR2_PACKAGE_EUDEV
 
+config BR2_PACKAGE_PROVIDES_LIBUDEV
+	default "eudev"
+
 config BR2_PACKAGE_PROVIDES_UDEV
 	default "eudev"
package/eudev/eudev.mk +1 -1
index c6d020f..1cb6b26 100644
@@ -25,7 +25,7 @@ EUDEV_CONF_OPT =		\
 	--enable-libkmod
 
 EUDEV_DEPENDENCIES = host-gperf host-pkgconf util-linux kmod
-EUDEV_PROVIDES = udev
+EUDEV_PROVIDES = libudev udev
 
 ifeq ($(BR2_PACKAGE_EUDEV_RULES_GEN),y)
 EUDEV_CONF_OPT += --enable-rule_generator
Signature · 1 line
1.9.1
author
#4 lore raw

PATCH v5 4/15 package/systemd: is a provider for libudev

In reply to Yann E. MORIN
Signed-off-by "Yann E. MORIN" <[email protected]>
Cc Bernd Kuhls <[email protected]>
---
 package/systemd/Config.in  | 4 ++++
 package/systemd/systemd.mk | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)
package/systemd/Config.in +4 -0
index 58f76a5..c7df2b8 100644
@@ -16,6 +16,7 @@ config BR2_PACKAGE_SYSTEMD
 	depends on !BR2_PREFER_STATIC_LIB # kmod
 	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus
 	depends on BR2_USE_MMU # dbus
+	select BR2_PACKAGE_HAS_LIBUDEV
 	select BR2_PACKAGE_HAS_UDEV
 	select BR2_PACKAGE_DBUS # runtime dependency only
 	select BR2_PACKAGE_LIBCAP

@@ -60,6 +61,9 @@ config BR2_PACKAGE_SYSTEMD
 
 if BR2_PACKAGE_SYSTEMD
 
+config BR2_PACKAGE_PROVIDES_LIBUDEV
+	default "systemd"
+
 config BR2_PACKAGE_PROVIDES_UDEV
 	default "systemd"
package/systemd/systemd.mk +1 -1
index edde998..cec4398 100644
@@ -17,7 +17,7 @@ SYSTEMD_DEPENDENCIES = \
 	kmod \
 	host-gperf
 
-SYSTEMD_PROVIDES = udev
+SYSTEMD_PROVIDES = libudev udev
 SYSTEMD_AUTORECONF = YES
 
 # Make sure that systemd will always be built after busybox so that we have
Signature · 1 line
1.9.1
author
#5 lore raw

PATCH v5 5/15 package/eudev: bump to 1.10

In reply to Yann E. MORIN

Now requires Linux kernel headers >= 3.9.

Signed-off-by "Yann E. MORIN" <[email protected]>
Cc Bernd Kuhls <[email protected]>
---
 package/eudev/Config.in | 8 ++++++--
 package/eudev/eudev.mk  | 2 +-
 system/Config.in        | 6 ++++--
 3 files changed, 11 insertions(+), 5 deletions(-)
package/eudev/Config.in +6 -2
index fa28a9f..7aaa540 100644
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_EUDEV
 	bool "eudev"
+	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_9
 	depends on !BR2_avr32 # no epoll_create1
 	depends on BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV
 	depends on BR2_USE_MMU # uses fork()

@@ -40,7 +41,10 @@ comment "eudev needs eudev /dev management"
 	depends on BR2_USE_MMU
 	depends on !BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV
 
-comment "eudev needs a toolchain w/ largefile, wchar, dynamic library"
+endif # BR2_PACKAGE_EUDEV
+
+comment "eudev needs a toolchain w/ largefile, wchar, dynamic library, headers >= 3.9"
 	depends on !BR2_avr32
 	depends on BR2_USE_MMU
-	depends on !BR2_LARGEFILE || !BR2_USE_WCHAR || BR2_PREFER_STATIC_LIB
+	depends on !BR2_LARGEFILE || !BR2_USE_WCHAR || BR2_PREFER_STATIC_LIB \
+		|| !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_9
package/eudev/eudev.mk +1 -1
index 1cb6b26..811d72b 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-EUDEV_VERSION = 1.9
+EUDEV_VERSION = 1.10
 EUDEV_SOURCE = eudev-$(EUDEV_VERSION).tar.gz
 EUDEV_SITE = http://dev.gentoo.org/~blueness/eudev
 EUDEV_LICENSE = GPLv2+ (programs), LGPLv2.1+ (libraries)
system/Config.in +4 -2
index e7e146a..d5389d0 100644
@@ -124,6 +124,7 @@ config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV
 
 config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV
 	bool "Dynamic using eudev"
+	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_9 # eudev
 	depends on !BR2_avr32 # eudev
 	depends on BR2_LARGEFILE
 	depends on BR2_USE_WCHAR

@@ -131,10 +132,11 @@ config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV
 	depends on BR2_USE_MMU # eudev
 	select BR2_PACKAGE_EUDEV
 
-comment "eudev needs a toolchain w/ largefile, wchar, dynamic library"
+comment "eudev needs a toolchain w/ largefile, wchar, dynamic library, headers >= 3.9"
 	depends on !BR2_avr32 # eudev
 	depends on BR2_USE_MMU
-	depends on !BR2_LARGEFILE || !BR2_USE_WCHAR || BR2_PREFER_STATIC_LIB
+	depends on !BR2_LARGEFILE || !BR2_USE_WCHAR || BR2_PREFER_STATIC_LIB \
+		|| !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_9
 
 endchoice
Signature · 1 line
1.9.1
#6 lore raw

PATCH v5 5/15 package/eudev: bump to 1.10

Quoted 16 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Yann" == Yann E MORIN <[email protected]> writes:

Now requires Linux kernel headers >= 3.9.

Signed-off-by "Yann E. MORIN" <[email protected]>
Cc Bernd Kuhls <[email protected]>
---
 package/eudev/Config.in | 8 ++++++--
 package/eudev/eudev.mk  | 2 +-
 system/Config.in        | 6 ++++--
 3 files changed, 11 insertions(+), 5 deletions(-)
package/eudev/Config.in +0 -0
index fa28a9f..7aaa540 100644

package/eudev/Config.in line 3

Quoted 3 lines
package/eudev/Config.in +1 -0
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_EUDEV
 	bool "eudev"
+	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_9

When respinning this series, please also adjust the eudev help text as it currently says 2.6.34:

eudev requires a Linux kernel >= 2.6.34: it relies on devtmpfs and inotify.

Signature · 1 line
Bye, Peter Korsgaard
author
#7 lore raw

PATCH v5 6/15 package/eudev: split udev/libudev

In reply to Yann E. MORIN

Quite a few packages are happy with just libudev, and not a full udev daemon running.

Split the eudev package so that we can install just libudev if /dev management is not handled by eudev.

When only the library is installed, behave as a provider for the libudev virtual package. If /dev management is handled by eudev, then also be a provider for the udev virtual package.

Adjust comments of dependencies accordingly.

Note:
Most of the .mk splitting of the dependencies and the build/install rules are from Bernd. Thanks! :-)

Signed-off-by Bernd Kuhls <[email protected]>
Signed-off-by "Yann E. MORIN" <[email protected]>
Cc Thomas Petazzoni <[email protected]>
[ Compiled for x86 target with glibc 2.18 and Kernel headers 3.15.x ]
Tested-by Cedric Chedaleux <[email protected]>

---
Changes v4 -> v5:
- building libudev requires two steps (Bernd)

Changes RFCv2-> v3:
- typo s/system/systemd/

Changes RFCv1 -> RFCv2:
- be a provider for libudev always, since udev is not such a provider any more (Thomas)

---
 package/eudev/Config.in                            | 32 ++++++++++---
 ...y-use-pragma-for-ignoring-diagnostics-if-.patch |  8 ++--
 package/eudev/eudev.mk                             | 53 ++++++++++++++++++++--
 system/Config.in                                   | 20 ++++++--
 4 files changed, 94 insertions(+), 19 deletions(-)
package/eudev/Config.in +25 -7
index 7aaa540..f6fa5ba 100644
@@ -1,13 +1,33 @@
 config BR2_PACKAGE_EUDEV
 	bool "eudev"
 	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_9
+	depends on !BR2_avr32 # no __NR_name_to_handle_at
+	depends on BR2_USE_WCHAR
+	depends on !BR2_PREFER_STATIC_LIB
+	depends on !BR2_PACKAGE_SYSTEMD
+	select BR2_PACKAGE_HAS_LIBUDEV
+	help
+	  eudev is a fork of systemd-udev with the goal of obtaining better
+	  compatibility with existing software.
+
+	  This installs only the libudev library.
+
+	  http://www.gentoo.org/proj/en/eudev/
+
+if BR2_PACKAGE_EUDEV
+
+config BR2_PACKAGE_PROVIDES_LIBUDEV
+	default "eudev"
+
+config BR2_PACKAGE_EUDEV_DAEMON
+	bool "udev daemon"
+	depends on BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV
 	depends on !BR2_avr32 # no epoll_create1
 	depends on BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV
 	depends on BR2_USE_MMU # uses fork()
 	depends on BR2_LARGEFILE # util-linux
 	depends on BR2_USE_WCHAR # util-linux
 	depends on !BR2_PREFER_STATIC_LIB # kmod
-	select BR2_PACKAGE_HAS_LIBUDEV
 	select BR2_PACKAGE_HAS_UDEV
 	select BR2_PACKAGE_UTIL_LINUX
 	select BR2_PACKAGE_UTIL_LINUX_LIBBLKID

@@ -21,10 +41,7 @@ config BR2_PACKAGE_EUDEV
 
 	  http://dev.gentoo.org/~blueness/eudev
 
-if BR2_PACKAGE_EUDEV
-
-config BR2_PACKAGE_PROVIDES_LIBUDEV
-	default "eudev"
+if BR2_PACKAGE_EUDEV_DAEMON
 
 config BR2_PACKAGE_PROVIDES_UDEV
 	default "eudev"

@@ -34,9 +51,9 @@ config BR2_PACKAGE_EUDEV_RULES_GEN
 	help
 	  Enable persistent rules generator
 
-endif
+endif # BR2_PACKAGE_EUDEV_DAEMON
 
-comment "eudev needs eudev /dev management"
+comment "udev daemon needs eudev /dev management"
 	depends on !BR2_avr32
 	depends on BR2_USE_MMU
 	depends on !BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV

@@ -48,3 +65,4 @@ comment "eudev needs a toolchain w/ largefile, wchar, dynamic library, headers >
 	depends on BR2_USE_MMU
 	depends on !BR2_LARGEFILE || !BR2_USE_WCHAR || BR2_PREFER_STATIC_LIB \
 		|| !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_9
+	depends on !BR2_PACKAGE_SYSTEMD
package/eudev/eudev-0003-libudev-Only-use-pragma-for-ignoring-diagnostics-if-.patch +5 -3
index 8b70fbf..38dba9b 100644
@@ -6,14 +6,16 @@ Subject: [PATCH] libudev: Only use #pragma for ignoring diagnostics if GCC
 
 
 Signed-off-by: Eric Le Bihan <[email protected]>
+[yann.morin.1998 at free.fr: adapt to 1.10]
+Signed-off-by: "Yann E. MORIN" <[email protected]>
 ---
  src/libudev/macro.h |    5 +++++
  1 file changed, 5 insertions(+)
 
-diff --git a/src/libudev/macro.h b/src/libudev/macro.h
+diff --git a/src/shared/macro.h b/src/shared/macro.h
 index ac2a23f..fb55983 100644
---- a/src/libudev/macro.h
-+++ b/src/libudev/macro.h
+--- a/src/shared/macro.h
++++ b/src/shared/macro.h
 @@ -40,12 +40,17 @@
  #define _cleanup_(x) __attribute__((cleanup(x)))
package/eudev/eudev.mk +48 -5

71 lines not on this page · raw message

system/Config.in +16 -4
index d5389d0..b5f5a65 100644
@@ -126,11 +126,23 @@ config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV
 	bool "Dynamic using eudev"
 	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_9 # eudev
 	depends on !BR2_avr32 # eudev
-	depends on BR2_LARGEFILE
-	depends on BR2_USE_WCHAR
-	depends on !BR2_PREFER_STATIC_LIB
-	depends on BR2_USE_MMU # eudev
+	depends on BR2_USE_MMU # eudev (fork)
+	depends on BR2_LARGEFILE # eudev-daemon (util-linux)
+	depends on BR2_USE_WCHAR # eudev (util-linux)
+	depends on !BR2_PREFER_STATIC_LIB # eudev
 	select BR2_PACKAGE_EUDEV
+	select BR2_PACKAGE_EUDEV_DAEMON
+	help
+	  Userspace device daemon. This is a standalone version,
+	  independent of systemd. It is a fork maintained by Gentoo.
+
+	  eudev requires a Linux kernel >= 2.6.34: it relies on devtmpfs
+	  and inotify.
+
+	  You can further configure eudev in:
+	    Target packages --> Libraries --> Hardware handling --> eudev
+
+	  http://dev.gentoo.org/~blueness/eudev
 
 comment "eudev needs a toolchain w/ largefile, wchar, dynamic library, headers >= 3.9"
 	depends on !BR2_avr32 # eudev
Signature · 1 line
1.9.1
author
#8 lore raw

PATCH v5 7/15 package/mesa3d: depends on libudev, not udev

In reply to Yann E. MORIN
Signed-off-by "Yann E. MORIN" <[email protected]>
Cc Bernd Kuhls <[email protected]>
Tested-by Bernd Kuhls <[email protected]>
---
 package/mesa3d/Config.in | 6 +++---
 package/mesa3d/mesa3d.mk | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)
package/mesa3d/Config.in +3 -3
index 57d3c1f..6711025 100644
@@ -9,7 +9,7 @@ menuconfig BR2_PACKAGE_MESA3D
 	select BR2_PACKAGE_XLIB_LIBXDAMAGE if BR2_PACKAGE_XORG7
 	select BR2_PACKAGE_XLIB_LIBXFIXES if BR2_PACKAGE_XORG7
 	select BR2_PACKAGE_LIBXCB if BR2_PACKAGE_XORG7
-	depends on BR2_PACKAGE_HAS_UDEV
+	depends on BR2_PACKAGE_HAS_LIBUDEV
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_LARGEFILE
 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL

@@ -125,6 +125,6 @@ config BR2_PACKAGE_PROVIDES_LIBGLES
 
 endif # BR2_PACKAGE_MESA3D
 
-comment "mesa3d needs udev /dev management and a toolchain w/ C++, largefile, NPTL"
+comment "mesa3d needs a toolchain w/ C++, largefile, NPTL"
 	depends on !BR2_LARGEFILE || !BR2_INSTALL_LIBSTDCPP || \
-		!BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_PACKAGE_HAS_UDEV
+		!BR2_TOOLCHAIN_HAS_THREADS_NPTL
package/mesa3d/mesa3d.mk +2 -2
index 6b99757..2bda2ac 100644
@@ -98,8 +98,8 @@ MESA3D_CONF_OPT += --enable-opengl
 
 ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL),y)
 MESA3D_PROVIDES += libegl
-# egl depends on gbm, gbm depends on udev
-MESA3D_DEPENDENCIES += udev
+# egl depends on gbm, gbm depends on libudev
+MESA3D_DEPENDENCIES += libudev
 MESA3D_EGL_PLATFORMS = drm
 ifeq ($(BR2_PACKAGE_WAYLAND),y)
 MESA3D_DEPENDENCIES += wayland
Signature · 1 line
1.9.1
author
#9 lore raw

PATCH v5 8/15 package/libcec: needs libudev, not a udev daemon

In reply to Yann E. MORIN

libcec is happy enough with just a libudev, which it uses to enumerate CEC devices, and does not require a udev daemon.

Propagate the new dependency to XBMC.

Signed-off-by "Yann E. MORIN" <[email protected]>
Cc Maxime Hadjinlian <[email protected]>
Cc Bernd Kuhls <[email protected]>
Acked-by Bernd Kuhls <[email protected]>
---
 package/libcec/libcec.mk | 4 ++--
 package/xbmc/Config.in   | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
package/libcec/libcec.mk +2 -2
index ad919fc..49e4dbd 100644
@@ -18,8 +18,8 @@ ifeq ($(BR2_PACKAGE_LOCKDEV),y)
 LIBCEC_DEPENDENCIES += lockdev
 endif
 
-ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
-LIBCEC_DEPENDENCIES += udev
+ifeq ($(BR2_PACKAGE_HAS_LIBUDEV),y)
+LIBCEC_DEPENDENCIES += libudev
 endif
 
 ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
package/xbmc/Config.in +3 -3
index ebe0882..85dfcee 100644
@@ -141,14 +141,14 @@ comment "goom needs an OpenGL backend"
 config BR2_PACKAGE_XBMC_LIBCEC
 	bool "hdmi cec"
 	depends on !BR2_PREFER_STATIC_LIB # libcec
-	depends on BR2_PACKAGE_HAS_UDEV
+	depends on BR2_PACKAGE_HAS_LIBUDEV # libcec
 	select BR2_PACKAGE_LIBCEC
 	help
 	  Enable CEC (Consumer Electronics Control) support.
 	  Select this if you want XBMC to support HDMI CEC.
 
-comment "hdmi cec support needs udev /dev management and a toolchain w/ dynamic library"
-	depends on BR2_PREFER_STATIC_LIB || !BR2_PACKAGE_HAS_UDEV
+comment "hdmi cec support needs a toolchain w/ dynamic library"
+	depends on BR2_PREFER_STATIC_LIB
 
 config BR2_PACKAGE_XBMC_LIBMICROHTTPD
 	bool "web server"
Signature · 1 line
1.9.1
author
#10 lore raw

PATCH v5 9/15 package/libdrm: can also use only libudev

In reply to Yann E. MORIN

Even if a udev daemon is missing, libdrm can still use just libudev to enumerate devices.

In case both udev and libudev are enabled, depending on just udev would be enough to also get libudev (since any udev provider is also a libudev provider). But it is more logical to have separate conditions for udev and libudev.

Signed-off-by "Yann E. MORIN" <[email protected]>
---
 package/libdrm/libdrm.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
package/libdrm/libdrm.mk +2 -2
index cb9d3a9..7fd01e5 100644
@@ -62,9 +62,9 @@ else
 LIBDRM_CONF_OPT += --disable-freedreno-experimental-api
 endif
 
-ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
+ifeq ($(BR2_PACKAGE_HAS_LIBUDEV),y)
 LIBDRM_CONF_OPT += --enable-udev
-LIBDRM_DEPENDENCIES += udev
+LIBDRM_DEPENDENCIES += libudev
 else
 LIBDRM_CONF_OPT += --disable-udev
 endif
Signature · 1 line
1.9.1
author
#11 lore raw

PATCH v5 10/15 package/xdriver_xf86-input-evdev: needs libudev, not a udev daemon

In reply to Yann E. MORIN

Do as the comment says: it's only libudev that is required.

Signed-off-by "Yann E. MORIN" <[email protected]>
Cc Eric Le Bihan <[email protected]>
---
 package/x11r7/xdriver_xf86-input-evdev/Config.in                   | 5 +----
 package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk | 3 ++-
 2 files changed, 3 insertions(+), 5 deletions(-)
package/x11r7/xdriver_xf86-input-evdev/Config.in +1 -4
index 6ec14bf..92f0324 100644
@@ -1,11 +1,8 @@
 config BR2_PACKAGE_XDRIVER_XF86_INPUT_EVDEV
 	bool "xf86-input-evdev"
-	depends on BR2_PACKAGE_HAS_UDEV # libudev is configure dependency
+	depends on BR2_PACKAGE_HAS_LIBUDEV
 	select BR2_PACKAGE_XPROTO_INPUTPROTO
 	select BR2_PACKAGE_XPROTO_RANDRPROTO
 	select BR2_PACKAGE_XPROTO_XPROTO
 	help
 	  Generic Linux input driver
-
-comment "xf86-input-evdev requires udev to be enabled"
-	depends on !BR2_PACKAGE_HAS_UDEV
package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk +2 -1
index 46e62c7..f2d5aad 100644
@@ -9,6 +9,7 @@ XDRIVER_XF86_INPUT_EVDEV_SOURCE = xf86-input-evdev-$(XDRIVER_XF86_INPUT_EVDEV_VE
 XDRIVER_XF86_INPUT_EVDEV_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_EVDEV_LICENSE = MIT
 XDRIVER_XF86_INPUT_EVDEV_LICENSE_FILES = COPYING
-XDRIVER_XF86_INPUT_EVDEV_DEPENDENCIES = xproto_inputproto xserver_xorg-server xproto_randrproto xproto_xproto udev
+XDRIVER_XF86_INPUT_EVDEV_DEPENDENCIES = xproto_inputproto xserver_xorg-server \
+					xproto_randrproto xproto_xproto libudev
 
 $(eval $(autotools-package))
Signature · 1 line
1.9.1
author
#12 lore raw

RFC PATCH v5 11/15 package/libatasmart: needs libudev, not a udev daemon

In reply to Yann E. MORIN

Do as the comment says: it's only libudev that is required.

Signed-off-by "Yann E. MORIN" <[email protected]>
Cc Eric Le Bihan <[email protected]>
---
 package/libatasmart/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
package/libatasmart/Config.in +2 -2
index 9db3b09..dcfb8c8 100644
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_LIBATASMART
 	bool "libatasmart"
-	depends on BR2_PACKAGE_HAS_UDEV # libudev is configure dependency
+	depends on BR2_PACKAGE_HAS_LIBUDEV
 	help
 	  The libatasmart package is a disk reporting library.
 	  It only supports a subset of the ATA S.M.A.R.T. functionality.

@@ -8,4 +8,4 @@ config BR2_PACKAGE_LIBATASMART
 	  http://0pointer.de/blog/projects/being-smart.html
 
 comment "libatasmart requires udev to be enabled"
-	depends on !BR2_PACKAGE_HAS_UDEV
+	depends on !BR2_PACKAGE_HAS_LIBUDEV
Signature · 1 line
1.9.1
author
#13 lore raw

RFC PATCH v5 12/15 package/libinput: needs libudev, not a udev daemon

In reply to Yann E. MORIN

libinput is happy enough with just a libudev, and does not require a udev daemon.

Signed-off-by "Yann E. MORIN" <[email protected]>
---
 package/libinput/Config.in   | 6 +++---
 package/libinput/libinput.mk | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
package/libinput/Config.in +3 -3
index 14e4e70..a958e37 100644
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_LIBINPUT
 	bool "libinput"
-	depends on BR2_PACKAGE_HAS_UDEV
+	depends on BR2_PACKAGE_HAS_LIBUDEV
 	select BR2_PACKAGE_LIBEVDEV
 	select BR2_PACKAGE_MTDEV
 	help

@@ -13,5 +13,5 @@ config BR2_PACKAGE_LIBINPUT
 
 	  http://freedesktop.org/wiki/Software/libinput/
 
-comment "libinput needs udev /dev management"
-	depends on !BR2_PACKAGE_HAS_UDEV
+comment "libinput needs a libudev provider to be selected"
+	depends on !BR2_PACKAGE_HAS_LIBUDEV
package/libinput/libinput.mk +1 -1
index b52101a..3f225cc 100644
@@ -10,7 +10,7 @@ LIBINPUT_SITE = http://www.freedesktop.org/software/libinput
 LIBINPUT_LICENSE = MIT
 LIBINPUT_LICENSE_FILES = COPYING
 
-LIBINPUT_DEPENDENCIES = host-pkgconf libevdev mtdev udev
+LIBINPUT_DEPENDENCIES = host-pkgconf libevdev mtdev libudev
 LIBINPUT_INSTALL_STAGING = YES
 
 # Tests need fork, so just disable them everywhere.
Signature · 1 line
1.9.1
author
#14 lore raw

RFC PATCH v5 13/15 package/libusb: needs libudev, not a udev daemon

In reply to Yann E. MORIN

libusb is happy enough with just a libudev, and does not require a udev daemon.

Signed-off-by "Yann E. MORIN" <[email protected]>
---
 package/libusb/libusb.mk | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
package/libusb/libusb.mk +3 -2
index 7e0f877..8a07cd8 100644
@@ -21,8 +21,9 @@ ifeq ($(BR2_avr32),y)
 LIBUSB_CONF_OPT += --disable-timerfd
 endif
 
-ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
-LIBUSB_DEPENDENCIES += udev
+ifeq ($(BR2_PACKAGE_HAS_LIBUDEV),y)
+LIBUSB_CONF_OPT += --enable-udev
+LIBUSB_DEPENDENCIES += libudev
 else
 LIBUSB_CONF_OPT += --disable-udev
 endif
Signature · 1 line
1.9.1
author
#15 lore raw

RFC PATCH v5 14/15 package/vlc: needs libudev, not a udev daemon

In reply to Yann E. MORIN

vlc is happy enough with just a libudev, and does
not require a udev daemon.

Signed-off-by "Yann E. MORIN" <[email protected]>
---
 package/vlc/vlc.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
package/vlc/vlc.mk +2 -2
index ad9f485..3d3627a 100644
@@ -284,9 +284,9 @@ else
 VLC_CONF_OPT += --disable-tremor
 endif
 
-ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
+ifeq ($(BR2_PACKAGE_HAS_LIBUDEV),y)
 VLC_CONF_OPT += --enable-udev
-VLC_DEPENDENCIES += udev
+VLC_DEPENDENCIES += libudev
 else
 VLC_CONF_OPT += --disable-udev
 endif
Signature · 1 line
1.9.1
author
#16 lore raw

RFC PATCH v5 15/15 package/weston: needs libudev, not a udev daemon

In reply to Yann E. MORIN

weston is happy enough with just a libudev, and does not require a udev daemon.

Signed-off-by "Yann E. MORIN" <[email protected]>
---
 package/weston/Config.in | 6 +++---
 package/weston/weston.mk | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
package/weston/Config.in +3 -3
index dc7e235..408f6af 100644
@@ -1,7 +1,7 @@
-comment "weston needs udev and a toolchain w/ threads, headers >= 3.0"
+comment "weston needs a toolchain w/ threads, headers >= 3.0"
 	depends on !BR2_avr32
 	depends on BR2_ARCH_HAS_ATOMICS
-	depends on !BR2_PACKAGE_HAS_UDEV || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0
+	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0
 
 config BR2_PACKAGE_WESTON
 	bool "weston"

@@ -12,7 +12,7 @@ config BR2_PACKAGE_WESTON
 	select BR2_PACKAGE_LIBPNG
 	select BR2_PACKAGE_JPEG
 	select BR2_PACKAGE_MTDEV
-	depends on BR2_PACKAGE_HAS_UDEV
+	depends on BR2_PACKAGE_HAS_LIBUDEV
 	depends on !BR2_avr32 # wayland
 	depends on BR2_TOOLCHAIN_HAS_THREADS # wayland
 	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0
package/weston/weston.mk +1 -1
index 7bb35b9..ac6c0c5 100644
@@ -11,7 +11,7 @@ WESTON_LICENSE = MIT
 WESTON_LICENSE_FILES = COPYING
 
 WESTON_DEPENDENCIES = host-pkgconf wayland libxkbcommon pixman libpng \
-	jpeg mtdev udev cairo
+	jpeg mtdev libudev cairo
 
 WESTON_CONF_OPT = \
 	--with-dtddir=$(STAGING_DIR)/usr/share/wayland \
Signature · 1 line
1.9.1
#17 lore raw

v5 cover Introduce libudev (branch yem/libudev2)

In reply to Yann E. MORIN

[posted and mailed]

"Yann E. MORIN" <[email protected]> wrote in news:cover.1409578332.git.yann.morin.1998 at free.fr:

Quoted 2 lines

This series introduces the possibility to just build and install libudev, without requiring that the /dev management be handled by eudev or systemd.

Hi,

I posted a small patch series which I would like to see being added to your patch series. Using both series I could successfully compile xbmc so:

Tested-by Bernd Kuhls <[email protected]>

Regards, Bernd