diff --git a/rules.d/60-tpm2-id.rules b/rules.d/60-tpm2-id.rules index 1e08f3b8e5b..c89ff03f354 100644 --- a/rules.d/60-tpm2-id.rules +++ b/rules.d/60-tpm2-id.rules @@ -4,7 +4,7 @@ ACTION=="remove", GOTO="tpm2_id_end" SUBSYSTEM!="tpmrm", 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}'" LABEL="tpm2_id_end" diff --git a/rules.d/meson.build b/rules.d/meson.build index aa469ef7a7e..a29865ba2de 100644 --- a/rules.d/meson.build +++ b/rules.d/meson.build @@ -23,7 +23,6 @@ rules = [ '60-persistent-v4l.rules', '60-sensor.rules', '60-serial.rules', - '60-tpm2-id.rules', '65-integration.rules', '70-camera.rules', '70-joystick.rules', @@ -40,14 +39,17 @@ rules = [ '90-iocost.rules', )], - [files('80-drivers.rules'), - conf.get('HAVE_KMOD') == 1], + [files('60-tpm2-id.rules'), + conf.get('HAVE_TPM2') == 1], [files('70-memory.rules'), conf.get('HAVE_DMI') == 1], [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 = []