Skip to content

Commit

Permalink
chore: move udev rules
Browse files Browse the repository at this point in the history
Ref: siderolabs/pkgs#1053

Signed-off-by: Dmitry Sharshakov <[email protected]>
  • Loading branch information
dsseng committed Oct 24, 2024
1 parent b4311ac commit 6d5f49b
Show file tree
Hide file tree
Showing 10 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .kres.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/`
Expand Down
2 changes: 1 addition & 1 deletion internal/base/pkg.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: /
4 changes: 2 additions & 2 deletions nvidia-gpu/nvidia-container-toolkit/nvidia-pkgs/lts/pkg.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion power/nut-client/pkg.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion storage/iscsi-tools/open-iscsi/pkg.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions storage/mdadm/pkg.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions storage/zfs/zfs-tools/pkg.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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.
Expand Down

0 comments on commit 6d5f49b

Please sign in to comment.