diff options
| -rw-r--r-- | package/udev/Config.in | 46 | ||||
| -rwxr-xr-x | package/udev/S10udev | 6 | ||||
| -rw-r--r-- | package/udev/libvolume_id.la.tmpl | 35 | ||||
| -rw-r--r-- | package/udev/udev.mk | 150 |
4 files changed, 43 insertions, 194 deletions
diff --git a/package/udev/Config.in b/package/udev/Config.in index 6438d4f0a..254a8f43d 100644 --- a/package/udev/Config.in +++ b/package/udev/Config.in @@ -5,37 +5,23 @@ config BR2_PACKAGE_UDEV ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/ -config BR2_PACKAGE_UDEV_UTILS - bool "udev-utils" - depends on BR2_PACKAGE_UDEV - help - Adds the udevmonitor, udevinfo, and udevtest binaries - to your filesystem. - -menu "Extra udev tools" - depends on BR2_PACKAGE_UDEV - -config BR2_PACKAGE_UDEV_VOLUME_ID - bool "udev-libvolume_id" - depends on BR2_PACKAGE_UDEV - help - Build and install volume identification library. +if BR2_PACKAGE_UDEV -config BR2_PACKAGE_UDEV_SCSI_ID - bool "udev-scsi_id" - depends on BR2_PACKAGE_UDEV_VOLUME_ID +config BR2_PACKAGE_UDEV_ALL_EXTRAS + bool "enable all extras" + depends on BR2_LARGEFILE + depends on BR2_USE_WCHAR + select BR2_PACKAGE_ACL + select BR2_PACKAGE_LIBUSB + select BR2_PACKAGE_LIBUSB_COMPAT + select BR2_PACKAGE_USBUTILS + select BR2_PACKAGE_HWDATA + select BR2_PACKAGE_LIBGLIB2 help - Build and install SCSI disk identification library. + Enable all extras with external dependencies like + libacl, libusb, libusb-compat, usbutils, hwdata -config BR2_PACKAGE_UDEV_PATH_ID - bool "udev-path_id" - depends on BR2_PACKAGE_UDEV_VOLUME_ID - help - Install udev's unique device path generation program path_id. +comment "udev extras requires a toolchain with LARGEFILE + WCHAR support" + depends on !(BR2_LARGEFILE && BR2_USE_WCHAR) -config BR2_PACKAGE_UDEV_FIRMWARE_SH - bool "udev-firmware_sh" - depends on BR2_PACKAGE_UDEV_VOLUME_ID - help - Install udev's firmware loading script firmware.sh. -endmenu +endif diff --git a/package/udev/S10udev b/package/udev/S10udev index 0d2a23afa..29eb1075c 100755 --- a/package/udev/S10udev +++ b/package/udev/S10udev @@ -19,8 +19,6 @@ # Check for missing binaries UDEV_BIN=/sbin/udevd test -x $UDEV_BIN || exit 5 -UDEVSTART_BIN=/sbin/udevstart -test -x $UDEVSTART_BIN || exit 5 # Check for config file and read it UDEV_CONFIG=/etc/udev/udev.conf @@ -29,16 +27,14 @@ test -r $UDEV_CONFIG || exit 6 case "$1" in start) - mknod -m 0666 /dev/null c 1 3 echo -n "Populating $udev_root using udev: " echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug $UDEV_BIN -d || (echo "FAIL" && exit 1) - $UDEVSTART_BIN || (echo "FAIL" && exit 1) echo "done" ;; stop) # Stop execution of events - udevcontrol stop_exec_queue + udevadm control --stop_exec_queue killall udevd ;; *) diff --git a/package/udev/libvolume_id.la.tmpl b/package/udev/libvolume_id.la.tmpl deleted file mode 100644 index 725628bba..000000000 --- a/package/udev/libvolume_id.la.tmpl +++ /dev/null @@ -1,35 +0,0 @@ -# libvolume_id.la - a libtool library file -# Generated by ltmain.sh - GNU libtool 1.5.22 (1.1220.2.365 2005/12/18 22:14:06) -# -# Please DO NOT delete this file! -# It is necessary for linking the library. - -# The name that we can dlopen(3). -dlname='libvolume_id.so.REPLACE_CURRENT' - -# Names of this library. -library_names='libvolume_id.so.REPLACE_CURRENT.REPLACE_AGE.REPLACE_REVISION libvolume_id.so.REPLACE_CURRENT libvolume_id.so' - -# The name of the static archive. -old_library='libvolume_id.a' - -# Libraries that this one depends upon. -dependency_libs=' -lc' - -# Version information for libvolume_id. -current=REPLACE_CURRENT -age=REPLACE_AGE -revision=REPLACE_REVISION - -# Is this an already installed library? -installed=yes - -# Should we warn about portability when linking against -modules? -shouldnotlink=no - -# Files to dlopen/dlpreopen -dlopen='' -dlpreopen='' - -# Directory that this library needs to be installed in: -libdir='REPLACE_LIB_DIR' diff --git a/package/udev/udev.mk b/package/udev/udev.mk index 4b61ce48d..6d87ad33d 100644 --- a/package/udev/udev.mk +++ b/package/udev/udev.mk @@ -3,132 +3,34 @@ # udev # ############################################################# -UDEV_VERSION:=114 -UDEV_VOLUME_ID_CURRENT:=0 -UDEV_VOLUME_ID_AGE:=79 -UDEV_VOLUME_ID_REVISION:=0 -UDEV_VOLUME_ID_VERSION:=$(UDEV_VOLUME_ID_CURRENT).$(UDEV_VOLUME_ID_AGE).$(UDEV_VOLUME_ID_REVISION) -UDEV_SOURCE:=udev-$(UDEV_VERSION).tar.bz2 -UDEV_SITE:=$(BR2_KERNEL_MIRROR)/linux/utils/kernel/hotplug/ -UDEV_INSTALL_STAGING=YES - -# 094 had _GNU_SOURCE set -BR2_UDEV_CFLAGS:= -D_GNU_SOURCE $(TARGET_CFLAGS) -ifeq ($(BR2_LARGEFILE),) -BR2_UDEV_CFLAGS+=-U_FILE_OFFSET_BITS -endif - -# UDEV_ROOT is /dev so we can replace devfs, not /udev for experiments -UDEV_ROOT:=/dev - -UDEV_EXTRAS= -ifeq ($(BR2_PACKAGE_UDEV_VOLUME_ID),y) -UDEV_EXTRAS+=volume_id -endif -ifeq ($(BR2_PACKAGE_UDEV_SCSI_ID),y) -UDEV_EXTRAS+=scsi_id -UDEV_EXTRAS+=usb_id -endif -ifeq ($(BR2_PACKAGE_UDEV_PATH_ID),y) -UDEV_EXTRAS+=path_id -endif -ifeq ($(BR2_PACKAGE_UDEV_FIRMWARE_SH),y) -UDEV_EXTRAS+=firmware -endif - -UDEV_BUILD_EXTRAS=$(addprefix extras/,$(UDEV_EXTRAS)) - -# -# Build -# -define UDEV_BUILD_CMDS - $(MAKE) CROSS_COMPILE=$(TARGET_CROSS) CC="$(TARGET_CC)" LD="$(TARGET_CC)"\ - CFLAGS="$(BR2_UDEV_CFLAGS)" \ - USE_LOG=false USE_SELINUX=false \ - udevdir=$(UDEV_ROOT) EXTRAS="$(UDEV_BUILD_EXTRAS)" -C $(@D) -endef - -# -# Staging installation -# -ifeq ($(BR2_PACKAGE_UDEV_VOLUME_ID),y) -define UDEV_VOLUME_ID_STAGING_INSTALL_CMDS - $(INSTALL) -m 0644 -D $(UDEV_DIR)/extras/volume_id/lib/libvolume_id.h $(STAGING_DIR)/usr/include/libvolume_id.h - $(INSTALL) -m 0755 -D $(UDEV_DIR)/extras/volume_id/lib/libvolume_id.so.$(UDEV_VOLUME_ID_VERSION) $(STAGING_DIR)/lib/libvolume_id.so.$(UDEV_VOLUME_ID_VERSION) - -ln -sf libvolume_id.so.$(UDEV_VOLUME_ID_VERSION) $(STAGING_DIR)/lib/libvolume_id.so.0 - -ln -sf libvolume_id.so.$(UDEV_VOLUME_ID_VERSION) $(STAGING_DIR)/lib/libvolume_id.so - $(INSTALL) -m 0755 -D package/udev/libvolume_id.la.tmpl $(STAGING_DIR)/lib/libvolume_id.la - $(SED) 's/REPLACE_CURRENT/$(UDEV_VOLUME_ID_CURRENT)/g' $(STAGING_DIR)/lib/libvolume_id.la - $(SED) 's/REPLACE_AGE/$(UDEV_VOLUME_ID_AGE)/g' $(STAGING_DIR)/lib/libvolume_id.la - $(SED) 's/REPLACE_REVISION/$(UDEV_VOLUME_ID_REVISION)/g' $(STAGING_DIR)/lib/libvolume_id.la - $(SED) 's,REPLACE_LIB_DIR,$(STAGING_DIR)/usr/lib,g' $(STAGING_DIR)/lib/libvolume_id.la -endef +UDEV_VERSION = 172 +UDEV_SOURCE = udev-$(UDEV_VERSION).tar.bz2 +UDEV_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/hotplug/ + +UDEV_CONF_OPT = \ + --sbindir=/sbin \ + --with-rootlibdir=/lib \ + --libexecdir=/lib/udev \ + --disable-introspection + +UDEV_DEPENDENCIES = host-gperf host-pkg-config + +ifeq ($(BR2_PACKAGE_UDEV_ALL_EXTRAS),y) +UDEV_DEPENDENCIES += libusb libusb-compat acl usbutils hwdata libglib2 +UDEV_CONF_OPT += \ + --with-pci-ids-path=$(TARGET_DIR)/usr/share/hwdata/pci.ids \ + --with-usb-ids-path=$(TARGET_DIR)/usr/share/hwdata/usb.ids +else +UDEV_CONF_OPT += \ + --disable-hwdb \ + --disable-udev_acl \ + --disable-gudev endif -define UDEV_INSTALL_STAGING_CMDS -$(UDEV_VOLUME_ID_STAGING_INSTALL_CMDS) +define UDEV_INSTALL_INITSCRIPT + $(INSTALL) -m 0755 package/udev/S10udev $(TARGET_DIR)/etc/init.d/S10udev endef -# -# Target installation -# -ifneq ($(BR2_PACKAGE_UDEV_UTILS),y) -define UDEV_UTILS_REMOVAL - rm -f $(TARGET_DIR)/usr/sbin/udevmonitor - rm -f $(TARGET_DIR)/usr/bin/udevinfo - rm -f $(TARGET_DIR)/usr/bin/udevtest -endef -endif - -define UDEV_INSTALL_TARGET_CMDS - mkdir -p $(TARGET_DIR)/sys - $(MAKE) $(TARGET_CONFIGURE_OPTS) \ - DESTDIR=$(TARGET_DIR) \ - CFLAGS="$(BR2_UDEV_CFLAGS)" \ - LDFLAGS="-warn-common" \ - USE_LOG=false USE_SELINUX=false \ - udevdir=$(UDEV_ROOT) EXTRAS="$(UDEV_BUILD_EXTRAS)" -C $(@D) install - $(INSTALL) -m 0755 -D package/udev/S10udev $(TARGET_DIR)/etc/init.d/S10udev - $(INSTALL) -m 0755 -d $(TARGET_DIR)/etc/udev/rules.d - $(INSTALL) -m 0644 $(@D)/etc/udev/frugalware/* $(TARGET_DIR)/etc/udev/rules.d - ( grep udev_root $(TARGET_DIR)/etc/udev/udev.conf > /dev/null 2>&1 || echo 'udev_root=/dev' >> $(TARGET_DIR)/etc/udev/udev.conf ) - install -m 0755 -D $(@D)/udevstart $(TARGET_DIR)/sbin/udevstart - for i in $(TARGET_DIR)/sbin/udev* $(TARGET_DIR)/usr/bin/udev* ; do \ - $(STRIPCMD) $(STRIP_STRIP_ALL) $$i ; \ - done - for i in scsi_id usb_id vol_id ; do \ - if test -e $(TARGET_DIR)/lib/udev/$$i ; then \ - $(STRIPCMD) $(STRIP_STRIP_ALL) $(TARGET_DIR)/lib/udev/$$i ; \ - fi \ - done - $(UDEV_UTILS_REMOVAL) -endef - -# -# Clean -# -define UDEV_CLEAN_CMDS - -$(MAKE) EXTRAS="$(UDEV_BUILD_EXTRAS)" -C $(@D) clean -endef - -# -# Staging uninstall -# -define UDEV_UNINSTALL_STAGING_CMDS - rm -f $(STAGING_DIR)/usr/include/libvolume_id.h - rm -f $(STAGING_DIR)/lib/libvolume_id.so* - rm -f $(STAGING_DIR)/lib/libvolume_id.la -endef - -# -# Target uninstall -# -define UDEV_UNINSTALL_TARGET_CMDS - rm -f $(TARGET_DIR)/etc/init.d/S10udev $(TARGET_DIR)/sbin/udev* - rm -f $(TARGET_DIR)/usr/sbin/udevmonitor $(TARGET_DIR)/usr/bin/udev* - rm -fr $(TARGET_DIR)/sys - rm -f $(TARGET_DIR)/lib/libvolume_id.so.0* - rm -rf $(TARGET_DIR)/lib/udev -endef +UDEV_POST_INSTALL_TARGET_HOOKS += UDEV_INSTALL_INITSCRIPT -$(eval $(call GENTARGETS,package,udev)) +$(eval $(call AUTOTARGETS,package,udev)) |