diff options
| author | Thomas Haller <thaller@redhat.com> | 2020-06-09 17:20:40 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2020-06-11 10:53:50 +0200 |
| commit | b760dee8c86ce0ab61ef3c1cda2cdb32e0519f85 (patch) | |
| tree | e46f1ca994458af32ef076c74488285c094ac820 /shared/meson.build | |
| parent | 98f3d68cbea3367c00e5d5dc00fabd7ad024edf7 (diff) | |
| download | NetworkManager-b760dee8c86ce0ab61ef3c1cda2cdb32e0519f85.tar.gz | |
all: move "shared/nm-keyfile" to "libnm-core/nm-keyfile"
Originally, these files were part of libnm-core and linked together.
However, that is a licensing violation, because the code is GPL-2.0+
licensed, while libnm-core also gets linked with libnm (it must thus
be LGPL-2.1+). The original intent behind moving the code to "shared/"
was to avoid the licensing issue, but also to prepare when we would add
a separate, GPL licensed libnm-keyfile. However, currently we hope to
be able to relicense the code, so that it actually could be exposed as
part of libnm. This is work in progress at ([1]).
[1] https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/ ## 517
Anyway, the current directory layout is problematic. libnm-keyfile
depends on libnm-core, while libnm-core depends on code under shared.
That means, there is a circular dependency and meson's subdir() does
not work well.
Move the code.
Diffstat (limited to 'shared/meson.build')
| -rw-r--r-- | shared/meson.build | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/shared/meson.build b/shared/meson.build index 9a8768f539..81975685a3 100644 --- a/shared/meson.build +++ b/shared/meson.build @@ -113,11 +113,6 @@ nm_libnm_core_aux_source = files('nm-libnm-core-aux/nm-libnm-core-aux.c') nm_libnm_core_utils_source = files('nm-libnm-core-intern/nm-libnm-core-utils.c') -nm_keyfile_source = files( - 'nm-keyfile/nm-keyfile-utils.c', - 'nm-keyfile/nm-keyfile.c', -) - nm_libnm_aux_source = files('nm-libnm-aux/nm-libnm-aux.c') nm_meta_setting_source = files('nm-meta-setting.c') |