diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2020-03-27 19:37:10 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2020-04-11 09:07:42 +1000 |
| commit | c2fa055fa377e87b7bd2f8a5f6361ef7405833e6 (patch) | |
| tree | 05a75b883a6601d89c2c4f36ec2b4e4782307d5c | |
| parent | ce1c4c5008c7077d4ffe2cb751b1ebecdf72a42f (diff) | |
| download | libinput-c2fa055fa377e87b7bd2f8a5f6361ef7405833e6.tar.gz | |
udev: don't use IMPORT+=
IMPORT really only supports == and != and for a short while udevd warned about
this before that warning was reverted again.
Where anything else is used, it falls back to ==. systemd upstream rules all
use a single = though, so let's stick with that to be consistent, even if it
is technically wrong (udevd will warn about this in debug mode).
See the long discussion in systemd upstream for details:
https://github.com/systemd/systemd/issues/14062
Fixes #461
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 281ecf10d1c9a169fcd7b23a94751172f7255678)
| -rw-r--r-- | test/litest.c | 2 | ||||
| -rw-r--r-- | udev/80-libinput-device-groups.rules.in | 2 | ||||
| -rw-r--r-- | udev/90-libinput-fuzz-override.rules.in | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/test/litest.c b/test/litest.c index 783c1380..391c8e9e 100644 --- a/test/litest.c +++ b/test/litest.c @@ -725,7 +725,7 @@ litest_init_device_udev_rules(struct litest_test_device *dev, FILE *f) if (need_keyboard_builtin) { fprintf(f, "" "ATTRS{name}==\"litest %s*\"," - " IMPORT{builtin}+=\"keyboard\"\n", + " IMPORT{builtin}=\"keyboard\"\n", dev->name); } diff --git a/udev/80-libinput-device-groups.rules.in b/udev/80-libinput-device-groups.rules.in index f8331530..1c40143d 100644 --- a/udev/80-libinput-device-groups.rules.in +++ b/udev/80-libinput-device-groups.rules.in @@ -1,6 +1,6 @@ ACTION!="add|change", GOTO="libinput_device_group_end" KERNEL!="event[0-9]*", GOTO="libinput_device_group_end" -ATTRS{phys}=="?*", IMPORT{program}+="@UDEV_TEST_PATH@libinput-device-group %S%p" +ATTRS{phys}=="?*", IMPORT{program}="@UDEV_TEST_PATH@libinput-device-group %S%p" LABEL="libinput_device_group_end" diff --git a/udev/90-libinput-fuzz-override.rules.in b/udev/90-libinput-fuzz-override.rules.in index fa1e3e75..81f76cd1 100644 --- a/udev/90-libinput-fuzz-override.rules.in +++ b/udev/90-libinput-fuzz-override.rules.in @@ -15,12 +15,12 @@ KERNEL!="event*", GOTO="libinput_fuzz_override_end" # about that. ATTRS{capabilities/abs}!="0", \ ENV{ID_INPUT_TOUCHPAD}=="1", \ - IMPORT{program}+="@UDEV_TEST_PATH@libinput-fuzz-extract %S%p", \ + IMPORT{program}="@UDEV_TEST_PATH@libinput-fuzz-extract %S%p", \ RUN{program}+="@UDEV_TEST_PATH@libinput-fuzz-to-zero %S%p", \ GOTO="libinput_fuzz_override_end" ATTRS{capabilities/abs}!="0", \ ENV{ID_INPUT_TOUCHSCREEN}=="1", \ - IMPORT{program}+="@UDEV_TEST_PATH@libinput-fuzz-extract %S%p", \ + IMPORT{program}="@UDEV_TEST_PATH@libinput-fuzz-extract %S%p", \ RUN{program}+="@UDEV_TEST_PATH@libinput-fuzz-to-zero %S%p", \ GOTO="libinput_fuzz_override_end" |