gitolite/buildrootschalter
gitolite/buildrootschalter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

udev: convert to virtual package

Browse Source 
This patch converts udev to a virtual package. For the moment, there is only
one provider for the udev features: eudev.

Packages meant to provide udev-like features must select the symbol
BR2_PACKAGE_HAS_UDEV.

Packages depending on BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV or
BR2_PACKAGE_UDEV have been converted to use the new symbol.

[Peter: move legacy symbols under 2014.05]
Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
eric.le.bihan.dev@free.fr 2014-02-07 14:21:33 +01:00 committed by Peter Korsgaard
parent 937a95449e
commit fabcb119b9
28 changed files with 115 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
Config.in.legacy
View File

@ -98,6 +98,64 @@ comment "build, or run, in unpredictable ways. "
comment "----------------------------------------------------" comment "----------------------------------------------------"
endif endif
###############################################################################
comment "Legacy options removed in 2014.05"
config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV
bool "/dev management by udev removed"
select BR2_LEGACY
help
The 'udev' package has been converted to a virtual package.
There is currently one provider for this feature: 'eudev'.
Therefore, you must choose 'Dynamic using eudev' in the
'/dev management' menu to get the same behaviour as in your
old configuration.
You must also check the packages depending on 'udev' are still
selected.
config BR2_PACKAGE_UDEV
bool "udev is now a virtual package"
select BR2_LEGACY
select BR2_PACKAGE_HAS_UDEV
help
The 'udev' package has been converted to a virtual package.
There is currently one provider for this feature: 'eudev'.
Your old configuration refers to packages depending on 'udev',
either for build or at runtime.
Check that a 'udev' provider is selected, i.e. that 'eudev' is
selected, which is the case if '/dev management' is set to
'Dynamic using eudev'.
config BR2_PACKAGE_UDEV_RULES_GEN
bool "udev rules generation handled by eudev"
select BR2_LEGACY
select BR2_PACKAGE_EUDEV
select BR2_PACKAGE_EUDEV_RULES_GEN
help
The 'udev' package has been converted to a virtual package.
There is currently one provider for this feature: 'eudev'.
udev rules generation will now be handled by 'eudev'.
Check that '/dev management' is set to 'Dynamic using eudev'
to get the same behaviour as in your old configuration.
config BR2_PACKAGE_UDEV_ALL_EXTRAS
bool "udev extras removed"
select BR2_LEGACY
help
The 'udev' package has been converted to a virtual package.
There is currently one provider for this feature: 'eudev'.
The option to enable the extra features of 'udev' (gudev, ...)
has been removed. These features are automatically enabled in
the 'udev' providers if the dependencies are selected. For
example, selecting 'libglib2' will trigger the build of gudev.
############################################################################### ###############################################################################
comment "Legacy options removed in 2014.02" comment "Legacy options removed in 2014.02"

3
docs/manual/adding-packages-directory.txt
View File

@ -273,8 +273,7 @@ foo needs a toolchain w/ featA, featB, featC and a Linux kernel to be built
Dependencies on udev /dev management Dependencies on udev /dev management
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
If a package needs udev /dev management, it should depend on symbol If a package needs udev /dev management, it should depend on symbol
+BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV+, and the following comment +BR2_PACKAGE_HAS_UDEV+, and the following comment should be added:
should be added:
-------------------------- --------------------------
foo needs udev /dev management foo needs udev /dev management

2
linux/linux.mk
View File

