move some helpers from extras to /lib/udev

Signed-off-by: Kay Sievers <kay.sievers@suse.de>

4 files changed, 20 insertions, 14 deletions

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index cbec3d31ab..86a7fa8bde 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -7,16 +7,22 @@ the timing of the "bus" link creation, the former integrated logic should
 be emulated by a rule placed before all other rules:
   ACTION=="add", DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus"
 
-The option "udev_db" does no longer exist. All udev state will always
-be in /$udev_root/.udev/ now, there is no longer an option to set this
+The option "udev_db" does no longer exist. All udev state will be in
+/$udev_root/.udev/ now, there is no longer an option to set this
 to anything else.
+If the init script or something else used this value, just depend on
+this hardcoded path. But remember _all_content_ of this directory is
+still private to udev and can change at any time.
 
 Default location for rule sripts and helper programs is now: /lib/udev/.
 Everything that is not useful on the commandline should go into this
-directory. Also /lib/udev/devices/ is recommended as a directory where
-packages or the user can place real device nodes, which get copied over
-to /dev at every boot. This should replace the various solutions with
-custom config files.
+directory. Some of the helpers in the extras folder are installed there
+now. The rules need to be changed, to find the helpers there.
+
+Also /lib/udev/devices is recommended as a directory where packages or
+the user can place real device nodes, which get copied over to /dev at
+every boot. This should replace the various solutions with custom config
+files.
 
 Udevsend does no longer start the udev daemon. This must be done with
 the init script that prepares /dev on tmpfs and creates the initial nodes,
diff --git a/extras/firmware/Makefile b/extras/firmware/Makefile
index 78a7935d66..16918867fc 100644
--- a/extras/firmware/Makefile
+++ b/extras/firmware/Makefile
@@ -48,11 +48,11 @@ clean:
 .PHONY: clean
 
 install-bin: all
-	$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG)
+	$(INSTALL_PROGRAM) -D $(PROG) $(DESTDIR)$(libudevdir)/$(PROG)
 .PHONY: install-bin
 
 uninstall-bin:
-	- rm $(DESTDIR)$(sbindir)/$(PROG)
+	- rm $(DESTDIR)$(libudevdir)/$(PROG)
 .PHONY: uninstall-bin
 
 install-man:
diff --git a/extras/floppy/Makefile b/extras/floppy/Makefile
index d894a4a3e1..240af4ce05 100644
--- a/extras/floppy/Makefile
+++ b/extras/floppy/Makefile
@@ -48,11 +48,11 @@ clean:
 .PHONY: clean
 
 install-bin: all
-	$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG)
+	$(INSTALL_PROGRAM) -D $(PROG) $(DESTDIR)$(libudevdir)/$(PROG)
 .PHONY: install-bin
 
 uninstall-bin:
-	- rm $(DESTDIR)$(sbindir)/$(PROG)
+	- rm $(DESTDIR)$(libudevdir)/$(PROG)
 .PHONY: uninstall-bin
 
 install-man:
diff --git a/extras/run_directory/Makefile b/extras/run_directory/Makefile
index 7d5bccbcca..d138f62c03 100644
--- a/extras/run_directory/Makefile
+++ b/extras/run_directory/Makefile
@@ -47,13 +47,13 @@ clean:
 .PHONY: clean
 
 install-bin: all
-	$(INSTALL_PROGRAM) udev_run_devd $(DESTDIR)$(sbindir)/udev_run_devd
-	$(INSTALL_PROGRAM) udev_run_hotplugd $(DESTDIR)$(sbindir)/udev_run_hotplugd
+	$(INSTALL_PROGRAM) -D udev_run_devd $(DESTDIR)$(libudevdir)/udev_run_devd
+	$(INSTALL_PROGRAM) -D udev_run_hotplugd $(DESTDIR)$(libudevdir)/udev_run_hotplugd
 .PHONY: install-bin
 
 uninstall-bin:
-	- rm $(DESTDIR)$(sbindir)/udev_run_devd
-	- rm $(DESTDIR)$(sbindir)/udev_run_hotplugd
+	- rm $(DESTDIR)$(libudevdir)/udev_run_devd
+	- rm $(DESTDIR)$(libudevdir)/udev_run_hotplugd
 .PHONY: uninstall-bin
 
 install-man: