From 6d88260a8be069a65ab52fa924e6d4dc13c4e83c Mon Sep 17 00:00:00 2001 From: "greg@kroah.com" Date: Wed, 31 Dec 2003 20:35:02 -0800 Subject: [PATCH] [PATCH] move the config files to etc/udev to clean up main directory a bit. --- Makefile | 19 ++++++++++--------- udev.conf.in => etc/udev/udev.conf.in | 0 udev.permissions => etc/udev/udev.permissions | 0 .../udev/udev.permissions.debian | 0 udev.rules => etc/udev/udev.rules | 0 udev.rules.devfs => etc/udev/udev.rules.devfs | 0 udev.rules.demo | 9 --------- 7 files changed, 10 insertions(+), 18 deletions(-) rename udev.conf.in => etc/udev/udev.conf.in (100%) rename udev.permissions => etc/udev/udev.permissions (100%) rename udev.permissions.debian => etc/udev/udev.permissions.debian (100%) rename udev.rules => etc/udev/udev.rules (100%) rename udev.rules.devfs => etc/udev/udev.rules.devfs (100%) delete mode 100644 udev.rules.demo diff --git a/Makefile b/Makefile index 8b20612de..b27f1b92d 100644 --- a/Makefile +++ b/Makefile @@ -29,6 +29,7 @@ ROOT = udev VERSION = 011_bk INSTALL_DIR = /usr/local/bin RELEASE_NAME = $(ROOT)-$(VERSION) +LOCAL_CFG_DIR = etc/udev DESTDIR = # override this to make udev look in a different location for it's config files @@ -206,11 +207,11 @@ udev_version.h: @echo \#define UDEV_PERMISSION_FILE \"$(configdir)\udev.permissions\" >> $@ # config files automatically generated -GEN_CONFIGS = udev.conf +GEN_CONFIGS = $(LOCAL_CFG_DIR)/udev.conf # Rules on how to create the generated config files -udev.conf: - sed -e "s:@udevdir@:$(udevdir):" < udev.conf.in > $@ +$(LOCAL_CFG_DIR)/udev.conf: + sed -e "s:@udevdir@:$(udevdir):" < $(LOCAL_CFG_DIR)/udev.conf.in > $@ $(OBJS): $(GEN_HEADERS) @@ -278,16 +279,16 @@ endif install-config: $(GEN_CONFIGS) $(INSTALL) -d $(DESTDIR)$(configdir) @if [ ! -r $(DESTDIR)$(configdir)udev.conf ]; then \ - echo $(INSTALL_DATA) udev.conf $(DESTDIR)$(configdir); \ - $(INSTALL_DATA) udev.conf $(DESTDIR)$(configdir); \ + echo $(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.conf $(DESTDIR)$(configdir); \ + $(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.conf $(DESTDIR)$(configdir); \ fi @if [ ! -r $(DESTDIR)$(configdir)udev.rules ]; then \ - echo $(INSTALL_DATA) udev.rules $(DESTDIR)$(configdir); \ - $(INSTALL_DATA) udev.rules $(DESTDIR)$(configdir); \ + echo $(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.rules $(DESTDIR)$(configdir); \ + $(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.rules $(DESTDIR)$(configdir); \ fi @if [ ! -r $(DESTDIR)$(configdir)udev.permissions ]; then \ - echo $(INSTALL_DATA) udev.permissions $(DESTDIR)$(configdir); \ - $(INSTALL_DATA) udev.permissions $(DESTDIR)$(configdir); \ + echo $(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.permissions $(DESTDIR)$(configdir); \ + $(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.permissions $(DESTDIR)$(configdir); \ fi diff --git a/udev.conf.in b/etc/udev/udev.conf.in similarity index 100% rename from udev.conf.in rename to etc/udev/udev.conf.in diff --git a/udev.permissions b/etc/udev/udev.permissions similarity index 100% rename from udev.permissions rename to etc/udev/udev.permissions diff --git a/udev.permissions.debian b/etc/udev/udev.permissions.debian similarity index 100% rename from udev.permissions.debian rename to etc/udev/udev.permissions.debian diff --git a/udev.rules b/etc/udev/udev.rules similarity index 100% rename from udev.rules rename to etc/udev/udev.rules diff --git a/udev.rules.devfs b/etc/udev/udev.rules.devfs similarity index 100% rename from udev.rules.devfs rename to etc/udev/udev.rules.devfs diff --git a/udev.rules.demo b/udev.rules.demo deleted file mode 100644 index 9ea789579..000000000 --- a/udev.rules.demo +++ /dev/null @@ -1,9 +0,0 @@ -# USB camera from Fuji to be named "camera" -LABEL, BUS="usb", SYSFS_vendor="FUJIFILM", NAME="camera%n" - -# USB device plugged into the fourth port of the second hub to be called gps_device -TOPOLOGY, BUS="usb", PLACE="2.4", NAME="gps_device" - -# ttyUSB1 should always be called visor -REPLACE, KERNEL="ttyUSB1", NAME="visor" - -- 2.30.2