From 6d5f49b92c1a2aed4700ec21e57b2092c6904236 Mon Sep 17 00:00:00 2001 From: Dmitry Sharshakov Date: Mon, 21 Oct 2024 20:34:11 +0200 Subject: [PATCH] chore: move udev rules Ref: siderolabs/pkgs#1053 Signed-off-by: Dmitry Sharshakov --- .kres.yaml | 2 +- Makefile | 4 ++-- README.md | 2 +- internal/base/pkg.yaml | 2 +- .../nvidia-container-toolkit/nvidia-pkgs/lts/pkg.yaml | 4 ++-- .../nvidia-pkgs/production/pkg.yaml | 4 ++-- power/nut-client/pkg.yaml | 2 +- storage/iscsi-tools/open-iscsi/pkg.yaml | 2 +- storage/mdadm/pkg.yaml | 6 +++--- storage/zfs/zfs-tools/pkg.yaml | 4 ++-- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.kres.yaml b/.kres.yaml index 1353be19..bf48e9df 100644 --- a/.kres.yaml +++ b/.kres.yaml @@ -62,7 +62,7 @@ spec: - name: EXTENSIONS_IMAGE_REF defaultValue: $(REGISTRY_AND_USERNAME)/extensions:$(TAG) - name: PKGS - defaultValue: v1.9.0-alpha.0-24-gbe92da0 + defaultValue: v1.9.0-alpha.0-28-g38304a6 - name: PKGS_PREFIX defaultValue: ghcr.io/siderolabs useBldrPkgTagResolver: true diff --git a/Makefile b/Makefile index 97feb77a..55e4d589 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2024-10-18T11:22:11Z by kres 34e72ac. +# Generated on 2024-10-23T15:05:59Z by kres 6d3cad4. # common variables @@ -48,7 +48,7 @@ COMMON_ARGS += --build-arg=PKGS_PREFIX="$(PKGS_PREFIX)" # extra variables EXTENSIONS_IMAGE_REF ?= $(REGISTRY_AND_USERNAME)/extensions:$(TAG) -PKGS ?= v1.9.0-alpha.0-24-gbe92da0 +PKGS ?= v1.9.0-alpha.0-28-g38304a6 PKGS_PREFIX ?= ghcr.io/siderolabs # targets defines all the available targets diff --git a/README.md b/README.md index 72228f74..f624fc39 100644 --- a/README.md +++ b/README.md @@ -197,7 +197,7 @@ Any paths in the `rootfs` should be contained within the following hierarchies: - `/lib/firmware/` - `/lib/modules/` - `/lib64/ld-linux-x86-64.so.2` -- `/usr/etc/udev/rules.d/` +- `/usr/lib/udev/rules.d/` - `/usr/local/` - `/usr/share/glvnd/` - `/usr/share/egl/` diff --git a/internal/base/pkg.yaml b/internal/base/pkg.yaml index 518e3790..613db332 100644 --- a/internal/base/pkg.yaml +++ b/internal/base/pkg.yaml @@ -4,7 +4,7 @@ shell: /toolchain/bin/bash dependencies: - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/base:{{ .BUILD_ARG_PKGS }}" - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/ca-certificates:{{ .BUILD_ARG_PKGS }}" - - image: ghcr.io/siderolabs/extensions-validator:aa3b467 + - image: ghcr.io/siderolabs/extensions-validator:399d8f0 finalize: - from: / to: / diff --git a/nvidia-gpu/nvidia-container-toolkit/nvidia-pkgs/lts/pkg.yaml b/nvidia-gpu/nvidia-container-toolkit/nvidia-pkgs/lts/pkg.yaml index 7568662a..9bd14e3c 100644 --- a/nvidia-gpu/nvidia-container-toolkit/nvidia-pkgs/lts/pkg.yaml +++ b/nvidia-gpu/nvidia-container-toolkit/nvidia-pkgs/lts/pkg.yaml @@ -89,10 +89,10 @@ steps: mkdir -p /rootfs/usr/local/lib/containers/nvidia-persistenced \ /rootfs/usr/local/etc/containers \ - /rootfs/usr/etc/udev/rules.d + /rootfs/usr/lib/udev/rules.d # copy udev rule - cp /pkg/files/15-nvidia-device.rules /rootfs/usr/etc/udev/rules.d + cp /pkg/files/15-nvidia-device.rules /rootfs/usr/lib/udev/rules.d finalize: - from: /rootfs to: /rootfs diff --git a/nvidia-gpu/nvidia-container-toolkit/nvidia-pkgs/production/pkg.yaml b/nvidia-gpu/nvidia-container-toolkit/nvidia-pkgs/production/pkg.yaml index b9b43927..3a7570b8 100644 --- a/nvidia-gpu/nvidia-container-toolkit/nvidia-pkgs/production/pkg.yaml +++ b/nvidia-gpu/nvidia-container-toolkit/nvidia-pkgs/production/pkg.yaml @@ -87,10 +87,10 @@ steps: mkdir -p /rootfs/usr/local/lib/containers/nvidia-persistenced \ /rootfs/usr/local/etc/containers \ - /rootfs/usr/etc/udev/rules.d + /rootfs/usr/lib/udev/rules.d # copy udev rule - cp /pkg/files/15-nvidia-device.rules /rootfs/usr/etc/udev/rules.d + cp /pkg/files/15-nvidia-device.rules /rootfs/usr/lib/udev/rules.d finalize: - from: /rootfs to: /rootfs diff --git a/power/nut-client/pkg.yaml b/power/nut-client/pkg.yaml index a4d46431..29a67eec 100644 --- a/power/nut-client/pkg.yaml +++ b/power/nut-client/pkg.yaml @@ -38,7 +38,7 @@ steps: --with-drvpath=/usr/local/lib/nut \ --with-statepath=/var/run/nut \ --with-altpidpath=/var/run/nut \ - --with-udev-dir=/usr/local/etc/udev \ + --with-udev-dir=/usr/lib/udev \ --with-systemdsystemunitdir=no \ --with-systemdshutdowndir=no \ --with-systemdtmpfilesdir=no \ diff --git a/storage/iscsi-tools/open-iscsi/pkg.yaml b/storage/iscsi-tools/open-iscsi/pkg.yaml index 2fe00e53..dc6d7b35 100644 --- a/storage/iscsi-tools/open-iscsi/pkg.yaml +++ b/storage/iscsi-tools/open-iscsi/pkg.yaml @@ -51,7 +51,7 @@ steps: -Dno_systemd=true \ -Dprefix=/usr/local \ -Discsi_sbindir=/usr/local/sbin \ - -Drulesdir=/usr/local/etc/udev/rules.d \ + -Drulesdir=/usr/lib/udev/rules.d \ -Dc_args="$CFLAGS -I/usr/local/include -DNO_SYSTEMD -DGLOB_ONLYDIR=0" \ output diff --git a/storage/mdadm/pkg.yaml b/storage/mdadm/pkg.yaml index 665b09b3..78328d97 100644 --- a/storage/mdadm/pkg.yaml +++ b/storage/mdadm/pkg.yaml @@ -30,11 +30,11 @@ steps: make -j $(nproc) mdmon install: - | - mkdir -p /rootfs/usr/local/sbin /rootfs/usr/etc/udev/rules.d + mkdir -p /rootfs/usr/local/sbin /rootfs/usr/lib/udev/rules.d cp mdadm /rootfs/usr/local/sbin/mdadm cp mdmon /rootfs/usr/local/sbin/mdmon - cp /pkg/files/udev-md-raid-arrays.rules /rootfs/usr/etc/udev/rules.d/63-md-raid-arrays.rules - cp /pkg/files/udev-md-raid-assembly.rules /rootfs/usr/etc/udev/rules.d/64-md-raid-assembly.rules + cp /pkg/files/udev-md-raid-arrays.rules /rootfs/usr/lib/udev/rules.d/63-md-raid-arrays.rules + cp /pkg/files/udev-md-raid-assembly.rules /rootfs/usr/lib/udev/rules.d/64-md-raid-assembly.rules test: - | mkdir -p /extensions-validator-rootfs diff --git a/storage/zfs/zfs-tools/pkg.yaml b/storage/zfs/zfs-tools/pkg.yaml index 8e5e3c82..768ffdc2 100644 --- a/storage/zfs/zfs-tools/pkg.yaml +++ b/storage/zfs/zfs-tools/pkg.yaml @@ -23,7 +23,7 @@ steps: ./configure \ --prefix=/usr/local \ --with-udevdir=/usr/local/sbin \ - --with-udevruledir=/usr/etc/udev/rules.d \ + --with-udevruledir=/usr/lib/udev/rules.d \ --with-config=user \ --disable-code-coverage \ --disable--sysvinit \ @@ -36,7 +36,7 @@ steps: make install-data DESTDIR=/rootfs rm -rf /rootfs/{etc,sbin,usr/{lib,local/share,share}} # remove the 69-vdev.rules, since it depends on `vdev_id` which is a shell script - rm -f /rootfs/usr/etc/udev/rules.d/69-vdev.rules + rm -f /rootfs/usr/lib/udev/rules.d/69-vdev.rules # if this file is present creating a vdev tries to executes it # since talos doesn't have a shell, this would fail # the default shipped file is a no-op, so safe to remove.