systemd: Move to /usr and drop LFS udev rules

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/common/systemd b/config/rootfiles/common/systemd
index ade70b4f0230603c9626b5d16518f9b9026bab68..b3dd31afd3ea2fa36e20919b5895b51cac74c8d8 100644 (file)
--- a/config/rootfiles/common/systemd
+++ b/config/rootfiles/common/systemd
@@ -3,109 +3,8 @@ etc/modprobe.d/blacklist.conf
 etc/udev
 etc/udev/hwdb.bin
 etc/udev/hwdb.d
-etc/udev/hwdb.d/20-OUI.hwdb
-etc/udev/hwdb.d/20-acpi-vendor.hwdb
-etc/udev/hwdb.d/20-bluetooth-vendor-product.hwdb
-etc/udev/hwdb.d/20-dmi-id.hwdb
-etc/udev/hwdb.d/20-net-ifname.hwdb
-etc/udev/hwdb.d/20-pci-classes.hwdb
-etc/udev/hwdb.d/20-pci-vendor-model.hwdb
-etc/udev/hwdb.d/20-sdio-classes.hwdb
-etc/udev/hwdb.d/20-sdio-vendor-model.hwdb
-etc/udev/hwdb.d/20-usb-classes.hwdb
-etc/udev/hwdb.d/20-usb-vendor-model.hwdb
-etc/udev/hwdb.d/20-vmbus-class.hwdb
-etc/udev/hwdb.d/60-autosuspend-chromiumos.hwdb
-etc/udev/hwdb.d/60-autosuspend-fingerprint-reader.hwdb
-etc/udev/hwdb.d/60-autosuspend.hwdb
-etc/udev/hwdb.d/60-evdev.hwdb
-etc/udev/hwdb.d/60-input-id.hwdb
-etc/udev/hwdb.d/60-keyboard.hwdb
-etc/udev/hwdb.d/60-seat.hwdb
-etc/udev/hwdb.d/60-sensor.hwdb
-etc/udev/hwdb.d/70-analyzers.hwdb
-etc/udev/hwdb.d/70-av-production.hwdb
-etc/udev/hwdb.d/70-cameras.hwdb
-etc/udev/hwdb.d/70-hardware-wallets.hwdb
-etc/udev/hwdb.d/70-joystick.hwdb
-etc/udev/hwdb.d/70-lights.hwdb
-etc/udev/hwdb.d/70-maker-tools.hwdb
-etc/udev/hwdb.d/70-mouse.hwdb
-etc/udev/hwdb.d/70-pda.hwdb
-etc/udev/hwdb.d/70-pointingstick.hwdb
-etc/udev/hwdb.d/70-software-radio.hwdb
-etc/udev/hwdb.d/70-sound-card.hwdb
-etc/udev/hwdb.d/70-touchpad.hwdb
-etc/udev/hwdb.d/80-ieee1394-unit-function.hwdb
-etc/udev/hwdb.d/82-net-auto-link-local.hwdb
-#etc/udev/hwdb.d/README
 #etc/udev/rules.d
-etc/udev/rules.d/55-lfs.rules
 etc/udev/udev.conf
