udev: Update to systemd 258

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

diff --git a/lfs/udev b/lfs/udev
index 2b1be02cd5459d0b6c4e1d53f430bcf0c398b4de..05f56372d6b632dd0090b2724a5c9d6e5a1a5a9a 100644 (file)
--- a/lfs/udev
+++ b/lfs/udev
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 254
+VER        = 258
 RULES_VER  = 20230818
 
 THISAPP    = systemd-$(VER)
@@ -33,6 +33,16 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
+UDEV_HELPERS = \
+       ata_id \
+       cdrom_id \
+       dmi_memory_id \
+       fido_id \
+       iocost \
+       mtd_probe \
+       scsi_id \
+       v4l_id
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -42,7 +52,7 @@ objects = $(DL_FILE) udev-lfs-$(RULES_VER).tar.xz
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 udev-lfs-$(RULES_VER).tar.xz = $(DL_FROM)/udev-lfs-$(RULES_VER).tar.xz
 
-$(DL_FILE)_BLAKE2 = 4703ac102dd0003a2ef59dfd9b6fc6345b57cf1ff6397ebc71b3e9abb35ad5b891d114038a91eddba25b4ec81b8208a36691bc5490173b223ba35842cd1776d4
+$(DL_FILE)_BLAKE2 = c63bc09bff11ba4cf6e87bef689250a6b354bf8f5bfb5af6d2a173fa1e1838aa457a8a7db66f7aad20dae25b7a0defddcb052d53f18a688a2dd6d5f323d4692a
 udev-lfs-$(RULES_VER).tar.xz_BLAKE2 = e8c20bdddb5191381bad11bf46b0d605ce952afb697e8bf3e80b216c64eacbb327d0d961c5a1f49291576c82452e8472bb62f31f8bacc81eb832aa746a5234d4
 
 install : $(TARGET)
@@ -73,7 +83,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) && patch -Np1 < $(DIR_SRC)/src/patches/systemd-254-linux-6.12-fs.patch
        cd $(DIR_APP) && tar axf $(DIR_DL)/udev-lfs-$(RULES_VER).tar.xz
 
        # Don't fail if the linker shows a warning
@@ -88,22 +97,24 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
        # Prepare udev for build.
        cd $(DIR_APP) && mkdir -pv build
-       cd $(DIR_APP)/build &&  meson setup \
+       cd $(DIR_APP)/build &&meson setup \
                --prefix=/usr \
                --buildtype=release \
-               -Dmode=release \
-               -Ddev-kvm-mode=0660 \
-               -Dlink-udev-shared=false \
+               -D mode=release \
+               -D dev-kvm-mode=0660 \
+               -D link-udev-shared=false \
+               -D logind=false \
+               -D vconsole=false \
                ..
 
        # Only build udev and required components
-       cd $(DIR_APP)/build && ninja udevadm systemd-hwdb \
-               $$(grep -o -E "^build (src/libudev|src/udev|rules.d|hwdb.d)[^:]*" \
-               build.ninja | awk '{ print $$2 }') \
-               $$(realpath libudev.so --relative-to .)
-
-       # Drop udev rules which requires a full systemd installation
-       cd $(DIR_APP)/build && rm -vf rules.d/90-vconsole.rules
+       cd $(DIR_APP)/build && \
+               ninja \
+                       udevadm \
+                       systemd-hwdb \
+                       $$(ninja -n | grep -Eo '(src/(lib)?udev|rules.d|hwdb.d)/[^ ]*') \
+                       $$(realpath libudev.so --relative-to .) \
+                       $(UDEV_HELPERS)
 
        # Install udev
        cd $(DIR_APP)/build && install -vm755 -d {/lib,/etc}/udev/{hwdb,rules}.d
@@ -119,7 +130,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        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 $$(find src/udev -type f | grep -F -v ".") /lib/udev
+       cd $(DIR_APP)/build && install -vm755 $(UDEV_HELPERS) /lib/udev
 
        # Generate hardware database
        udev-hwdb update

diff --git a/src/patches/systemd-254-linux-6.12-fs.patch b/src/patches/systemd-254-linux-6.12-fs.patch
deleted file mode 100644 (file)
index 267afcc..0000000
--- a/src/patches/systemd-254-linux-6.12-fs.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Naur systemd-254.org/src/basic/filesystems-gperf.gperf systemd-254/src/basic/filesystems-gperf.gperf
---- systemd-254.org/src/basic/filesystems-gperf.gperf  2023-07-28 10:26:32.000000000 +0200
-+++ systemd-254/src/basic/filesystems-gperf.gperf      2024-11-27 14:27:23.071774791 +0100
-@@ -28,6 +28,7 @@
- anon_inodefs,    {ANON_INODE_FS_MAGIC}
- autofs,          {AUTOFS_SUPER_MAGIC}
- balloon-kvm,     {BALLOON_KVM_MAGIC}
-+bcachefs,        {BCACHEFS_SUPER_MAGIC}
- bdev,            {BDEVFS_MAGIC}
- binder,          {BINDERFS_SUPER_MAGIC}
- binfmt_misc,     {BINFMTFS_MAGIC}
-@@ -91,6 +92,7 @@
- openpromfs,      {OPENPROM_SUPER_MAGIC}
- orangefs,        {ORANGEFS_DEVREQ_MAGIC}
- overlay,         {OVERLAYFS_SUPER_MAGIC}
-+pidfs,           {PID_FS_MAGIC}
- pipefs,          {PIPEFS_MAGIC}
- ppc-cmm,         {PPC_CMM_MAGIC}
- proc,            {PROC_SUPER_MAGIC}