@ -186,8 +186,6 @@ define LINUX_CONFIGURE_CMDS
$(if $(BR2_ROOTFS_DEVICE_CREATION_STATIC),, $(if $(BR2_ROOTFS_DEVICE_CREATION_STATIC),,
$(call KCONFIG_ENABLE_OPT,CONFIG_DEVTMPFS,$(@D)/.config) $(call KCONFIG_ENABLE_OPT,CONFIG_DEVTMPFS,$(@D)/.config)
$(call KCONFIG_ENABLE_OPT,CONFIG_DEVTMPFS_MOUNT,$(@D)/.config)) $(call KCONFIG_ENABLE_OPT,CONFIG_DEVTMPFS_MOUNT,$(@D)/.config))
$(if $(BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV),
$(call KCONFIG_ENABLE_OPT,CONFIG_INOTIFY_USER,$(@D)/.config))
$(if $(BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV), $(if $(BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV),
$(call KCONFIG_ENABLE_OPT,CONFIG_INOTIFY_USER,$(@D)/.config)) $(call KCONFIG_ENABLE_OPT,CONFIG_INOTIFY_USER,$(@D)/.config))
$(if $(BR2_PACKAGE_KTAP), $(if $(BR2_PACKAGE_KTAP),

2
package/ccid/ccid.mk
View File

@ -12,7 +12,7 @@ CCID_LICENSE_FILES = COPYING
CCID_INSTALL_STAGING = YES CCID_INSTALL_STAGING = YES
CCID_DEPENDENCIES = pcsc-lite host-pkgconf libusb CCID_DEPENDENCIES = pcsc-lite host-pkgconf libusb
ifeq ($(BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV),y) ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
define CCID_INSTALL_UDEV_RULES define CCID_INSTALL_UDEV_RULES
if test -d $(TARGET_DIR)/etc/udev/rules.d ; then \ if test -d $(TARGET_DIR)/etc/udev/rules.d ; then \
cp $(@D)/src/92_pcscd_ccid.rules $(TARGET_DIR)/etc/udev/rules.d/ ; \ cp $(@D)/src/92_pcscd_ccid.rules $(TARGET_DIR)/etc/udev/rules.d/ ; \

1
package/eudev/Config.in
View File

@ -6,6 +6,7 @@ config BR2_PACKAGE_EUDEV
depends on BR2_LARGEFILE # util-linux depends on BR2_LARGEFILE # util-linux
depends on BR2_USE_WCHAR # util-linux depends on BR2_USE_WCHAR # util-linux
depends on !BR2_PREFER_STATIC_LIB # kmod depends on !BR2_PREFER_STATIC_LIB # kmod
select BR2_PACKAGE_HAS_UDEV
select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX
select BR2_PACKAGE_UTIL_LINUX_LIBBLKID select BR2_PACKAGE_UTIL_LINUX_LIBBLKID
select BR2_PACKAGE_KMOD select BR2_PACKAGE_KMOD

2
package/gpsd/gpsd.mk
View File

@ -222,7 +222,7 @@ define GPSD_INSTALL_STAGING_CMDS
install) install)
endef endef
ifeq ($(BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV),y) ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
define GPSD_INSTALL_UDEV_RULES define GPSD_INSTALL_UDEV_RULES
(cd $(@D); \ (cd $(@D); \
$(GPSD_SCONS_ENV) \ $(GPSD_SCONS_ENV) \

4
package/libatasmart/Config.in
View File

@ -1,6 +1,6 @@
config BR2_PACKAGE_LIBATASMART config BR2_PACKAGE_LIBATASMART
bool "libatasmart" bool "libatasmart"
depends on BR2_PACKAGE_UDEV # libudev is configure dependency depends on BR2_PACKAGE_HAS_UDEV # libudev is configure dependency
help help
The libatasmart package is a disk reporting library. The libatasmart package is a disk reporting library.
It only supports a subset of the ATA S.M.A.R.T. functionality. It only supports a subset of the ATA S.M.A.R.T. functionality.
@ -8,4 +8,4 @@ config BR2_PACKAGE_LIBATASMART
http://www.linuxfromscratch.org/blfs/view/svn/general/libatasmart.html http://www.linuxfromscratch.org/blfs/view/svn/general/libatasmart.html
comment "libatasmart requires udev to be enabled" comment "libatasmart requires udev to be enabled"
depends on !BR2_PACKAGE_UDEV depends on !BR2_PACKAGE_HAS_UDEV

2
package/libcec/libcec.mk
View File

@ -18,7 +18,7 @@ ifeq ($(BR2_PACKAGE_LOCKDEV),y)
LIBCEC_DEPENDENCIES += lockdev LIBCEC_DEPENDENCIES += lockdev
endif endif
ifeq ($(BR2_PACKAGE_UDEV),y) ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
LIBCEC_DEPENDENCIES += udev LIBCEC_DEPENDENCIES += udev
endif endif

2
package/libdrm/libdrm.mk
View File

@ -65,7 +65,7 @@ else
LIBDRM_CONF_OPT += --disable-freedreno-experimental-api LIBDRM_CONF_OPT += --disable-freedreno-experimental-api
endif endif
ifeq ($(BR2_PACKAGE_UDEV),y) ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
LIBDRM_CONF_OPT += --enable-udev LIBDRM_CONF_OPT += --enable-udev
LIBDRM_DEPENDENCIES += udev LIBDRM_DEPENDENCIES += udev
else else

5
package/libmbim/Config.in
View File

@ -2,9 +2,8 @@ config BR2_PACKAGE_LIBMBIM
bool "libmbim" bool "libmbim"
depends on BR2_USE_WCHAR # libglib2 depends on BR2_USE_WCHAR # libglib2
depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
depends on BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV depends on BR2_PACKAGE_HAS_UDEV
select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBGLIB2
select BR2_PACKAGE_UDEV_ALL_EXTRAS
help help
libmbim is a glib-based library for talking to WWAN modems and libmbim is a glib-based library for talking to WWAN modems and
devices which speak the Mobile Interface Broadband Model (MBIM) devices which speak the Mobile Interface Broadband Model (MBIM)
@ -14,4 +13,4 @@ config BR2_PACKAGE_LIBMBIM
comment "libmbim needs udev /dev management and a toolchain w/ wchar, threads" comment "libmbim needs udev /dev management and a toolchain w/ wchar, threads"
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
!BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV !BR2_PACKAGE_HAS_UDEV

2
package/libusb/libusb.mk
View File

@ -21,7 +21,7 @@ ifeq ($(BR2_avr32),y)
LIBUSB_CONF_OPT += --disable-timerfd LIBUSB_CONF_OPT += --disable-timerfd
endif endif
ifeq ($(BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV),y) ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
LIBUSB_DEPENDENCIES += udev LIBUSB_DEPENDENCIES += udev
else else
LIBUSB_CONF_OPT += --disable-udev LIBUSB_CONF_OPT += --disable-udev

6
package/modem-manager/Config.in
View File

@ -1,6 +1,6 @@
config BR2_PACKAGE_MODEM_MANAGER config BR2_PACKAGE_MODEM_MANAGER
bool "modemmanager" bool "modemmanager"
depends on BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV depends on BR2_PACKAGE_HAS_UDEV
select BR2_PACKAGE_DBUS select BR2_PACKAGE_DBUS
depends on BR2_INET_IPV6 depends on BR2_INET_IPV6
depends on BR2_LARGEFILE # acl depends on BR2_LARGEFILE # acl
@ -8,8 +8,6 @@ config BR2_PACKAGE_MODEM_MANAGER
depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2
depends on BR2_USE_MMU # dbus depends on BR2_USE_MMU # dbus
select BR2_PACKAGE_DBUS_GLIB select BR2_PACKAGE_DBUS_GLIB
select BR2_PACKAGE_UDEV
select BR2_PACKAGE_UDEV_ALL_EXTRAS
help help
ModemManager is a DBus-activated daemon which controls mobile ModemManager is a DBus-activated daemon which controls mobile
broadband (2G/3G/4G) devices and connections. broadband (2G/3G/4G) devices and connections.
@ -33,4 +31,4 @@ endif
comment "modemmanager needs udev /dev management and a toolchain w/ largefile, wchar, threads, IPv6" comment "modemmanager needs udev /dev management and a toolchain w/ largefile, wchar, threads, IPv6"
depends on !BR2_INET_IPV6 || !BR2_LARGEFILE || !BR2_USE_WCHAR || \ depends on !BR2_INET_IPV6 || !BR2_LARGEFILE || !BR2_USE_WCHAR || \
!BR2_TOOLCHAIN_HAS_THREADS || !BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV !BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_HAS_UDEV

8
package/network-manager/Config.in
View File

@ -1,16 +1,14 @@
config BR2_PACKAGE_NETWORK_MANAGER config BR2_PACKAGE_NETWORK_MANAGER
bool "NetworkManager" bool "NetworkManager"
depends on !BR2_avr32 # udev depends on !BR2_avr32 # udev
depends on BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV
select BR2_PACKAGE_DBUS
depends on BR2_INET_IPV6 depends on BR2_INET_IPV6
depends on BR2_LARGEFILE # acl depends on BR2_LARGEFILE # acl
depends on BR2_USE_WCHAR # libglib2 and gnutls depends on BR2_USE_WCHAR # libglib2 and gnutls
depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2
depends on BR2_USE_MMU # dbus depends on BR2_USE_MMU # dbus
depends on BR2_PACKAGE_HAS_UDEV
select BR2_PACKAGE_DBUS
select BR2_PACKAGE_DBUS_GLIB select BR2_PACKAGE_DBUS_GLIB
select BR2_PACKAGE_UDEV
select BR2_PACKAGE_UDEV_ALL_EXTRAS
select BR2_PACKAGE_GNUTLS select BR2_PACKAGE_GNUTLS
select BR2_PACKAGE_LIBGCRYPT select BR2_PACKAGE_LIBGCRYPT
select BR2_PACKAGE_LIBNL select BR2_PACKAGE_LIBNL
@ -33,4 +31,4 @@ comment "NetworkManager needs udev /dev management and a toolchain w/ IPv6, larg
depends on BR2_USE_MMU depends on BR2_USE_MMU
depends on !BR2_INET_IPV6 || !BR2_LARGEFILE || !BR2_USE_WCHAR || \ depends on !BR2_INET_IPV6 || !BR2_LARGEFILE || !BR2_USE_WCHAR || \
!BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_HAS_THREADS || \
!BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV !BR2_PACKAGE_HAS_UDEV

2
package/ofono/ofono.mk
View File

@ -22,7 +22,7 @@ OFONO_CONF_OPT = --disable-test
# make sure that it is defined. # make sure that it is defined.
OFONO_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" OFONO_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE"
ifeq ($(BR2_PACKAGE_UDEV),y) ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
OFONO_CONF_OPT += --enable-udev OFONO_CONF_OPT += --enable-udev
OFONO_DEPENDENCIES += udev OFONO_DEPENDENCIES += udev
else else

2
package/pcsc-lite/Config.in
View File

@ -11,7 +11,7 @@ if BR2_PACKAGE_PCSC_LITE
config BR2_PACKAGE_PCSC_LITE_FORCE_LIBUSB config BR2_PACKAGE_PCSC_LITE_FORCE_LIBUSB
bool "use libusb" bool "use libusb"
depends on !BR2_PACKAGE_UDEV depends on !BR2_PACKAGE_HAS_UDEV
select BR2_PACKAGE_LIBUSB select BR2_PACKAGE_LIBUSB
help help
Select Y if you want to support usb smart card readers. Select Y if you want to support usb smart card readers.

2
package/pcsc-lite/pcsc-lite.mk
View File

@ -16,7 +16,7 @@ PCSC_LITE_LICENSE_FILES = COPYING
# - libudev and libusb can't be used together # - libudev and libusb can't be used together
# - libudev has a priority over libusb # - libudev has a priority over libusb
ifeq ($(BR2_PACKAGE_UDEV),y) ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
PCSC_LITE_CONF_OPT += --enable-libudev --disable-libusb PCSC_LITE_CONF_OPT += --enable-libudev --disable-libusb
PCSC_LITE_DEPENDENCIES += udev PCSC_LITE_DEPENDENCIES += udev
else else

2
package/pulseaudio/pulseaudio.mk
View File

@ -26,7 +26,7 @@ PULSEAUDIO_DEPENDENCIES = \
$(if $(BR2_PACKAGE_AVAHI_DAEMON),avahi) \ $(if $(BR2_PACKAGE_AVAHI_DAEMON),avahi) \
$(if $(BR2_PACKAGE_DBUS),dbus) \ $(if $(BR2_PACKAGE_DBUS),dbus) \
$(if $(BR2_PACKAGE_BLUEZ_UTILS),bluez_utils) \ $(if $(BR2_PACKAGE_BLUEZ_UTILS),bluez_utils) \
$(if $(BR2_PACKAGE_UDEV),udev) \ $(if $(BR2_PACKAGE_HAS_UDEV),udev) \
$(if $(BR2_PACKAGE_OPENSSL),openssl) \ $(if $(BR2_PACKAGE_OPENSSL),openssl) \
$(if $(BR2_PACKAGE_FFTW),fftw) \ $(if $(BR2_PACKAGE_FFTW),fftw) \
$(if $(BR2_PACKAGE_WEBRTC_AUDIO_PROCESSING),webrtc-audio-processing) \ $(if $(BR2_PACKAGE_WEBRTC_AUDIO_PROCESSING),webrtc-audio-processing) \

6
package/systemd/Config.in
View File

@ -1,6 +1,6 @@
config BR2_PACKAGE_SYSTEMD config BR2_PACKAGE_SYSTEMD
bool "systemd" bool "systemd"
depends on BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV depends on BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV
depends on BR2_INET_IPV6 depends on BR2_INET_IPV6
depends on BR2_TOOLCHAIN_HAS_THREADS # dbus depends on BR2_TOOLCHAIN_HAS_THREADS # dbus
depends on BR2_USE_MMU # dbus depends on BR2_USE_MMU # dbus
@ -18,7 +18,7 @@ config BR2_PACKAGE_SYSTEMD
http://freedesktop.org/wiki/Software/systemd http://freedesktop.org/wiki/Software/systemd
comment "systemd needs udev /dev management and a toolchain w/ IPv6, threads" comment "systemd needs eudev /dev management and a toolchain w/ IPv6, threads"
depends on BR2_USE_MMU depends on BR2_USE_MMU
depends on !BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV || !BR2_INET_IPV6 || \ depends on !BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV || !BR2_INET_IPV6 || \\
!BR2_TOOLCHAIN_HAS_THREADS !BR2_TOOLCHAIN_HAS_THREADS

51
package/udev/Config.in
View File

@ -1,47 +1,6 @@
config BR2_PACKAGE_UDEV config BR2_PACKAGE_HAS_UDEV
bool "udev" bool
depends on !BR2_avr32 # no epoll_create1
depends on BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV
depends on BR2_LARGEFILE # util-linux
depends on BR2_USE_WCHAR # util-linux
depends on !BR2_PREFER_STATIC_LIB # kmod
select BR2_PACKAGE_UTIL_LINUX
select BR2_PACKAGE_UTIL_LINUX_LIBBLKID
select BR2_PACKAGE_KMOD
help help
Userspace device daemon. udev is now a virtual package.
Packages requiring udevd at run time or libudev/gudev at build time
udev requires a Linux kernel >= 2.6.34: it relies on devtmpfs should select it.
and inotify.
ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/
if BR2_PACKAGE_UDEV
config BR2_PACKAGE_UDEV_RULES_GEN
bool "enable rules generator"
help
Enable persistant rules generator
config BR2_PACKAGE_UDEV_ALL_EXTRAS
bool "enable all extras"
select BR2_PACKAGE_ACL
select BR2_PACKAGE_HWDATA
select BR2_PACKAGE_LIBGLIB2
depends on BR2_USE_WCHAR # libglib2
depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
depends on BR2_USE_MMU # libglib2
help
Enable all extras with external dependencies like
libacl, hwdata and libglib2
comment "enabling all extras needs a toolchain w/ wchar, threads"
depends on BR2_USE_MMU
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
endif
comment "udev needs udev /dev management and a toolchain w/ largefile, wchar, dynamic library"
depends on !BR2_avr32
depends on !BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV || \
!BR2_LARGEFILE || !BR2_USE_WCHAR || BR2_PREFER_STATIC_LIB

49
package/udev/udev.mk
View File

@ -4,48 +4,17 @@
# #
################################################################################ ################################################################################
UDEV_VERSION = 182 UDEV_SOURCE =
UDEV_SOURCE = udev-$(UDEV_VERSION).tar.xz
UDEV_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/hotplug/
UDEV_LICENSE = GPLv2+
UDEV_LICENSE_FILES = COPYING
UDEV_INSTALL_STAGING = YES
# mq_getattr is in librt ifeq ($(BR2_PACKAGE_EUDEV),y)
UDEV_CONF_ENV += LIBS=-lrt UDEV_DEPENDENCIES += eudev
UDEV_CONF_OPT = \
--sbindir=/sbin \
--with-rootlibdir=/lib \
--libexecdir=/lib \
--with-usb-ids-path=/usr/share/hwdata/usb.ids \
--with-pci-ids-path=/usr/share/hwdata/pci.ids \
--with-firmware-path=/lib/firmware \
--disable-introspection
UDEV_DEPENDENCIES = host-gperf host-pkgconf util-linux kmod
ifeq ($(BR2_PACKAGE_UDEV_RULES_GEN),y)
UDEV_CONF_OPT += --enable-rule_generator
endif endif
ifeq ($(BR2_PACKAGE_UDEV_ALL_EXTRAS),y) ifeq ($(UDEV_DEPENDENCIES),)
UDEV_DEPENDENCIES += acl hwdata libglib2 define UDEV_CONFIGURE_CMDS
UDEV_CONF_OPT += \ echo "No Udev implementation selected. Configuration error."
--enable-udev_acl exit 1
else
UDEV_CONF_OPT += \
--disable-gudev
endif
ifeq ($(BR2_PACKAGE_SYSTEMD),y)
UDEV_CONF_OPT += --with-systemdsystemunitdir=/lib/systemd/system/
endif
define UDEV_INSTALL_INITSCRIPT
$(INSTALL) -m 0755 package/udev/S10udev $(TARGET_DIR)/etc/init.d/S10udev
endef endef
endif
UDEV_POST_INSTALL_TARGET_HOOKS += UDEV_INSTALL_INITSCRIPT $(eval $(generic-package))
$(eval $(autotools-package))

14
package/udisks/Config.in
View File

@ -1,11 +1,9 @@
config BR2_PACKAGE_UDISKS config BR2_PACKAGE_UDISKS
bool "udisks" bool "udisks"
depends on !BR2_avr32 # udev depends on !BR2_avr32 # udev
depends on BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV depends on BR2_PACKAGE_HAS_UDEV
depends on BR2_TOOLCHAIN_HAS_THREADS # dbus-glib -> glib2 depends on BR2_TOOLCHAIN_HAS_THREADS # dbus-glib -> glib2
depends on BR2_USE_MMU # lvm2 depends on BR2_USE_MMU # lvm2
select BR2_PACKAGE_UDEV
select BR2_PACKAGE_UDEV_ALL_EXTRAS
select BR2_PACKAGE_DBUS select BR2_PACKAGE_DBUS
select BR2_PACKAGE_DBUS_GLIB select BR2_PACKAGE_DBUS_GLIB
depends on BR2_USE_WCHAR # dbus-glib -> glib2 depends on BR2_USE_WCHAR # dbus-glib -> glib2
@ -36,8 +34,12 @@ config BR2_PACKAGE_UDISKS_LVM2
endif endif
comment "udisks needs udev /dev management and a toolchain w/ wchar, threads" comment "udisks needs udev /dev management"
depends on !BR2_avr32 depends on !BR2_avr32
depends on BR2_USE_MMU depends on BR2_USE_MMU
depends on !BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV || \ depends on !BR2_PACKAGE_HAS_UDEV
!BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
comment "udisks needs a toolchain w/ wchar, threads"
depends on !BR2_avr32
depends on BR2_USE_MMU
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS

4
package/usbmount/Config.in
View File

@ -1,6 +1,6 @@
config BR2_PACKAGE_USBMOUNT config BR2_PACKAGE_USBMOUNT
bool "usbmount" bool "usbmount"
depends on BR2_PACKAGE_UDEV depends on BR2_PACKAGE_HAS_UDEV
select BR2_PACKAGE_LOCKFILE_PROGS select BR2_PACKAGE_LOCKFILE_PROGS
help help
The usbmount package automatically mounts USB mass storage devices The usbmount package automatically mounts USB mass storage devices
@ -9,4 +9,4 @@ config BR2_PACKAGE_USBMOUNT
http://usbmount.alioth.debian.org/ http://usbmount.alioth.debian.org/
comment "usbmount requires udev to be enabled" comment "usbmount requires udev to be enabled"
depends on !BR2_PACKAGE_UDEV depends on !BR2_PACKAGE_HAS_UDEV

2
package/vlc/vlc.mk
View File

@ -266,7 +266,7 @@ else
VLC_CONF_OPT += --disable-tremor VLC_CONF_OPT += --disable-tremor
endif endif
ifeq ($(BR2_PACKAGE_UDEV),y) ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
VLC_CONF_OPT += --enable-udev VLC_CONF_OPT += --enable-udev
VLC_DEPENDENCIES += udev VLC_DEPENDENCIES += udev
else else

4
package/weston/Config.in
View File

@ -1,6 +1,6 @@
comment "weston needs udev and a toolchain w/ threads" comment "weston needs udev and a toolchain w/ threads"
depends on !BR2_avr32 depends on !BR2_avr32
depends on !BR2_PACKAGE_UDEV || !BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_PACKAGE_HAS_UDEV || !BR2_TOOLCHAIN_HAS_THREADS
config BR2_PACKAGE_WESTON config BR2_PACKAGE_WESTON
bool "weston" bool "weston"
@ -11,7 +11,7 @@ config BR2_PACKAGE_WESTON
select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_LIBPNG
select BR2_PACKAGE_JPEG select BR2_PACKAGE_JPEG
select BR2_PACKAGE_MTDEV select BR2_PACKAGE_MTDEV
depends on BR2_PACKAGE_UDEV depends on BR2_PACKAGE_HAS_UDEV
depends on !BR2_avr32 # wayland depends on !BR2_avr32 # wayland
depends on BR2_TOOLCHAIN_HAS_THREADS # wayland depends on BR2_TOOLCHAIN_HAS_THREADS # wayland
# Runtime dependency # Runtime dependency

4
package/x11r7/xdriver_xf86-input-evdev/Config.in
View File

@ -1,6 +1,6 @@
config BR2_PACKAGE_XDRIVER_XF86_INPUT_EVDEV config BR2_PACKAGE_XDRIVER_XF86_INPUT_EVDEV
bool "xf86-input-evdev" bool "xf86-input-evdev"
depends on BR2_PACKAGE_UDEV # libudev is configure dependency depends on BR2_PACKAGE_HAS_UDEV # libudev is configure dependency
select BR2_PACKAGE_XPROTO_INPUTPROTO select BR2_PACKAGE_XPROTO_INPUTPROTO
select BR2_PACKAGE_XPROTO_RANDRPROTO select BR2_PACKAGE_XPROTO_RANDRPROTO
select BR2_PACKAGE_XPROTO_XPROTO select BR2_PACKAGE_XPROTO_XPROTO
@ -8,4 +8,4 @@ config BR2_PACKAGE_XDRIVER_XF86_INPUT_EVDEV
Generic Linux input driver Generic Linux input driver
comment "xf86-input-evdev requires udev to be enabled" comment "xf86-input-evdev requires udev to be enabled"
depends on !BR2_PACKAGE_UDEV depends on !BR2_PACKAGE_HAS_UDEV

2
package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
View File

@ -123,7 +123,7 @@ XSERVER_XORG_SERVER_DEPENDENCIES += tslib
XSERVER_XORG_SERVER_CONF_OPT += --enable-tslib LDFLAGS="-lts" XSERVER_XORG_SERVER_CONF_OPT += --enable-tslib LDFLAGS="-lts"
endif endif
ifeq ($(BR2_PACKAGE_UDEV),y) ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
XSERVER_XORG_SERVER_DEPENDENCIES += udev XSERVER_XORG_SERVER_DEPENDENCIES += udev
XSERVER_XORG_SERVER_CONF_OPT += --enable-config-udev XSERVER_XORG_SERVER_CONF_OPT += --enable-config-udev
else else

2
package/xenomai/xenomai.mk
View File

@ -93,7 +93,7 @@ define XENOMAI_DEVICES
/dev/rtp c 666 0 0 150 0 0 1 32 /dev/rtp c 666 0 0 150 0 0 1 32
endef endef
ifeq ($(BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV),y) ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
XENOMAI_DEPENDENCIES += udev XENOMAI_DEPENDENCIES += udev
define XENOMAI_INSTALL_UDEV_RULES define XENOMAI_INSTALL_UDEV_RULES

22
system/Config.in
View File

@ -90,17 +90,17 @@ config BR2_INIT_SYSTEMD
depends on BR2_LARGEFILE depends on BR2_LARGEFILE
depends on BR2_USE_WCHAR depends on BR2_USE_WCHAR
depends on BR2_INET_IPV6 depends on BR2_INET_IPV6
depends on BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV depends on BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV
depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_USE_MMU depends on BR2_USE_MMU
select BR2_PACKAGE_DBUS select BR2_PACKAGE_DBUS
select BR2_PACKAGE_SYSTEMD select BR2_PACKAGE_SYSTEMD
comment 'systemd needs udev /dev management and a toolchain w/ largefile, wchar, IPv6, threads' comment 'systemd needs eudev /dev management and a toolchain w/ largefile, wchar, IPv6, threads'
depends on BR2_USE_MMU depends on BR2_USE_MMU
depends on !(BR2_LARGEFILE && BR2_USE_WCHAR && \ depends on !(BR2_LARGEFILE && BR2_USE_WCHAR && \
BR2_INET_IPV6 && BR2_TOOLCHAIN_HAS_THREADS && \ BR2_INET_IPV6 && BR2_TOOLCHAIN_HAS_THREADS && \
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV) BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV)
config BR2_INIT_NONE config BR2_INIT_NONE
bool "None" bool "None"
@ -121,22 +121,6 @@ config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV
bool "Dynamic using mdev" bool "Dynamic using mdev"
select BR2_PACKAGE_BUSYBOX select BR2_PACKAGE_BUSYBOX
config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV
bool "Dynamic using udev"
depends on !BR2_avr32 # udev
depends on BR2_LARGEFILE # udev
depends on BR2_USE_WCHAR # udev
depends on !BR2_PREFER_STATIC_LIB # udev -> kmod
select BR2_PACKAGE_UDEV
comment "udev needs a toolchain w/ largefile, wchar"
depends on !BR2_avr32 # udev
depends on !(BR2_LARGEFILE && BR2_USE_WCHAR)
comment "udev doesn't work with 'prefer static libraries'"
depends on !BR2_avr32 # udev
depends on BR2_PREFER_STATIC_LIB
config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV
bool "Dynamic using eudev" bool "Dynamic using eudev"
depends on !BR2_avr32 # eudev depends on !BR2_avr32 # eudev