-#lib/libudev.so
-lib/libudev.so.1
-lib/libudev.so.1.7.11
-lib/udev
-lib/udev/ata_id
-lib/udev/cdrom_id
-lib/udev/dmi_memory_id
-lib/udev/fido_id
-lib/udev/hwdb.d
-lib/udev/iocost
-lib/udev/mtd_probe
-lib/udev/network-aqm
-lib/udev/network-hotplug-master
-lib/udev/network-hotplug-rename
-lib/udev/network-hotplug-vlan
-lib/udev/network-offloading
-#lib/udev/rules.d
-lib/udev/rules.d/25-alsa.rules
-lib/udev/rules.d/50-udev-default.rules
-lib/udev/rules.d/60-autosuspend.rules
-lib/udev/rules.d/60-block.rules
-lib/udev/rules.d/60-cdrom_id.rules
-lib/udev/rules.d/60-dmi-id.rules
-lib/udev/rules.d/60-drm.rules
-lib/udev/rules.d/60-evdev.rules
-lib/udev/rules.d/60-fido-id.rules
-lib/udev/rules.d/60-infiniband.rules
-lib/udev/rules.d/60-input-id.rules
-lib/udev/rules.d/60-net.rules
-lib/udev/rules.d/60-persistent-alsa.rules
-lib/udev/rules.d/60-persistent-hidraw.rules
-lib/udev/rules.d/60-persistent-input.rules
-lib/udev/rules.d/60-persistent-media-controller.rules
-lib/udev/rules.d/60-persistent-storage-mtd.rules
-lib/udev/rules.d/60-persistent-storage-tape.rules
-lib/udev/rules.d/60-persistent-storage.rules
-lib/udev/rules.d/60-persistent-v4l.rules
-lib/udev/rules.d/60-sensor.rules
-lib/udev/rules.d/60-serial.rules
-lib/udev/rules.d/61-extrahd.rules
-lib/udev/rules.d/64-btrfs.rules
-lib/udev/rules.d/70-camera.rules
-lib/udev/rules.d/70-joystick.rules
-lib/udev/rules.d/70-memory.rules
-lib/udev/rules.d/70-mouse.rules
-lib/udev/rules.d/70-power-switch.rules
-lib/udev/rules.d/70-touchpad.rules
-lib/udev/rules.d/75-net-description.rules
-lib/udev/rules.d/75-probe_mtd.rules
-lib/udev/rules.d/78-sound-card.rules
-lib/udev/rules.d/80-drivers.rules
-lib/udev/rules.d/80-net-setup-link.rules
-lib/udev/rules.d/81-net-bridge.rules
-lib/udev/rules.d/81-net-dhcp.rules
-lib/udev/rules.d/82-net-auto-link-local.rules
-lib/udev/rules.d/90-image-dissect.rules
-lib/udev/rules.d/90-iocost.rules
-lib/udev/rules.d/99-aqm.rules
-lib/udev/rules.d/99-offloading.rules
-lib/udev/rules.d/99-systemd.rules
-#lib/udev/rules.d/README
-lib/udev/scsi_id
-lib/udev/v4l_id
-sbin/udevadm
 sbin/udevd
 usr/bin/udev-hwdb
 #usr/include/libudev.h
@@ -158,15 +57,105 @@ usr/bin/udev-hwdb
 #usr/lib/libsystemd.so
 usr/lib/libsystemd.so.0
 usr/lib/libsystemd.so.0.41.0
+#usr/lib/libudev.so
+usr/lib/libudev.so.1
+usr/lib/libudev.so.1.7.11
 #usr/lib/pkgconfig/libsystemd.pc
 #usr/lib/pkgconfig/libudev.pc
 usr/lib/udev
-usr/lib/udev/init-net-rules.sh
-usr/lib/udev/rule_generator.functions
+usr/lib/udev/ata_id
+usr/lib/udev/cdrom_id
+usr/lib/udev/dmi_memory_id
+usr/lib/udev/fido_id
+usr/lib/udev/hwdb.d
+usr/lib/udev/hwdb.d/20-OUI.hwdb
+usr/lib/udev/hwdb.d/20-acpi-vendor.hwdb
+usr/lib/udev/hwdb.d/20-bluetooth-vendor-product.hwdb
+usr/lib/udev/hwdb.d/20-dmi-id.hwdb
+usr/lib/udev/hwdb.d/20-net-ifname.hwdb
+usr/lib/udev/hwdb.d/20-pci-classes.hwdb
+usr/lib/udev/hwdb.d/20-pci-vendor-model.hwdb
+usr/lib/udev/hwdb.d/20-sdio-classes.hwdb
+usr/lib/udev/hwdb.d/20-sdio-vendor-model.hwdb
+usr/lib/udev/hwdb.d/20-usb-classes.hwdb
+usr/lib/udev/hwdb.d/20-usb-vendor-model.hwdb
+usr/lib/udev/hwdb.d/20-vmbus-class.hwdb
+usr/lib/udev/hwdb.d/60-autosuspend-chromiumos.hwdb
+usr/lib/udev/hwdb.d/60-autosuspend-fingerprint-reader.hwdb
+usr/lib/udev/hwdb.d/60-autosuspend.hwdb
+usr/lib/udev/hwdb.d/60-evdev.hwdb
+usr/lib/udev/hwdb.d/60-input-id.hwdb
+usr/lib/udev/hwdb.d/60-keyboard.hwdb
+usr/lib/udev/hwdb.d/60-seat.hwdb
+usr/lib/udev/hwdb.d/60-sensor.hwdb
+usr/lib/udev/hwdb.d/70-analyzers.hwdb
+usr/lib/udev/hwdb.d/70-av-production.hwdb
+usr/lib/udev/hwdb.d/70-cameras.hwdb
+usr/lib/udev/hwdb.d/70-hardware-wallets.hwdb
+usr/lib/udev/hwdb.d/70-joystick.hwdb
+usr/lib/udev/hwdb.d/70-lights.hwdb
+usr/lib/udev/hwdb.d/70-maker-tools.hwdb
+usr/lib/udev/hwdb.d/70-mouse.hwdb
+usr/lib/udev/hwdb.d/70-pda.hwdb
+usr/lib/udev/hwdb.d/70-pointingstick.hwdb
+usr/lib/udev/hwdb.d/70-software-radio.hwdb
+usr/lib/udev/hwdb.d/70-sound-card.hwdb
+usr/lib/udev/hwdb.d/70-touchpad.hwdb
+usr/lib/udev/hwdb.d/80-ieee1394-unit-function.hwdb
+usr/lib/udev/hwdb.d/82-net-auto-link-local.hwdb
+usr/lib/udev/hwdb.d/README
+usr/lib/udev/iocost
+usr/lib/udev/mtd_probe
+usr/lib/udev/network-aqm
+usr/lib/udev/network-hotplug-master
+usr/lib/udev/network-hotplug-rename
+usr/lib/udev/network-hotplug-vlan
+usr/lib/udev/network-offloading
 usr/lib/udev/rules.d
