diff options
| author | Aleksander Morgado <aleksandermj@chromium.org> | 2023-11-20 13:02:53 +0000 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2023-11-20 14:40:38 +0000 |
| commit | 36b9d605f66906f62f2a6cb9edd7d07d12e65b2f (patch) | |
| tree | 62d34a40d256b45357221e38cb424baa1641da71 | |
| parent | 93ba75ba5e443c12c9b5231727c6e9e0eda89817 (diff) | |
libmbim-glib: the device ownership rules are not proxy specific
Move the udev rule under the libmbim-glib sources, not the mbim-proxy
sources.
| -rw-r--r-- | src/libmbim-glib/76-mbim-device-ownership.rules.in | 13 | ||||
| -rw-r--r-- | src/libmbim-glib/meson.build | 10 | ||||
| -rw-r--r-- | src/mbim-proxy/76-mbim-proxy-device-ownership.rules.in | 14 | ||||
| -rw-r--r-- | src/mbim-proxy/meson.build | 9 |
4 files changed, 23 insertions, 23 deletions
diff --git a/src/libmbim-glib/76-mbim-device-ownership.rules.in b/src/libmbim-glib/76-mbim-device-ownership.rules.in new file mode 100644 index 0000000..85fca1a --- /dev/null +++ b/src/libmbim-glib/76-mbim-device-ownership.rules.in @@ -0,0 +1,13 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +# do not edit this file, it will be overwritten on update + +ACTION!="add|change|move", GOTO="mbim_device_ownership_end" + +KERNEL=="cdc-wdm[0-9]", DRIVERS=="cdc_mbim", SUBSYSTEM=="usbmisc", GOTO="mbim_device_ownership_change" +GOTO="mbim_device_ownership_end" + +LABEL="mbim_device_ownership_change" +OWNER="@MBIM_USERNAME@" + +LABEL="mbim_device_ownership_end" diff --git a/src/libmbim-glib/meson.build b/src/libmbim-glib/meson.build index 148935c..0489548 100644 --- a/src/libmbim-glib/meson.build +++ b/src/libmbim-glib/meson.build @@ -139,4 +139,14 @@ if enable_gir and get_option('default_library') != 'static' ) endif +if enable_mbim_username + configure_file( + input: '76-mbim-device-ownership.rules.in', + output: '@BASENAME@', + configuration: {'MBIM_USERNAME': mbim_username}, + install_dir: udev_udevdir / 'rules.d', + ) +endif + + subdir('test') diff --git a/src/mbim-proxy/76-mbim-proxy-device-ownership.rules.in b/src/mbim-proxy/76-mbim-proxy-device-ownership.rules.in deleted file mode 100644 index 81755f2..0000000 --- a/src/mbim-proxy/76-mbim-proxy-device-ownership.rules.in +++ /dev/null @@ -1,14 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-or-later - -# do not edit this file, it will be overwritten on update - -ACTION!="add|change|move", GOTO="mbim_proxy_device_ownership_end" - -# A 'cdc-wdm' device is from a MBIM and MBIM-based modems. -KERNEL=="cdc-wdm[0-9]", DRIVERS=="cdc_mbim", SUBSYSTEM=="usbmisc", GOTO="mbim_proxy_device_ownership_change" -GOTO="mbim_proxy_device_ownership_end" - -LABEL="mbim_proxy_device_ownership_change" -OWNER="@MBIM_USERNAME@" - -LABEL="mbim_proxy_device_ownership_end" diff --git a/src/mbim-proxy/meson.build b/src/mbim-proxy/meson.build index c316aa6..7469a71 100644 --- a/src/mbim-proxy/meson.build +++ b/src/mbim-proxy/meson.build @@ -11,12 +11,3 @@ executable( install: true, install_dir: mbim_libexecdir, ) - -if enable_mbim_username - configure_file( - input: '76-mbim-proxy-device-ownership.rules.in', - output: '@BASENAME@', - configuration: {'MBIM_USERNAME': mbim_username}, - install_dir: udev_udevdir / 'rules.d', - ) -endif |