picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

login/meson.build: require ACL for uaccess rules

Browse source 
Don't install udev rules that requires the uaccess builtin if systemd is
being built without the uaccess builtin.
This commit is contained in:
Andrew Jeddeloh 2018-01-25 13:17:17 -08:00 committed by Lennart Poettering
parent 6eda13d3ba
commit 633b8afdf8
2 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/login/73-seat-late.rules.in → src/login/73-seat-late.rules.m4
View file

@ -13,7 +13,8 @@ ENV{ID_SEAT}=="", ENV{ID_AUTOSEAT}=="1", ENV{ID_FOR_SEAT}!="", ENV{ID_SEAT}="sea
ENV{ID_SEAT}=="", IMPORT{parent}="ID_SEAT"
ENV{ID_SEAT}!="", TAG+="$env{ID_SEAT}"
TAG=="uaccess", ENV{MAJOR}!="", RUN{builtin}+="uaccess"
m4_ifdef(`HAVE_ACL',``
TAG=="uaccess", ENV{MAJOR}!="", RUN{builtin}+="uaccess"''
)m4_dnl
LABEL="seat_late_end"

30
src/login/meson.build
View file

@ -97,19 +97,27 @@ if conf.get('ENABLE_LOGIND') == 1
install : install_polkit,
install_dir : polkitpolicydir)
install_data('70-power-switch.rules',
'70-uaccess.rules',
install_data('70-power-switch.rules', install_dir : udevrulesdir)
if conf.get('HAVE_ACL') == 1
install_data('70-uaccess.rules', install_dir : udevrulesdir)
endif
seat_rules = configure_file(
input : '71-seat.rules.in',
output : '71-seat.rules',
configuration : substs)
install_data(seat_rules,
install_dir : udevrulesdir)
foreach file : ['71-seat.rules',
'73-seat-late.rules']
gen = configure_file(
input : file + '.in',
output : file,
configuration : substs)
install_data(gen,
install_dir : udevrulesdir)
endforeach
custom_target(
'73-seat-late.rules',
input : '73-seat-late.rules.m4',
output: '73-seat-late.rules',
command : [m4, '-P'] + m4_defines + ['@INPUT@'],
capture : true,
install : true,
install_dir : udevrulesdir)
custom_target(
'systemd-user',