-usr/lib/udev/write_net_rules
-#usr/share/doc/udev-20230818
-#usr/share/doc/udev-20230818/lfs
-#usr/share/doc/udev-20230818/lfs/55-lfs.txt
-#usr/share/doc/udev-20230818/lfs/README
+usr/lib/udev/rules.d/25-alsa.rules
+usr/lib/udev/rules.d/50-udev-default.rules
+usr/lib/udev/rules.d/60-autosuspend.rules
+usr/lib/udev/rules.d/60-block.rules
+usr/lib/udev/rules.d/60-cdrom_id.rules
+usr/lib/udev/rules.d/60-dmi-id.rules
+usr/lib/udev/rules.d/60-drm.rules
+usr/lib/udev/rules.d/60-evdev.rules
+usr/lib/udev/rules.d/60-fido-id.rules
+usr/lib/udev/rules.d/60-infiniband.rules
+usr/lib/udev/rules.d/60-input-id.rules
+usr/lib/udev/rules.d/60-net.rules
+usr/lib/udev/rules.d/60-persistent-alsa.rules
+usr/lib/udev/rules.d/60-persistent-hidraw.rules
+usr/lib/udev/rules.d/60-persistent-input.rules
+usr/lib/udev/rules.d/60-persistent-media-controller.rules
+usr/lib/udev/rules.d/60-persistent-storage-mtd.rules
+usr/lib/udev/rules.d/60-persistent-storage-tape.rules
+usr/lib/udev/rules.d/60-persistent-storage.rules
+usr/lib/udev/rules.d/60-persistent-v4l.rules
+usr/lib/udev/rules.d/60-sensor.rules
+usr/lib/udev/rules.d/60-serial.rules
+usr/lib/udev/rules.d/61-extrahd.rules
+usr/lib/udev/rules.d/64-btrfs.rules
+usr/lib/udev/rules.d/70-camera.rules
+usr/lib/udev/rules.d/70-joystick.rules
+usr/lib/udev/rules.d/70-memory.rules
+usr/lib/udev/rules.d/70-mouse.rules
+usr/lib/udev/rules.d/70-power-switch.rules
+usr/lib/udev/rules.d/70-touchpad.rules
+usr/lib/udev/rules.d/75-net-description.rules
+usr/lib/udev/rules.d/75-probe_mtd.rules
+usr/lib/udev/rules.d/78-sound-card.rules
+usr/lib/udev/rules.d/80-drivers.rules
+usr/lib/udev/rules.d/80-net-setup-link.rules
+usr/lib/udev/rules.d/81-net-bridge.rules
+usr/lib/udev/rules.d/81-net-dhcp.rules
+usr/lib/udev/rules.d/82-net-auto-link-local.rules
+usr/lib/udev/rules.d/90-image-dissect.rules
+usr/lib/udev/rules.d/90-iocost.rules
+usr/lib/udev/rules.d/99-aqm.rules
+usr/lib/udev/rules.d/99-offloading.rules
+usr/lib/udev/rules.d/99-systemd.rules
+usr/lib/udev/rules.d/README
+usr/lib/udev/scsi_id
+usr/lib/udev/v4l_id
 #usr/share/pkgconfig/udev.pc

diff --git a/config/udev/60-net.rules b/config/udev/60-net.rules
index f4850b9dd5b3fb371a69b8afdd596dd7d5433fc6..bb3f1f67a45f79797793aa6af95e7b2557b83744 100644 (file)
--- a/config/udev/60-net.rules
+++ b/config/udev/60-net.rules
@@ -1,10 +1,10 @@
 # Call a script that checks for the right name of the new device.
 # If it matches the configuration it will be renamed accordingly.
