respect prefix= setting in built udev.conf (updated)

PATCH New Kevin P. Fleming 1 participant 1 message Sep 17, 2004 Kbuild

Share & tools

Kevin P. Fleming

author

2004-09-17 00:54 UTC #0 lore raw

PATCH 1/1 respect prefix= setting in built udev.conf (updated)

Here is a revised version of the patch. Again, it modifies the Makefile to respect the prefix= setting when putting paths to /etc/udev/{rules.s,permissions.d} into the built /etc/udev/udev.conf file. It also changes the Makefile to create this file at "make" time, not "make install" time. This allows for udevdir to be specified at "make" time (thus putting the correct path into udev.conf), but not specified at "make install" time (thus allowing the installation to proceed without trying to use the wrong directory).

Submitted By: Kevin P. Fleming <[email protected]>
Date: 2004-09-16
Initial Package Version: 032
Origin: David Jensen
Description: correct udev's Makefile and template config file to respect the "prefix=" setting supplied when it is built; also build etc/udev/udev.conf at "make" time, not "make install" time

Makefile +6 -6

diff -ur udev-orig/Makefile udev-032/Makefile
@@ -172,7 +172,10 @@
 
 CFLAGS += -I$(PWD)/libsysfs
 
-all: $(ROOT) $(SENDER) $(DAEMON) $(INFO) $(TESTER)
+# config files automatically generated
+GEN_CONFIGS =	$(LOCAL_CFG_DIR)/udev.conf
+
+all: $(ROOT) $(SENDER) $(DAEMON) $(INFO) $(TESTER) $(GEN_CONFIGS)
 	@extras="$(EXTRAS)" ; for target in $$extras ; do \
 		echo $$target ; \
 		$(MAKE) prefix=$(prefix) \

@@ -239,12 +242,9 @@
 	@echo \#define UDEV_BIN			\"$(DESTDIR)$(sbindir)/udev\" >> $@
 	@echo \#define UDEVD_BIN		\"$(DESTDIR)$(sbindir)/udevd\" >> $@
 
-# config files automatically generated
-GEN_CONFIGS =	$(LOCAL_CFG_DIR)/udev.conf
-
 # Rules on how to create the generated config files
 $(LOCAL_CFG_DIR)/udev.conf:
-	sed -e "s:@udevdir@:$(udevdir):" < $(LOCAL_CFG_DIR)/udev.conf.in > $@
+	sed -e "s:@udevdir@:$(udevdir):" -e "s:@configdir@:$(configdir):" < $(LOCAL_CFG_DIR)/udev.conf.in > $@
 
 GEN_MANPAGES   = udev.8
 GEN_MANPAGESIN = udev.8.in

@@ -338,7 +338,7 @@
 		$(INSTALL_DATA) -D etc/init.d/udev.debian $(DESTDIR)$(initdir)/udev; \
 	fi
 
-install-config: $(GEN_CONFIGS)
+install-config:
 	$(INSTALL) -d $(DESTDIR)$(configdir)/rules.d
 	$(INSTALL) -d $(DESTDIR)$(configdir)/permissions.d
 	@if [ ! -r $(DESTDIR)$(configdir)/udev.conf ]; then \

etc/udev/udev.conf.in +2 -2

diff -ur udev-orig/etc/udev/udev.conf.in udev-032/etc/udev/udev.conf.in
@@ -12,10 +12,10 @@
 udev_db="@udevdir@/.udev.tdb"
 
 # udev_rules - The name and location of the udev rules file
-udev_rules="/etc/udev/rules.d/"
+udev_rules="@configdir@/rules.d/"
 
 # udev_permissions - The name and location of the udev permission file
-udev_permissions="/etc/udev/permissions.d/"
+udev_permissions="@configdir@/permissions.d/"
 
 # default_mode - set the default mode for all nodes that have no
 #                explicit match in the permissions file