SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rules: do not install 60-tpm2-id.rules without TPM2 support

Browse Source 
This change also allows to import `tpm2_id` as a built-in instead of as a
program.
This commit is contained in:
Antonio Alvarez Feijoo
2026-07-29 01:23:14 +09:00
committed by Yu Watanabe
parent 385623fee3
commit efc207d7ab
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rules.d/60-tpm2-id.rules
+1 -1
View File
@@ -4,7 +4,7 @@ ACTION=="remove", GOTO="tpm2_id_end"
SUBSYSTEM!="tpmrm", GOTO="tpm2_id_end" SUBSYSTEM!="tpmrm", GOTO="tpm2_id_end"
KERNEL!="tpmrm[0-9]*", GOTO="tpm2_id_end" KERNEL!="tpmrm[0-9]*", GOTO="tpm2_id_end"
IMPORT{program}="tpm2_id identify" IMPORT{builtin}="tpm2_id identify"
ENV{ID_TPM2_MODALIAS}!="", IMPORT{builtin}="hwdb 'tpm2:$env{ID_TPM2_MODALIAS}'" ENV{ID_TPM2_MODALIAS}!="", IMPORT{builtin}="hwdb 'tpm2:$env{ID_TPM2_MODALIAS}'"
LABEL="tpm2_id_end" LABEL="tpm2_id_end"
rules.d/meson.build
+6 -4
View File
@@ -24,7 +24,6 @@ rules = [
'60-persistent-v4l.rules', '60-persistent-v4l.rules',
'60-sensor.rules', '60-sensor.rules',
'60-serial.rules', '60-serial.rules',
'60-tpm2-id.rules',
'65-integration.rules', '65-integration.rules',
'70-camera.rules', '70-camera.rules',
'70-joystick.rules', '70-joystick.rules',
@@ -41,14 +40,17 @@ rules = [
'90-iocost.rules', '90-iocost.rules',
)], )],
[files('80-drivers.rules'), [files('60-tpm2-id.rules'),
conf.get('HAVE_KMOD') == 1], conf.get('HAVE_TPM2') == 1],
[files('70-memory.rules'), [files('70-memory.rules'),
conf.get('HAVE_DMI') == 1], conf.get('HAVE_DMI') == 1],
[files('70-power-switch.rules'), [files('70-power-switch.rules'),
conf.get('ENABLE_LOGIND') == 1] conf.get('ENABLE_LOGIND') == 1],
[files('80-drivers.rules'),
conf.get('HAVE_KMOD') == 1],
] ]
all_rules = [] all_rules = []