chore: do not use /usr/etc/udev

It is not supported by systemd upstream and we decided to move system extensions' rules to be stored alongside system rules in /usr/lib/udev/rules.d Ref: siderolabs#1053 Reverts: siderolabs#1053 Signed-off-by: Dmitry Sharshakov <[email protected]>
dsseng · Oct 23, 2024 · 84b8df8 · 84b8df8
1 parent c9282c8
commit 84b8df8
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 287 deletions.
diff --git a/systemd-udevd/patches/0001-shared-udev-use-SYSCONF_DIR-instead-of-etc-for-syste.patch b/systemd-udevd/patches/0001-shared-udev-use-SYSCONF_DIR-instead-of-etc-for-syste.patch
diff --git a/systemd-udevd/pkg.yaml b/systemd-udevd/pkg.yaml
@@ -52,14 +52,11 @@ steps:
 
         # Own patches
         patch -p1 < /pkg/patches/0001-chore-musl-headers-compatibility-for-udev.patch
-        # TODO: remove when upstreamed (https://github.com/systemd/systemd/pull/34632)
-        patch -p1 < /pkg/patches/0001-shared-udev-use-SYSCONF_DIR-instead-of-etc-for-syste.patch
 
         meson setup build \
           --buildtype=release \
           -Dmode=release \
           -Dlibdir=/usr/lib \
-          -Dsysconfdir=/usr/etc \
           -Dversion-tag="{{ .systemd_version }}-talos" \
           -Dselinux=enabled \
           -Dblkid=enabled \
@@ -116,9 +113,6 @@ steps:
         mkdir -p /rootfs/usr/share/pkgconfig/
         cp /installroot/usr/lib/pkgconfig/libudev.pc /rootfs/usr/lib/pkgconfig/
         cp /installroot/usr/share/pkgconfig/udev.pc /rootfs/usr/share/pkgconfig/
-
-        mkdir -p /rootfs/usr/etc/
-        cp -r /installroot/usr/etc/udev /rootfs/usr/etc/
         cp -r /installroot/usr/include /rootfs/usr/
 
         # Build hwdb.bin