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

This change also allows to import `tpm2_id` as a built-in instead of as a
program.

diff --git a/rules.d/60-tpm2-id.rules b/rules.d/60-tpm2-id.rules
index 1e08f3b8e5b9d353b9a85056fe54e96e4b423297..c89ff03f354ea0f1ce3654be17a7ff8a7d32b318 100644 (file)
--- 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 f1e4828857f369168e7818c9c55f8906fc3a4a25..b47bc781de414f2f7bf9fc562b27999816d9713a 100644 (file)
--- a/rules.d/meson.build
+++ b/rules.d/meson.build
@@ -24,7 +24,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',
@@ -41,14 +40,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 = []