From 1f2d723485efb4a352a42a085e1dd17315971377 Mon Sep 17 00:00:00 2001 From: Benjamin Berg Date: Tue, 19 Jan 2021 14:42:35 +0100 Subject: [PATCH] Drop version from libfprint hwdb As we are shipping a hwdb file now, we cannot have a collision with the old libfprint version. Also, we are going to pull these rules into systemd and they will not be installed via libfprint in the future. As such, collisions will not happen again and it makes more sense like this for systemd. --- .gitlab-ci.yml | 4 ++-- libfprint/meson.build | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bf190b2..c416c2b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -50,12 +50,12 @@ build: <<: *build # <<: *check_abi after_script: - - cp _build/libfprint/60-autosuspend-libfprint-2.hwdb . + - cp _build/libfprint/60-autosuspend-libfprint.hwdb . artifacts: expose_as: "HTML Documentation" paths: - _build/doc/html/ - - 60-autosuspend-libfprint-2.hwdb + - 60-autosuspend-libfprint.hwdb expire_in: 1 week test: diff --git a/libfprint/meson.build b/libfprint/meson.build index 3464bf3..abf2fb9 100644 --- a/libfprint/meson.build +++ b/libfprint/meson.build @@ -304,7 +304,7 @@ udev_hwdb = executable('fprint-list-udev-hwdb', # We always build this file; primarily so that systemd can pull it # from the artefacts! custom_target('udev-rules', - output: '60-autosuspend-@0@.hwdb'.format(versioned_libname), + output: '60-autosuspend-@0@.hwdb'.format(meson.project_name()), capture: true, command: [ udev_hwdb ], install: get_option('udev_rules'),