-ACTION=="add", SUBSYSTEM=="net", PROGRAM="/lib/udev/network-hotplug-rename", RESULT=="?*", NAME="$result"
+ACTION=="add", SUBSYSTEM=="net", PROGRAM="/usr/lib/udev/network-hotplug-rename", RESULT=="?*", NAME="$result"
 
 # Call a script that will create all virtual devices for a parent device
 # that has just come up.
-ACTION=="add", SUBSYSTEM=="net", RUN+="/lib/udev/network-hotplug-vlan"
+ACTION=="add", SUBSYSTEM=="net", RUN+="/usr/lib/udev/network-hotplug-vlan"
 
 # Call a script that will set up interfaces that have a master interface (bridges, bonding, ..)
-ACTION=="add", SUBSYSTEM=="net", RUN+="/lib/udev/network-hotplug-master"
+ACTION=="add", SUBSYSTEM=="net", RUN+="/usr/lib/udev/network-hotplug-master"

diff --git a/config/udev/99-aqm.rules b/config/udev/99-aqm.rules
index 69c909da78976b1a099c2e65c2436a1fc54dc3ad..3c6d0df0ba2edcff5fb7c8521e770890e92696ab 100644 (file)
--- a/config/udev/99-aqm.rules
+++ b/config/udev/99-aqm.rules
@@ -1,2 +1,2 @@
 # Call the AQM script
-SUBSYSTEM=="net", RUN+="/lib/udev/network-aqm"
+SUBSYSTEM=="net", RUN+="/usr/lib/udev/network-aqm"

diff --git a/config/udev/99-offloading.rules b/config/udev/99-offloading.rules
index 5387971aca477d79a35498a12cb6e1bc4406fad4..399424bceed5fb695b5f17e737927487e4f76970 100644 (file)
--- a/config/udev/99-offloading.rules
+++ b/config/udev/99-offloading.rules
@@ -1,2 +1,2 @@
 # Call the offloading script
-SUBSYSTEM=="net", RUN+="/lib/udev/network-offloading"
+SUBSYSTEM=="net", RUN+="/usr/lib/udev/network-offloading"

diff --git a/config/udev/udev.conf b/config/udev/udev.conf
deleted file mode 100644 (file)
index 31bb662..0000000
--- a/config/udev/udev.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# The initial syslog(3) priority: "err", "info", "debug" or its
-# numerical equivalent. For runtime debugging, the daemons internal
-# state can be changed with: "udevadm control --log-priority=<value>".
-udev_log="err"

diff --git a/lfs/systemd b/lfs/systemd
index 7a089444519594cf61d6f41fe0028855e1f52fd6..1e53a4f03a28abc49dfd4e6afae57a94dd1ecc63 100644 (file)
--- a/lfs/systemd
+++ b/lfs/systemd
@@ -25,7 +25,6 @@
 include Config
 
 VER        = 258
-RULES_VER  = 20230818
 
 THISAPP    = systemd-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -47,13 +46,11 @@ UDEV_HELPERS = \
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE) udev-lfs-$(RULES_VER).tar.xz
+objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-udev-lfs-$(RULES_VER).tar.xz = $(DL_FROM)/udev-lfs-$(RULES_VER).tar.xz
 
 $(DL_FILE)_BLAKE2 = c63bc09bff11ba4cf6e87bef689250a6b354bf8f5bfb5af6d2a173fa1e1838aa457a8a7db66f7aad20dae25b7a0defddcb052d53f18a688a2dd6d5f323d4692a
-udev-lfs-$(RULES_VER).tar.xz_BLAKE2 = e8c20bdddb5191381bad11bf46b0d605ce952afb697e8bf3e80b216c64eacbb327d0d961c5a1f49291576c82452e8472bb62f31f8bacc81eb832aa746a5234d4
 
 install : $(TARGET)
 
@@ -83,7 +80,6 @@ $(subst %,%_BLAKE2,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && tar axf $(DIR_DL)/udev-lfs-$(RULES_VER).tar.xz
 
        # Don't fail if the linker shows a warning
        cd $(DIR_APP) && sed -e "/fatal-warnings/d" -i meson.build
@@ -129,67 +125,59 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP)/build && cp      -av    libsystemd.so{,*[0-9]}      /usr/lib/
 
        # Install udev
-       cd $(DIR_APP)/build && install -vm755 -d {/lib,/etc}/udev/{hwdb,rules}.d
+       cd $(DIR_APP)/build && install -vm755 -d {/usr/lib,/etc}/udev/{hwdb,rules}.d
        cd $(DIR_APP)/build && install -vm755 udevadm                     /bin/
        cd $(DIR_APP)/build && install -vm755 systemd-hwdb                /usr/bin/udev-hwdb
        cd $(DIR_APP)/build && ln      -svfn  ../bin/udevadm              /sbin/udevd
