diff options
Diffstat (limited to 'package/udev')
-rw-r--r-- | package/udev/Config.in | 51 | ||||
-rw-r--r-- | package/udev/udev.mk | 49 |
2 files changed, 14 insertions, 86 deletions
diff --git a/package/udev/Config.in b/package/udev/Config.in index 7aa79c4452..5cd4051621 100644 --- a/package/udev/Config.in +++ b/package/udev/Config.in @@ -1,47 +1,6 @@ -config BR2_PACKAGE_UDEV - bool "udev" - 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 +config BR2_PACKAGE_HAS_UDEV + bool help - Userspace device daemon. - - udev requires a Linux kernel >= 2.6.34: it relies on devtmpfs - 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 + udev is now a virtual package. + Packages requiring udevd at run time or libudev/gudev at build time + should select it. diff --git a/package/udev/udev.mk b/package/udev/udev.mk index db86850ba2..d274246b20 100644 --- a/package/udev/udev.mk +++ b/package/udev/udev.mk @@ -4,48 +4,17 @@ # ################################################################################ -UDEV_VERSION = 182 -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 +UDEV_SOURCE = -# mq_getattr is in librt -UDEV_CONF_ENV += LIBS=-lrt - -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 - -ifeq ($(BR2_PACKAGE_UDEV_ALL_EXTRAS),y) -UDEV_DEPENDENCIES += acl hwdata libglib2 -UDEV_CONF_OPT += \ - --enable-udev_acl -else -UDEV_CONF_OPT += \ - --disable-gudev +ifeq ($(BR2_PACKAGE_EUDEV),y) +UDEV_DEPENDENCIES += eudev 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 +ifeq ($(UDEV_DEPENDENCIES),) +define UDEV_CONFIGURE_CMDS + echo "No Udev implementation selected. Configuration error." + exit 1 endef +endif -UDEV_POST_INSTALL_TARGET_HOOKS += UDEV_INSTALL_INITSCRIPT - -$(eval $(autotools-package)) +$(eval $(generic-package)) |