Skip to content

Commit 8feaea5

Browse files
keszybzyuwata
authored andcommitted
meson: use jinja2 for rules.d templates
1 parent 195a8a9 commit 8feaea5

File tree

5 files changed

+18
-18
lines changed

5 files changed

+18
-18
lines changed

meson.build

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -853,6 +853,7 @@ substs.set('DEV_KVM_MODE', dev_kvm_mode)
853853
conf.set10('DEV_KVM_UACCESS', dev_kvm_mode != '0666')
854854
group_render_mode = get_option('group-render-mode')
855855
substs.set('GROUP_RENDER_MODE', group_render_mode)
856+
conf.set_quoted('GROUP_RENDER_MODE', group_render_mode)
856857
conf.set10('GROUP_RENDER_UACCESS', group_render_mode != '0666')
857858

858859
kill_user_processes = get_option('default-kill-user-processes')

rules.d/50-udev-default.rules.in

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ SUBSYSTEM=="dvb", GROUP="video"
3636
SUBSYSTEM=="media", GROUP="video"
3737
SUBSYSTEM=="cec", GROUP="video"
3838

39-
SUBSYSTEM=="drm", KERNEL=="renderD*", GROUP="render", MODE="@GROUP_RENDER_MODE@"
40-
SUBSYSTEM=="kfd", GROUP="render", MODE="@GROUP_RENDER_MODE@"
39+
SUBSYSTEM=="drm", KERNEL=="renderD*", GROUP="render", MODE="{{GROUP_RENDER_MODE}}"
40+
SUBSYSTEM=="kfd", GROUP="render", MODE="{{GROUP_RENDER_MODE}}"
4141

4242
SUBSYSTEM=="misc", KERNEL=="sgx_enclave", GROUP="sgx", MODE="0660"
4343

@@ -89,14 +89,14 @@ KERNEL=="tun", MODE="0666", OPTIONS+="static_node=net/tun"
8989
KERNEL=="fuse", MODE="0666", OPTIONS+="static_node=fuse"
9090

9191
# The static_node is required on s390x and ppc (they are using MODULE_ALIAS)
92-
KERNEL=="kvm", GROUP="kvm", MODE="@DEV_KVM_MODE@", OPTIONS+="static_node=kvm"
92+
KERNEL=="kvm", GROUP="kvm", MODE="{{DEV_KVM_MODE}}", OPTIONS+="static_node=kvm"
9393

9494
KERNEL=="vfio", MODE="0666", OPTIONS+="static_node=vfio/vfio"
9595

9696
KERNEL=="vsock", MODE="0666"
97-
KERNEL=="vhost-vsock", GROUP="kvm", MODE="@DEV_KVM_MODE@", OPTIONS+="static_node=vhost-vsock"
97+
KERNEL=="vhost-vsock", GROUP="kvm", MODE="{{DEV_KVM_MODE}}", OPTIONS+="static_node=vhost-vsock"
9898

99-
KERNEL=="vhost-net", GROUP="kvm", MODE="@DEV_KVM_MODE@", OPTIONS+="static_node=vhost-net"
99+
KERNEL=="vhost-net", GROUP="kvm", MODE="{{DEV_KVM_MODE}}", OPTIONS+="static_node=vhost-net"
100100

101101
KERNEL=="udmabuf", GROUP="kvm"
102102

rules.d/64-btrfs.rules.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ IMPORT{builtin}="btrfs ready $devnode"
1212
ENV{ID_BTRFS_READY}=="0", ENV{SYSTEMD_READY}="0"
1313

1414
# reconsider pending devices in case when multidevice volume awaits
15-
ENV{ID_BTRFS_READY}=="1", RUN+="@rootbindir@/udevadm trigger -s block -p ID_BTRFS_READY=0"
15+
ENV{ID_BTRFS_READY}=="1", RUN+="{{ROOTBINDIR}}/udevadm trigger -s block -p ID_BTRFS_READY=0"
1616

1717
LABEL="btrfs_end"

rules.d/99-systemd.rules.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}=="*:0701??:
5757
SUBSYSTEM=="udc", ACTION=="add", TAG+="systemd", ENV{SYSTEMD_WANTS}+="usb-gadget.target"
5858

5959
# Apply sysctl variables to network devices (and only to those) as they appear.
60-
ACTION=="add", SUBSYSTEM=="net", KERNEL!="lo", RUN+="@rootlibexecdir@/systemd-sysctl --prefix=/net/ipv4/conf/$name --prefix=/net/ipv4/neigh/$name --prefix=/net/ipv6/conf/$name --prefix=/net/ipv6/neigh/$name"
60+
ACTION=="add", SUBSYSTEM=="net", KERNEL!="lo", RUN+="{{ROOTLIBEXECDIR}}/systemd-sysctl --prefix=/net/ipv4/conf/$name --prefix=/net/ipv4/neigh/$name --prefix=/net/ipv6/conf/$name --prefix=/net/ipv6/neigh/$name"
6161

6262
# Pull in backlight save/restore for all backlight devices and
6363
# keyboard backlights

rules.d/meson.build

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -42,18 +42,17 @@ install_data(rules,
4242

4343
all_rules = rules
4444

45-
rules_in = '''
46-
50-udev-default.rules
47-
64-btrfs.rules
48-
99-systemd.rules
49-
'''.split()
45+
rules_in = ['50-udev-default.rules',
46+
'64-btrfs.rules',
47+
'99-systemd.rules']
5048

5149
foreach file : rules_in
52-
gen = configure_file(
50+
all_rules += custom_target(
51+
file,
5352
input : file + '.in',
54-
output : file,
55-
configuration : substs)
56-
install_data(gen,
57-
install_dir : udevrulesdir)
58-
all_rules += gen
53+
output: file,
54+
command : [meson_render_jinja2, config_h, '@INPUT@'],
55+
capture : true,
56+
install : true,
57+
install_dir : udevrulesdir)
5958
endforeach

0 commit comments

Comments
 (0)