-       cd $(DIR_APP)/build && ln      -svfn  ../bin/udevadm              /sbin/udevadm
-       cd $(DIR_APP)/build && cp      -av    libudev.so{,*[0-9]}         /lib/
+       cd $(DIR_APP)/build && cp      -av    libudev.so{,*[0-9]}         /usr/lib/
        cd $(DIR_APP)/build && install -vm644 ../src/libudev/libudev.h    /usr/include/
        cd $(DIR_APP)/build && install -vm644 src/libudev/*.pc            /usr/lib/pkgconfig/
        cd $(DIR_APP)/build && install -vm644 src/udev/*.pc               /usr/share/pkgconfig/
        cd $(DIR_APP)/build && install -vm644 ../src/udev/udev.conf       /etc/udev/
-       cd $(DIR_APP)/build && install -vm644 rules.d/* ../rules.d/{*.rules,README} /lib/udev/rules.d/
-       cd $(DIR_APP)/build && install -vm644 hwdb.d/*  ../hwdb.d/{*.hwdb,README}   /etc/udev/hwdb.d/
-       cd $(DIR_APP)/build && install -vm755 $(UDEV_HELPERS) /lib/udev
+       cd $(DIR_APP)/build && install -vm644 rules.d/* ../rules.d/{*.rules,README} /usr/lib/udev/rules.d/
+       cd $(DIR_APP)/build && install -vm644 hwdb.d/*  ../hwdb.d/{*.hwdb,README}   /usr/lib/udev/hwdb.d/
+       cd $(DIR_APP)/build && install -vm755 $(UDEV_HELPERS) /usr/lib/udev
 
        # Generate hardware database
        udev-hwdb update
 
-       # Install rules
-       cd $(DIR_APP) && make -f udev-lfs-$(RULES_VER)/Makefile.lfs install
-
        # Disable net generator rule. This does not work with the setup.
-       rm -f /lib/udev/rules.d/75-persistent-net-generator.rules
-       rm -f /lib/udev/rules.d/80-net-name-slot.rules
+       rm -f /usr/lib/udev/rules.d/75-persistent-net-generator.rules
+       rm -f /usr/lib/udev/rules.d/80-net-name-slot.rules
 
        # Blacklist some modules
        cp -vf $(DIR_SRC)/config/udev/blacklist.conf \
                /etc/modprobe.d/blacklist.conf
 
-       # Install config file
-       install -v -m 644 $(DIR_SRC)/config/udev/udev.conf \
-               /etc/udev/
-
        # Install alsa rules.
        install -v -m 644 $(DIR_SRC)/config/udev/25-alsa.rules \
-               /lib/udev/rules.d
+               /usr/lib/udev/rules.d
 
        # Install network rules.
        install -v -m 755 $(DIR_SRC)/config/udev/network-hotplug-rename \
-               /lib/udev/network-hotplug-rename
+               /usr/lib/udev/network-hotplug-rename
        install -v -m 755 $(DIR_SRC)/config/udev/network-hotplug-vlan \
-               /lib/udev/network-hotplug-vlan
+               /usr/lib/udev/network-hotplug-vlan
        install -v -m 755 $(DIR_SRC)/config/udev/network-hotplug-master \
-               /lib/udev/network-hotplug-master
+               /usr/lib/udev/network-hotplug-master
        install -v -m 644 $(DIR_SRC)/config/udev/60-net.rules \
-               /lib/udev/rules.d
+               /usr/lib/udev/rules.d
 
        # Install ExtraHD rules
        install -v -m 644 $(DIR_SRC)/config/udev/61-extrahd.rules \
-               /lib/udev/rules.d
+               /usr/lib/udev/rules.d
 
        # Install AQM rules
        install -v -m 644 $(DIR_SRC)/config/udev/99-aqm.rules \
-               /lib/udev/rules.d
+               /usr/lib/udev/rules.d
        install -m 755 $(DIR_SRC)/config/udev/network-aqm \
-               /lib/udev/network-aqm
+               /usr/lib/udev/network-aqm
 
        # Install offloading rules
        install -v -m 644 $(DIR_SRC)/config/udev/99-offloading.rules \
-               /lib/udev/rules.d
+               /usr/lib/udev/rules.d
        install -m 755 $(DIR_SRC)/config/udev/network-offloading \
-               /lib/udev/network-offloading
+               /usr/lib/udev/network-offloading
 
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)