summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlf Samuelsson <ulf.samuelsson@atmel.com>2007-08-11 16:50:49 +0000
committerUlf Samuelsson <ulf.samuelsson@atmel.com>2007-08-11 16:50:49 +0000
commit673e3ca2e46871cd2ff34aa3b3f0c25f695ed3f2 (patch)
tree66f4cb2e6a67fd9b0b3e0bfa7f048365131008e1
parent28625ea369ebc99920b5a7f626d3fa6e68d1b028 (diff)
Bump udev version, add rules
-rwxr-xr-xpackage/udev/S10udev1
-rw-r--r--package/udev/udev.mk15
2 files changed, 13 insertions, 3 deletions
diff --git a/package/udev/S10udev b/package/udev/S10udev
index 220fbcef6..5b663a00d 100755
--- a/package/udev/S10udev
+++ b/package/udev/S10udev
@@ -64,6 +64,7 @@ case "$1" in
echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
$UDEV_BIN -d || (echo "FAIL" && exit 1)
$UDEVSTART_BIN || (echo "FAIL" && exit 1)
+ mount -t devpts /dev/pts /dev/pts || (echo "FAIL" && exit 1)
echo "done"
;;
stop)
diff --git a/package/udev/udev.mk b/package/udev/udev.mk
index b6b050fd9..1e9f87d48 100644
--- a/package/udev/udev.mk
+++ b/package/udev/udev.mk
@@ -3,7 +3,7 @@
# udev
#
#############################################################
-UDEV_VERSION:=101
+UDEV_VERSION:=114
UDEV_SOURCE:=udev-$(UDEV_VERSION).tar.bz2
UDEV_SITE:=ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/
UDEV_CAT:=$(BZCAT)
@@ -46,6 +46,9 @@ $(TARGET_DIR)/$(UDEV_TARGET_BINARY): $(UDEV_DIR)/$(UDEV_BINARY)
USE_LOG=false USE_SELINUX=false \
udevdir=$(UDEV_ROOT) -C $(UDEV_DIR) install
$(INSTALL) -m 0755 package/udev/S10udev $(TARGET_DIR)/etc/init.d
+ $(INSTALL) -m 0644 $(UDEV_DIR)/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 $(UDEV_DIR)/udevstart $(TARGET_DIR)/sbin/udevstart
rm -rf $(TARGET_DIR)/usr/share/man
ifneq ($(strip $(BR2_PACKAGE_UDEV_UTILS)),y)
rm -f $(TARGET_DIR)/usr/sbin/udevmonitor
@@ -82,6 +85,9 @@ udev-volume_id-clean:
udev-volume_id-dirclean:
-$(MAKE) EXTRAS="extras/volume_id" -C $(UDEV_DIR) clean
+
+UDEV_CLEAN_DEPS+=udev-volume_id-clean
+UDEV_DIRCLEAN_DEPS+=udev-volume_id-dirclean
endif
ifeq ($(strip $(BR2_PACKAGE_UDEV_SCSI_ID)),y)
@@ -104,15 +110,18 @@ udev-scsi_id-clean:
udev-scsi_id-dirclean:
-$(MAKE) EXTRAS="extras/scsi_id" -C $(UDEV_DIR) clean
+
+UDEV_CLEAN_DEPS+=udev-scsi_id-clean
+UDEV_DIRCLEAN_DEPS+=udev-scsi_id-dirclean
endif
-udev-clean: udev-volume_id-clean udev-scsi_id-clean
+udev-clean: $(UDEV_CLEAN_DEPS)
rm -f $(TARGET_DIR)/etc/init.d/S10udev $(TARGET_DIR)/sbin/udev*
rm -f $(TARGET_DIR)/usr/sbin/udevmonitor $(TARGET_DIR)/usr/bin/udev*
rmdir $(TARGET_DIR)/sys
-$(MAKE) -C $(UDEV_DIR) clean
-udev-dirclean: udev-volume_id-dirclean udev-scsi_id-dirclean
+udev-dirclean: $(UDEV_DIRCLEAN_DEPS)
rm -rf $(UDEV_DIR)
#############################################################