X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/9d35bf3e30b5f13f1de316900ca42f9332dd84c0..3b07b2b809e18cd405a7c0576f505bcc4b0455ee:/package/udev/Makefile?ds=sidebyside

diff --git a/package/udev/Makefile b/package/udev/Makefile
index 336e511f0..26bfe8bba 100644
--- a/package/udev/Makefile
+++ b/package/udev/Makefile
@@ -1,86 +1,121 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2006-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=udev
-PKG_VERSION:=106
+PKG_VERSION:=142
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@KERNEL/linux/utils/kernel/hotplug/
-PKG_MD5SUM:=320ccd2d0f4540d10e021bafa14f8985
+PKG_MD5SUM:=3edc4cf383dccb06d866c5156d59ddd5
 
 include $(INCLUDE_DIR)/package.mk
 
+PKG_INSTALL=1
+
 define Package/udev
-  SECTION:=utils
-  CATEGORY:=Utilities
+  SECTION:=base
+  CATEGORY:=Base system
   DEPENDS:=@LINUX_2_6
   TITLE:=Dynamic device management subsystem
   URL:=http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
+  MAINTAINER:=Geoff Levand <geoffrey.levand@am.sony.com>
+  MENU:=1
 endef
 
 define Package/udev/description
- udev provides a dynamic device directory containing only the files for 
- actually present devices. It creates or removes device node files in 
- the /dev directory, or it renames network interfaces.
+	udev allows Linux users to have a dynamic /dev directory and it
+	provides the ability to have persistent device names.
 endef
 
-define Package/udevtrigger
-$(call Package/udev)
-  TITLE:=Small utility to request kernel devices events for coldplug
+define Package/udev/config
+	source "$(SOURCE)/Config.in"
 endef
 
-define Package/udev-vol-id
-$(call Package/udev)
- TITLE:=Small utility to read volume ids
-endef
+udev-args-$(CONFIG_UDEV_DISABLE_LOGGING) += --disable-logging
+udev-args-$(CONFIG_UDEV_ENABLE_DEBUG) += --enable-debug
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CROSS_COMPILE="$(TARGET_CROSS)" \
-		STRIP="/bin/true" \
-		OPTFLAGS="$(TARGET_CFLAGS)" \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		INSTALL="install -c" \
-		EXTRAS="extras/volume_id" \
-		all install
-endef
+CONFIGURE_ARGS += --prefix=/usr --exec-prefix= --sysconfdir=/etc \
+	--sbindir=/sbin $(udev-args-y)
+
+udev-extra-lib-bin-$(CONFIG_UDEV_EXTRA_ata_id) += ata_id
+
+udev-extra-lib-bin-$(CONFIG_UDEV_EXTRA_cdrom_id) += cdrom_id
+udev-extra-rules-$(CONFIG_UDEV_EXTRA_cdrom_id) += 60-cdrom_id.rules
+
+udev-extra-lib-bin-$(CONFIG_UDEV_EXTRA_collect) += collect
+
+udev-extra-lib-bin-$(CONFIG_UDEV_EXTRA_edd_id) += edd_id
+udev-extra-rules-$(CONFIG_UDEV_EXTRA_edd_id) += 61-persistent-storage-edd.rules
+
+udev-extra-lib-bin-$(CONFIG_UDEV_EXTRA_firmware) += firmware.sh
+udev-extra-rules-$(CONFIG_UDEV_EXTRA_firmware) += 50-firmware.rules
+
+udev-extra-lib-bin-$(CONFIG_UDEV_EXTRA_floppy) += create_floppy_devices
+
+udev-extra-lib-bin-$(CONFIG_UDEV_EXTRA_fstab_import) += fstab_import
+udev-extra-rules-$(CONFIG_UDEV_EXTRA_fstab_import) += 79-fstab_import.rules
+
+udev-extra-lib-bin-$(CONFIG_UDEV_EXTRA_path_id) += path_id
+
+udev-extra-lib-bin-$(CONFIG_UDEV_EXTRA_rule_generator) += \
+	write_cd_rules write_net_rules
+udev-extra-lib-data-$(CONFIG_UDEV_EXTRA_rule_generator) += \
+	rule_generator.functions
+udev-extra-rules-$(CONFIG_UDEV_EXTRA_rule_generator) += \
+	75-cd-aliases-generator.rules 75-persistent-net-generator.rules
+
+udev-extra-lib-bin-$(CONFIG_UDEV_EXTRA_scsi_id) += scsi_id
+
+udev-extra-lib-bin-$(CONFIG_UDEV_EXTRA_usb_id) += usb_id
 
 define Package/udev/install
-	install -d -m0775 $(1)/etc/udev
-	$(CP) $(PKG_INSTALL_DIR)/etc/udev/* $(1)/etc/udev/
-	install -d -m0775 $(1)/lib/udev
-	install -d -m0775 $(1)/sbin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/udevcontrol $(1)/sbin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/udevd $(1)/sbin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/udevsettle $(1)/sbin/
-	install -d -m0775 $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/udevinfo $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/udevtest $(1)/usr/bin/
-	install -d -m0775 $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/udevmonitor $(1)/usr/sbin/
-	install -d -m0775 $(1)/etc/udev/rules.d
-	$(CP) files/20-input-grouping.rules $(1)/etc/udev/rules.d/
-endef
+	$(INSTALL_DIR) $(1)/etc/udev/rules.d
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/udev/udev.conf $(1)/etc/udev
 
-define Package/udevtrigger/install
-	$(INSTALL_DIR) $(1)/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/udevtrigger $(1)/sbin/
-endef
-define Package/udev-vol-id/install
 	$(INSTALL_DIR) $(1)/sbin
+	$(INSTALL_BIN) \
+		$(PKG_INSTALL_DIR)/sbin/udevadm \
+		$(PKG_INSTALL_DIR)/sbin/udevd \
+		$(1)/sbin
+
+	$(INSTALL_DIR) $(1)/lib/udev/rules.d
+	$(INSTALL_DATA) \
+		$(addprefix $(PKG_INSTALL_DIR)/lib/udev/rules.d/, \
+			$(udev-extra-rules-y)) \
+		$(addprefix $(PKG_INSTALL_DIR)/lib/udev/rules.d/, \
+			50-udev-default.rules \
+			60-persistent-input.rules \
+			60-persistent-serial.rules \
+			60-persistent-storage.rules \
+			80-drivers.rules \
+			95-udev-late.rules) \
+		$(1)/lib/udev/rules.d
+
 	$(INSTALL_DIR) $(1)/lib
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/lib/libvolume_id.so* $(1)/lib/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/lib/udev/vol_id $(1)/sbin/
+	$(INSTALL_BIN) \
+		$(PKG_INSTALL_DIR)/lib/libudev.so.* \
+		$(1)/lib
+
+	$(INSTALL_DIR) $(1)/lib/udev
+ifneq ($(udev-extra-lib-bin-y),)
+		$(INSTALL_BIN) \
+			$(addprefix $(PKG_INSTALL_DIR)/lib/udev/, \
+				$(udev-extra-lib-bin-y)) \
+			$(1)/lib/udev/
+endif
+ifneq ($(udev-extra-lib-data-y),)
+		$(INSTALL_DATA) \
+			$(addprefix $(PKG_INSTALL_DIR)/lib/udev/, \
+				$(udev-extra-lib-data-y)) \
+			$(1)/lib/udev/
+endif
 endef
 
 $(eval $(call BuildPackage,udev))
-$(eval $(call BuildPackage,udevtrigger))
-$(eval $(call BuildPackage,udev-vol-id))