From 39225258d6a8fb0612c4576a75ac24d572742372 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 18 Feb 2021 08:13:35 +0100 Subject: [PATCH] build: move "shared/systemd" to "src/libnm-systemd-shared" --- Makefile.am | 290 +++++++++--------- contrib/scripts/nm-code-format.sh | 2 +- shared/meson.build | 60 ---- src/core/NetworkManagerUtils.c | 2 +- src/core/devices/nm-device.c | 2 +- src/core/dhcp/nm-dhcp-manager.c | 2 +- src/core/dhcp/nm-dhcp-nettools.c | 2 +- src/core/dhcp/nm-dhcp-utils.c | 2 +- src/core/initrd/nmi-cmdline-reader.c | 2 +- src/core/ndisc/nm-lndp-ndisc.c | 2 +- .../plugins/keyfile/nms-keyfile-plugin.c | 2 +- .../systemd/sd-adapt-core/nm-sd-adapt-core.h | 2 +- src/core/tests/test-systemd.c | 2 +- src/libnm-core-impl/nm-keyfile.c | 2 +- src/libnm-core-impl/nm-setting-connection.c | 2 +- src/libnm-core-impl/nm-utils.c | 2 +- src/libnm-core-impl/tests/test-general.c | 2 +- src/libnm-systemd-shared/meson.build | 65 ++++ .../nm-default-systemd-shared.h | 0 .../nm-sd-utils-shared.c | 2 +- .../nm-sd-utils-shared.h | 0 .../sd-adapt-shared/architecture.h | 0 .../sd-adapt-shared/arphrd-list.h | 0 .../sd-adapt-shared/blockdev-util.h | 0 .../sd-adapt-shared/build.h | 0 .../sd-adapt-shared/copy.h | 0 .../sd-adapt-shared/def.h | 0 .../sd-adapt-shared/dhcp-server-internal.h | 0 .../sd-adapt-shared/dirent-util.h | 0 .../sd-adapt-shared/errno-list.h | 0 .../sd-adapt-shared/glob-util.h | 0 .../sd-adapt-shared/gunicode.h | 0 .../sd-adapt-shared/idn-util.h | 0 .../sd-adapt-shared/ioprio.h | 0 .../sd-adapt-shared/locale-util.h | 0 .../sd-adapt-shared/memfd-util.h | 0 .../sd-adapt-shared/missing_fs.h | 0 .../sd-adapt-shared/missing_keyctl.h | 0 .../sd-adapt-shared/missing_magic.h | 0 .../sd-adapt-shared/missing_network.h | 0 .../sd-adapt-shared/missing_sched.h | 0 .../sd-adapt-shared/missing_timerfd.h | 0 .../sd-adapt-shared/mkdir.h | 0 .../sd-adapt-shared/namespace-util.h | 0 .../sd-adapt-shared/nm-sd-adapt-shared.h | 2 +- .../sd-adapt-shared/nulstr-util.h | 0 .../sd-adapt-shared/raw-clone.h | 0 .../sd-adapt-shared/rlimit-util.h | 0 .../sd-adapt-shared/terminal-util.h | 0 .../sd-adapt-shared/unaligned.h | 0 .../sd-adapt-shared/user-util.h | 0 .../sd-adapt-shared/virt.h | 0 .../src/basic/alloc-util.c | 0 .../src/basic/alloc-util.h | 0 .../libnm-systemd-shared}/src/basic/async.h | 0 .../src/basic/cgroup-util.h | 0 .../src/basic/env-file.c | 0 .../src/basic/env-file.h | 0 .../src/basic/env-util.c | 0 .../src/basic/env-util.h | 0 .../src/basic/errno-util.h | 0 .../libnm-systemd-shared}/src/basic/escape.c | 0 .../libnm-systemd-shared}/src/basic/escape.h | 0 .../src/basic/ether-addr-util.c | 0 .../src/basic/ether-addr-util.h | 0 .../src/basic/extract-word.c | 0 .../src/basic/extract-word.h | 0 .../libnm-systemd-shared}/src/basic/fd-util.c | 0 .../libnm-systemd-shared}/src/basic/fd-util.h | 0 .../libnm-systemd-shared}/src/basic/fileio.c | 0 .../libnm-systemd-shared}/src/basic/fileio.h | 0 .../src/basic/format-util.c | 0 .../src/basic/format-util.h | 0 .../libnm-systemd-shared}/src/basic/fs-util.c | 0 .../libnm-systemd-shared}/src/basic/fs-util.h | 0 .../src/basic/hash-funcs.c | 0 .../src/basic/hash-funcs.h | 0 .../libnm-systemd-shared}/src/basic/hashmap.c | 0 .../libnm-systemd-shared}/src/basic/hashmap.h | 0 .../src/basic/hexdecoct.c | 0 .../src/basic/hexdecoct.h | 0 .../src/basic/hostname-util.c | 0 .../src/basic/hostname-util.h | 0 .../src/basic/in-addr-util.c | 0 .../src/basic/in-addr-util.h | 0 .../libnm-systemd-shared}/src/basic/io-util.c | 0 .../libnm-systemd-shared}/src/basic/io-util.h | 0 .../libnm-systemd-shared}/src/basic/list.h | 0 .../libnm-systemd-shared}/src/basic/log.h | 0 .../libnm-systemd-shared}/src/basic/macro.h | 0 .../src/basic/memory-util.c | 0 .../src/basic/memory-util.h | 0 .../libnm-systemd-shared}/src/basic/mempool.c | 0 .../libnm-systemd-shared}/src/basic/mempool.h | 0 .../src/basic/missing_fcntl.h | 0 .../src/basic/missing_random.h | 0 .../src/basic/missing_socket.h | 0 .../src/basic/missing_stat.h | 0 .../src/basic/missing_syscall.h | 0 .../src/basic/missing_type.h | 0 .../src/basic/parse-util.c | 0 .../src/basic/parse-util.h | 0 .../src/basic/path-util.c | 0 .../src/basic/path-util.h | 0 .../libnm-systemd-shared}/src/basic/prioq.c | 0 .../libnm-systemd-shared}/src/basic/prioq.h | 0 .../src/basic/process-util.c | 0 .../src/basic/process-util.h | 0 .../src/basic/random-util.c | 0 .../src/basic/random-util.h | 0 .../src/basic/ratelimit.c | 0 .../src/basic/ratelimit.h | 0 .../libnm-systemd-shared}/src/basic/set.h | 0 .../src/basic/signal-util.c | 0 .../src/basic/signal-util.h | 0 .../src/basic/siphash24.h | 0 .../src/basic/socket-util.c | 0 .../src/basic/socket-util.h | 0 .../src/basic/sort-util.h | 0 .../src/basic/sparse-endian.h | 0 .../src/basic/stat-util.c | 0 .../src/basic/stat-util.h | 0 .../src/basic/stdio-util.h | 0 .../src/basic/string-table.c | 0 .../src/basic/string-table.h | 0 .../src/basic/string-util.c | 0 .../src/basic/string-util.h | 0 .../libnm-systemd-shared}/src/basic/strv.c | 0 .../libnm-systemd-shared}/src/basic/strv.h | 0 .../src/basic/strxcpyx.c | 0 .../src/basic/strxcpyx.h | 0 .../src/basic/time-util.c | 0 .../src/basic/time-util.h | 0 .../src/basic/tmpfile-util.c | 0 .../src/basic/tmpfile-util.h | 0 .../src/basic/umask-util.h | 0 .../src/basic/user-util.h | 0 .../libnm-systemd-shared}/src/basic/utf8.c | 0 .../libnm-systemd-shared}/src/basic/utf8.h | 0 .../libnm-systemd-shared}/src/basic/util.c | 0 .../libnm-systemd-shared}/src/basic/util.h | 0 .../src/shared/dns-domain.c | 0 .../src/shared/dns-domain.h | 0 .../src/shared/log-link.h | 0 .../src/shared/web-util.c | 0 .../src/shared/web-util.h | 0 src/meson.build | 1 + 147 files changed, 229 insertions(+), 221 deletions(-) create mode 100644 src/libnm-systemd-shared/meson.build rename {shared/systemd => src/libnm-systemd-shared}/nm-default-systemd-shared.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/nm-sd-utils-shared.c (98%) rename {shared/systemd => src/libnm-systemd-shared}/nm-sd-utils-shared.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/sd-adapt-shared/architecture.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/sd-adapt-shared/arphrd-list.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/sd-adapt-shared/blockdev-util.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/sd-adapt-shared/build.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/sd-adapt-shared/copy.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/sd-adapt-shared/def.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/sd-adapt-shared/dhcp-server-internal.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/sd-adapt-shared/dirent-util.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/sd-adapt-shared/errno-list.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/sd-adapt-shared/glob-util.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/sd-adapt-shared/gunicode.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/sd-adapt-shared/idn-util.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/sd-adapt-shared/ioprio.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/sd-adapt-shared/locale-util.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/sd-adapt-shared/memfd-util.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/sd-adapt-shared/missing_fs.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/sd-adapt-shared/missing_keyctl.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/sd-adapt-shared/missing_magic.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/sd-adapt-shared/missing_network.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/sd-adapt-shared/missing_sched.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/sd-adapt-shared/missing_timerfd.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/sd-adapt-shared/mkdir.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/sd-adapt-shared/namespace-util.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/sd-adapt-shared/nm-sd-adapt-shared.h (99%) rename {shared/systemd => src/libnm-systemd-shared}/sd-adapt-shared/nulstr-util.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/sd-adapt-shared/raw-clone.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/sd-adapt-shared/rlimit-util.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/sd-adapt-shared/terminal-util.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/sd-adapt-shared/unaligned.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/sd-adapt-shared/user-util.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/sd-adapt-shared/virt.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/alloc-util.c (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/alloc-util.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/async.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/cgroup-util.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/env-file.c (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/env-file.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/env-util.c (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/env-util.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/errno-util.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/escape.c (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/escape.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/ether-addr-util.c (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/ether-addr-util.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/extract-word.c (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/extract-word.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/fd-util.c (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/fd-util.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/fileio.c (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/fileio.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/format-util.c (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/format-util.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/fs-util.c (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/fs-util.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/hash-funcs.c (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/hash-funcs.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/hashmap.c (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/hashmap.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/hexdecoct.c (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/hexdecoct.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/hostname-util.c (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/hostname-util.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/in-addr-util.c (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/in-addr-util.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/io-util.c (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/io-util.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/list.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/log.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/macro.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/memory-util.c (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/memory-util.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/mempool.c (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/mempool.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/missing_fcntl.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/missing_random.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/missing_socket.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/missing_stat.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/missing_syscall.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/missing_type.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/parse-util.c (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/parse-util.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/path-util.c (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/path-util.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/prioq.c (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/prioq.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/process-util.c (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/process-util.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/random-util.c (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/random-util.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/ratelimit.c (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/ratelimit.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/set.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/signal-util.c (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/signal-util.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/siphash24.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/socket-util.c (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/socket-util.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/sort-util.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/sparse-endian.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/stat-util.c (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/stat-util.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/stdio-util.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/string-table.c (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/string-table.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/string-util.c (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/string-util.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/strv.c (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/strv.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/strxcpyx.c (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/strxcpyx.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/time-util.c (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/time-util.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/tmpfile-util.c (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/tmpfile-util.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/umask-util.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/user-util.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/utf8.c (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/utf8.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/util.c (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/basic/util.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/shared/dns-domain.c (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/shared/dns-domain.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/shared/log-link.h (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/shared/web-util.c (100%) rename {shared/systemd => src/libnm-systemd-shared}/src/shared/web-util.h (100%) diff --git a/Makefile.am b/Makefile.am index e1ba7834bf..96a056d75c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -122,9 +122,9 @@ shared/nm-platform/.dirstamp: config-extra.h shared/nm-platform/tests/.dirstamp: config-extra.h shared/nm-std-aux/.dirstamp: config-extra.h shared/nm-udev-aux/.dirstamp: config-extra.h -shared/systemd/.dirstamp: config-extra.h -shared/systemd/src/basic/.dirstamp: config-extra.h -shared/systemd/src/shared/.dirstamp: config-extra.h +src/libnm-systemd-shared/.dirstamp: config-extra.h +src/libnm-systemd-shared/src/basic/.dirstamp: config-extra.h +src/libnm-systemd-shared/src/shared/.dirstamp: config-extra.h src/core/dhcp/.dirstamp: config-extra.h ############################################################################### @@ -1380,7 +1380,7 @@ src_libnm_core_impl_tests_ldadd = \ $(libnm_crypto_lib) \ src/libnm-core-aux-intern/libnm-core-aux-intern.la \ shared/nm-base/libnm-base.la \ - shared/systemd/libnm-systemd-shared.la \ + src/libnm-systemd-shared/libnm-systemd-shared.la \ shared/nm-log-null/libnm-log-null.la \ shared/nm-glib-aux/libnm-glib-aux.la \ shared/nm-std-aux/libnm-std-aux.la \ @@ -1610,7 +1610,7 @@ libnm_libnm_static_la_LIBADD = \ shared/nm-base/libnm-base.la \ introspection/libnmdbus.la \ shared/nm-glib-aux/libnm-glib-aux.la \ - shared/systemd/libnm-systemd-shared.la \ + src/libnm-systemd-shared/libnm-systemd-shared.la \ shared/nm-log-null/libnm-log-null.la \ shared/nm-udev-aux/libnm-udev-aux.la \ shared/nm-std-aux/libnm-std-aux.la \ @@ -1949,152 +1949,154 @@ libsystemd_cppflags = \ $(dflt_cppflags) \ -I$(srcdir)/shared \ -I$(builddir)/shared \ - -I$(srcdir)/shared/systemd/ \ - -I$(srcdir)/shared/systemd/sd-adapt-shared \ - -I$(srcdir)/shared/systemd/src/basic \ - -I$(srcdir)/shared/systemd/src/shared \ + -I$(srcdir)/src/ \ + -I$(builddir)/src/ \ + -I$(srcdir)/src/libnm-systemd-shared/ \ + -I$(srcdir)/src/libnm-systemd-shared/sd-adapt-shared \ + -I$(srcdir)/src/libnm-systemd-shared/src/basic \ + -I$(srcdir)/src/libnm-systemd-shared/src/shared \ $(LIBSYSTEMD_NM_CFLAGS) \ $(GLIB_CFLAGS) \ $(CODE_COVERAGE_CFLAGS) \ $(NULL) -noinst_LTLIBRARIES += shared/systemd/libnm-systemd-shared.la +noinst_LTLIBRARIES += src/libnm-systemd-shared/libnm-systemd-shared.la -shared_systemd_libnm_systemd_shared_la_CPPFLAGS = \ +src_libnm_systemd_shared_libnm_systemd_shared_la_CPPFLAGS = \ $(libsystemd_cppflags) \ $(NULL) -shared_systemd_libnm_systemd_shared_la_SOURCES = \ - shared/systemd/nm-default-systemd-shared.h \ - shared/systemd/nm-sd-utils-shared.c \ - shared/systemd/nm-sd-utils-shared.h \ - shared/systemd/sd-adapt-shared/architecture.h \ - shared/systemd/sd-adapt-shared/arphrd-list.h \ - shared/systemd/sd-adapt-shared/blockdev-util.h \ - shared/systemd/sd-adapt-shared/build.h \ - shared/systemd/sd-adapt-shared/copy.h \ - shared/systemd/sd-adapt-shared/def.h \ - shared/systemd/sd-adapt-shared/dhcp-server-internal.h \ - shared/systemd/sd-adapt-shared/dirent-util.h \ - shared/systemd/sd-adapt-shared/errno-list.h \ - shared/systemd/sd-adapt-shared/glob-util.h \ - shared/systemd/sd-adapt-shared/gunicode.h \ - shared/systemd/sd-adapt-shared/idn-util.h \ - shared/systemd/sd-adapt-shared/ioprio.h \ - shared/systemd/sd-adapt-shared/locale-util.h \ - shared/systemd/sd-adapt-shared/memfd-util.h \ - shared/systemd/sd-adapt-shared/missing_fs.h \ - shared/systemd/sd-adapt-shared/missing_keyctl.h \ - shared/systemd/sd-adapt-shared/missing_magic.h \ - shared/systemd/sd-adapt-shared/missing_network.h \ - shared/systemd/sd-adapt-shared/missing_sched.h \ - shared/systemd/sd-adapt-shared/missing_timerfd.h \ - shared/systemd/sd-adapt-shared/mkdir.h \ - shared/systemd/sd-adapt-shared/namespace-util.h \ - shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h \ - shared/systemd/sd-adapt-shared/nulstr-util.h \ - shared/systemd/sd-adapt-shared/raw-clone.h \ - shared/systemd/sd-adapt-shared/rlimit-util.h \ - shared/systemd/sd-adapt-shared/terminal-util.h \ - shared/systemd/sd-adapt-shared/unaligned.h \ - shared/systemd/sd-adapt-shared/user-util.h \ - shared/systemd/sd-adapt-shared/virt.h \ - shared/systemd/src/basic/alloc-util.c \ - shared/systemd/src/basic/alloc-util.h \ - shared/systemd/src/basic/async.h \ - shared/systemd/src/basic/cgroup-util.h \ - shared/systemd/src/basic/env-file.c \ - shared/systemd/src/basic/env-file.h \ - shared/systemd/src/basic/env-util.c \ - shared/systemd/src/basic/env-util.h \ - shared/systemd/src/basic/errno-util.h \ - shared/systemd/src/basic/escape.c \ - shared/systemd/src/basic/escape.h \ - shared/systemd/src/basic/ether-addr-util.c \ - shared/systemd/src/basic/ether-addr-util.h \ - shared/systemd/src/basic/extract-word.c \ - shared/systemd/src/basic/extract-word.h \ - shared/systemd/src/basic/fd-util.c \ - shared/systemd/src/basic/fd-util.h \ - shared/systemd/src/basic/fileio.c \ - shared/systemd/src/basic/fileio.h \ - shared/systemd/src/basic/format-util.c \ - shared/systemd/src/basic/format-util.h \ - shared/systemd/src/basic/fs-util.c \ - shared/systemd/src/basic/fs-util.h \ - shared/systemd/src/basic/hash-funcs.c \ - shared/systemd/src/basic/hash-funcs.h \ - shared/systemd/src/basic/hashmap.c \ - shared/systemd/src/basic/hashmap.h \ - shared/systemd/src/basic/hexdecoct.c \ - shared/systemd/src/basic/hexdecoct.h \ - shared/systemd/src/basic/hostname-util.c \ - shared/systemd/src/basic/hostname-util.h \ - shared/systemd/src/basic/in-addr-util.c \ - shared/systemd/src/basic/in-addr-util.h \ - shared/systemd/src/basic/io-util.c \ - shared/systemd/src/basic/io-util.h \ - shared/systemd/src/basic/list.h \ - shared/systemd/src/basic/log.h \ - shared/systemd/src/basic/macro.h \ - shared/systemd/src/basic/memory-util.c \ - shared/systemd/src/basic/memory-util.h \ - shared/systemd/src/basic/mempool.c \ - shared/systemd/src/basic/mempool.h \ - shared/systemd/src/basic/missing_fcntl.h \ - shared/systemd/src/basic/missing_random.h \ - shared/systemd/src/basic/missing_socket.h \ - shared/systemd/src/basic/missing_stat.h \ - shared/systemd/src/basic/missing_syscall.h \ - shared/systemd/src/basic/missing_type.h \ - shared/systemd/src/basic/parse-util.c \ - shared/systemd/src/basic/parse-util.h \ - shared/systemd/src/basic/path-util.c \ - shared/systemd/src/basic/path-util.h \ - shared/systemd/src/basic/prioq.c \ - shared/systemd/src/basic/prioq.h \ - shared/systemd/src/basic/process-util.c \ - shared/systemd/src/basic/process-util.h \ - shared/systemd/src/basic/random-util.c \ - shared/systemd/src/basic/random-util.h \ - shared/systemd/src/basic/ratelimit.c \ - shared/systemd/src/basic/ratelimit.h \ - shared/systemd/src/basic/set.h \ - shared/systemd/src/basic/signal-util.c \ - shared/systemd/src/basic/signal-util.h \ - shared/systemd/src/basic/siphash24.h \ - shared/systemd/src/basic/socket-util.c \ - shared/systemd/src/basic/socket-util.h \ - shared/systemd/src/basic/sort-util.h \ - shared/systemd/src/basic/sparse-endian.h \ - shared/systemd/src/basic/stat-util.c \ - shared/systemd/src/basic/stat-util.h \ - shared/systemd/src/basic/stdio-util.h \ - shared/systemd/src/basic/string-table.c \ - shared/systemd/src/basic/string-table.h \ - shared/systemd/src/basic/string-util.c \ - shared/systemd/src/basic/string-util.h \ - shared/systemd/src/basic/strv.c \ - shared/systemd/src/basic/strv.h \ - shared/systemd/src/basic/strxcpyx.c \ - shared/systemd/src/basic/strxcpyx.h \ - shared/systemd/src/basic/time-util.c \ - shared/systemd/src/basic/time-util.h \ - shared/systemd/src/basic/tmpfile-util.c \ - shared/systemd/src/basic/tmpfile-util.h \ - shared/systemd/src/basic/umask-util.h \ - shared/systemd/src/basic/utf8.c \ - shared/systemd/src/basic/utf8.h \ - shared/systemd/src/basic/util.c \ - shared/systemd/src/basic/util.h \ - shared/systemd/src/shared/dns-domain.c \ - shared/systemd/src/shared/dns-domain.h \ - shared/systemd/src/shared/log-link.h \ - shared/systemd/src/shared/web-util.c \ - shared/systemd/src/shared/web-util.h \ +src_libnm_systemd_shared_libnm_systemd_shared_la_SOURCES = \ + src/libnm-systemd-shared/nm-default-systemd-shared.h \ + src/libnm-systemd-shared/nm-sd-utils-shared.c \ + src/libnm-systemd-shared/nm-sd-utils-shared.h \ + src/libnm-systemd-shared/sd-adapt-shared/architecture.h \ + src/libnm-systemd-shared/sd-adapt-shared/arphrd-list.h \ + src/libnm-systemd-shared/sd-adapt-shared/blockdev-util.h \ + src/libnm-systemd-shared/sd-adapt-shared/build.h \ + src/libnm-systemd-shared/sd-adapt-shared/copy.h \ + src/libnm-systemd-shared/sd-adapt-shared/def.h \ + src/libnm-systemd-shared/sd-adapt-shared/dhcp-server-internal.h \ + src/libnm-systemd-shared/sd-adapt-shared/dirent-util.h \ + src/libnm-systemd-shared/sd-adapt-shared/errno-list.h \ + src/libnm-systemd-shared/sd-adapt-shared/glob-util.h \ + src/libnm-systemd-shared/sd-adapt-shared/gunicode.h \ + src/libnm-systemd-shared/sd-adapt-shared/idn-util.h \ + src/libnm-systemd-shared/sd-adapt-shared/ioprio.h \ + src/libnm-systemd-shared/sd-adapt-shared/locale-util.h \ + src/libnm-systemd-shared/sd-adapt-shared/memfd-util.h \ + src/libnm-systemd-shared/sd-adapt-shared/missing_fs.h \ + src/libnm-systemd-shared/sd-adapt-shared/missing_keyctl.h \ + src/libnm-systemd-shared/sd-adapt-shared/missing_magic.h \ + src/libnm-systemd-shared/sd-adapt-shared/missing_network.h \ + src/libnm-systemd-shared/sd-adapt-shared/missing_sched.h \ + src/libnm-systemd-shared/sd-adapt-shared/missing_timerfd.h \ + src/libnm-systemd-shared/sd-adapt-shared/mkdir.h \ + src/libnm-systemd-shared/sd-adapt-shared/namespace-util.h \ + src/libnm-systemd-shared/sd-adapt-shared/nm-sd-adapt-shared.h \ + src/libnm-systemd-shared/sd-adapt-shared/nulstr-util.h \ + src/libnm-systemd-shared/sd-adapt-shared/raw-clone.h \ + src/libnm-systemd-shared/sd-adapt-shared/rlimit-util.h \ + src/libnm-systemd-shared/sd-adapt-shared/terminal-util.h \ + src/libnm-systemd-shared/sd-adapt-shared/unaligned.h \ + src/libnm-systemd-shared/sd-adapt-shared/user-util.h \ + src/libnm-systemd-shared/sd-adapt-shared/virt.h \ + src/libnm-systemd-shared/src/basic/alloc-util.c \ + src/libnm-systemd-shared/src/basic/alloc-util.h \ + src/libnm-systemd-shared/src/basic/async.h \ + src/libnm-systemd-shared/src/basic/cgroup-util.h \ + src/libnm-systemd-shared/src/basic/env-file.c \ + src/libnm-systemd-shared/src/basic/env-file.h \ + src/libnm-systemd-shared/src/basic/env-util.c \ + src/libnm-systemd-shared/src/basic/env-util.h \ + src/libnm-systemd-shared/src/basic/errno-util.h \ + src/libnm-systemd-shared/src/basic/escape.c \ + src/libnm-systemd-shared/src/basic/escape.h \ + src/libnm-systemd-shared/src/basic/ether-addr-util.c \ + src/libnm-systemd-shared/src/basic/ether-addr-util.h \ + src/libnm-systemd-shared/src/basic/extract-word.c \ + src/libnm-systemd-shared/src/basic/extract-word.h \ + src/libnm-systemd-shared/src/basic/fd-util.c \ + src/libnm-systemd-shared/src/basic/fd-util.h \ + src/libnm-systemd-shared/src/basic/fileio.c \ + src/libnm-systemd-shared/src/basic/fileio.h \ + src/libnm-systemd-shared/src/basic/format-util.c \ + src/libnm-systemd-shared/src/basic/format-util.h \ + src/libnm-systemd-shared/src/basic/fs-util.c \ + src/libnm-systemd-shared/src/basic/fs-util.h \ + src/libnm-systemd-shared/src/basic/hash-funcs.c \ + src/libnm-systemd-shared/src/basic/hash-funcs.h \ + src/libnm-systemd-shared/src/basic/hashmap.c \ + src/libnm-systemd-shared/src/basic/hashmap.h \ + src/libnm-systemd-shared/src/basic/hexdecoct.c \ + src/libnm-systemd-shared/src/basic/hexdecoct.h \ + src/libnm-systemd-shared/src/basic/hostname-util.c \ + src/libnm-systemd-shared/src/basic/hostname-util.h \ + src/libnm-systemd-shared/src/basic/in-addr-util.c \ + src/libnm-systemd-shared/src/basic/in-addr-util.h \ + src/libnm-systemd-shared/src/basic/io-util.c \ + src/libnm-systemd-shared/src/basic/io-util.h \ + src/libnm-systemd-shared/src/basic/list.h \ + src/libnm-systemd-shared/src/basic/log.h \ + src/libnm-systemd-shared/src/basic/macro.h \ + src/libnm-systemd-shared/src/basic/memory-util.c \ + src/libnm-systemd-shared/src/basic/memory-util.h \ + src/libnm-systemd-shared/src/basic/mempool.c \ + src/libnm-systemd-shared/src/basic/mempool.h \ + src/libnm-systemd-shared/src/basic/missing_fcntl.h \ + src/libnm-systemd-shared/src/basic/missing_random.h \ + src/libnm-systemd-shared/src/basic/missing_socket.h \ + src/libnm-systemd-shared/src/basic/missing_stat.h \ + src/libnm-systemd-shared/src/basic/missing_syscall.h \ + src/libnm-systemd-shared/src/basic/missing_type.h \ + src/libnm-systemd-shared/src/basic/parse-util.c \ + src/libnm-systemd-shared/src/basic/parse-util.h \ + src/libnm-systemd-shared/src/basic/path-util.c \ + src/libnm-systemd-shared/src/basic/path-util.h \ + src/libnm-systemd-shared/src/basic/prioq.c \ + src/libnm-systemd-shared/src/basic/prioq.h \ + src/libnm-systemd-shared/src/basic/process-util.c \ + src/libnm-systemd-shared/src/basic/process-util.h \ + src/libnm-systemd-shared/src/basic/random-util.c \ + src/libnm-systemd-shared/src/basic/random-util.h \ + src/libnm-systemd-shared/src/basic/ratelimit.c \ + src/libnm-systemd-shared/src/basic/ratelimit.h \ + src/libnm-systemd-shared/src/basic/set.h \ + src/libnm-systemd-shared/src/basic/signal-util.c \ + src/libnm-systemd-shared/src/basic/signal-util.h \ + src/libnm-systemd-shared/src/basic/siphash24.h \ + src/libnm-systemd-shared/src/basic/socket-util.c \ + src/libnm-systemd-shared/src/basic/socket-util.h \ + src/libnm-systemd-shared/src/basic/sort-util.h \ + src/libnm-systemd-shared/src/basic/sparse-endian.h \ + src/libnm-systemd-shared/src/basic/stat-util.c \ + src/libnm-systemd-shared/src/basic/stat-util.h \ + src/libnm-systemd-shared/src/basic/stdio-util.h \ + src/libnm-systemd-shared/src/basic/string-table.c \ + src/libnm-systemd-shared/src/basic/string-table.h \ + src/libnm-systemd-shared/src/basic/string-util.c \ + src/libnm-systemd-shared/src/basic/string-util.h \ + src/libnm-systemd-shared/src/basic/strv.c \ + src/libnm-systemd-shared/src/basic/strv.h \ + src/libnm-systemd-shared/src/basic/strxcpyx.c \ + src/libnm-systemd-shared/src/basic/strxcpyx.h \ + src/libnm-systemd-shared/src/basic/time-util.c \ + src/libnm-systemd-shared/src/basic/time-util.h \ + src/libnm-systemd-shared/src/basic/tmpfile-util.c \ + src/libnm-systemd-shared/src/basic/tmpfile-util.h \ + src/libnm-systemd-shared/src/basic/umask-util.h \ + src/libnm-systemd-shared/src/basic/utf8.c \ + src/libnm-systemd-shared/src/basic/utf8.h \ + src/libnm-systemd-shared/src/basic/util.c \ + src/libnm-systemd-shared/src/basic/util.h \ + src/libnm-systemd-shared/src/shared/dns-domain.c \ + src/libnm-systemd-shared/src/shared/dns-domain.h \ + src/libnm-systemd-shared/src/shared/log-link.h \ + src/libnm-systemd-shared/src/shared/web-util.c \ + src/libnm-systemd-shared/src/shared/web-util.h \ $(NULL) -shared_systemd_libnm_systemd_shared_la_LIBADD = \ +src_libnm_systemd_shared_libnm_systemd_shared_la_LIBADD = \ $(GLIB_LIBS) \ $(CODE_COVERAGE_LDFLAGS) \ $(NULL) @@ -2482,7 +2484,7 @@ src_core_libNetworkManager_la_LIBADD = \ shared/nm-glib-aux/libnm-glib-aux.la \ shared/nm-std-aux/libnm-std-aux.la \ src/core/libnm-systemd-core.la \ - shared/systemd/libnm-systemd-shared.la \ + src/libnm-systemd-shared/libnm-systemd-shared.la \ shared/libnacd.la \ shared/libndhcp4.la \ shared/libcrbtree.la \ @@ -2595,7 +2597,7 @@ src_core_nm_iface_helper_LDADD = \ shared/nm-glib-aux/libnm-glib-aux.la \ shared/nm-std-aux/libnm-std-aux.la \ src/core/libnm-systemd-core.la \ - shared/systemd/libnm-systemd-shared.la \ + src/libnm-systemd-shared/libnm-systemd-shared.la \ shared/libnacd.la \ shared/libndhcp4.la \ shared/libcrbtree.la \ @@ -2648,7 +2650,7 @@ src_core_initrd_nm_initrd_generator_LDADD = \ shared/nm-udev-aux/libnm-udev-aux.la \ shared/nm-glib-aux/libnm-glib-aux.la \ shared/nm-std-aux/libnm-std-aux.la \ - shared/systemd/libnm-systemd-shared.la \ + src/libnm-systemd-shared/libnm-systemd-shared.la \ shared/nm-glib-aux/libnm-glib-aux.la \ shared/nm-std-aux/libnm-std-aux.la \ shared/libndhcp4.la \ @@ -4307,7 +4309,7 @@ src_core_tests_test_systemd_LDFLAGS = \ src_core_tests_test_systemd_LDADD = \ src/core/libnm-systemd-core.la \ - shared/systemd/libnm-systemd-shared.la \ + src/libnm-systemd-shared/libnm-systemd-shared.la \ shared/libcsiphash.la \ $(GLIB_LIBS) \ $(CODE_COVERAGE_LDFLAGS) \ diff --git a/contrib/scripts/nm-code-format.sh b/contrib/scripts/nm-code-format.sh index 2de32aafc6..b4a83c6940 100755 --- a/contrib/scripts/nm-code-format.sh +++ b/contrib/scripts/nm-code-format.sh @@ -17,8 +17,8 @@ EXCLUDE=( ":(exclude)shared/n-acd" ":(exclude)shared/n-dhcp4" ":(exclude)shared/nm-std-aux/unaligned.h" - ":(exclude)shared/systemd/src" ":(exclude)src/core/systemd/src" + ":(exclude)src/libnm-systemd-shared/src" ) NM_ROOT="$(git rev-parse --show-toplevel)" || die "not inside a git repository" diff --git a/shared/meson.build b/shared/meson.build index 7462216fb2..955d80eadb 100644 --- a/shared/meson.build +++ b/shared/meson.build @@ -222,66 +222,6 @@ libnm_platform_dep = declare_dependency( link_with: libnm_platform, ) -libnm_systemd_shared = static_library( - 'nm-systemd-shared', - sources: files( - 'systemd/nm-sd-utils-shared.c', - 'systemd/src/basic/alloc-util.c', - 'systemd/src/basic/env-file.c', - 'systemd/src/basic/env-util.c', - 'systemd/src/basic/escape.c', - 'systemd/src/basic/ether-addr-util.c', - 'systemd/src/basic/extract-word.c', - 'systemd/src/basic/fd-util.c', - 'systemd/src/basic/fileio.c', - 'systemd/src/basic/format-util.c', - 'systemd/src/basic/fs-util.c', - 'systemd/src/basic/hash-funcs.c', - 'systemd/src/basic/hashmap.c', - 'systemd/src/basic/hexdecoct.c', - 'systemd/src/basic/hostname-util.c', - 'systemd/src/basic/in-addr-util.c', - 'systemd/src/basic/io-util.c', - 'systemd/src/basic/memory-util.c', - 'systemd/src/basic/mempool.c', - 'systemd/src/basic/parse-util.c', - 'systemd/src/basic/path-util.c', - 'systemd/src/basic/prioq.c', - 'systemd/src/basic/process-util.c', - 'systemd/src/basic/random-util.c', - 'systemd/src/basic/ratelimit.c', - 'systemd/src/basic/signal-util.c', - 'systemd/src/basic/socket-util.c', - 'systemd/src/basic/stat-util.c', - 'systemd/src/basic/string-table.c', - 'systemd/src/basic/string-util.c', - 'systemd/src/basic/strv.c', - 'systemd/src/basic/strxcpyx.c', - 'systemd/src/basic/time-util.c', - 'systemd/src/basic/tmpfile-util.c', - 'systemd/src/basic/utf8.c', - 'systemd/src/basic/util.c', - 'systemd/src/shared/dns-domain.c', - 'systemd/src/shared/web-util.c', - ), - include_directories: include_directories( - 'systemd/sd-adapt-shared', - 'systemd/src/basic', - 'systemd/src/shared', - ), - dependencies: glib_nm_default_dep, -) - -libnm_systemd_shared_dep = declare_dependency( - include_directories: include_directories( - 'systemd/sd-adapt-shared', - 'systemd/src/basic', - 'systemd/src/shared', - ), - dependencies: glib_dep, - link_with: libnm_systemd_shared, -) - if enable_tests subdir('nm-glib-aux/tests') subdir('nm-platform/tests') diff --git a/src/core/NetworkManagerUtils.c b/src/core/NetworkManagerUtils.c index 08402729f9..1b44c68134 100644 --- a/src/core/NetworkManagerUtils.c +++ b/src/core/NetworkManagerUtils.c @@ -24,7 +24,7 @@ #include "platform/nm-platform.h" #include "nm-auth-utils.h" -#include "systemd/nm-sd-utils-shared.h" +#include "libnm-systemd-shared/nm-sd-utils-shared.h" /*****************************************************************************/ diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c index 28ba196b60..e5271bac77 100644 --- a/src/core/devices/nm-device.c +++ b/src/core/devices/nm-device.c @@ -26,7 +26,7 @@ #include "nm-std-aux/unaligned.h" #include "nm-glib-aux/nm-dedup-multi.h" #include "nm-glib-aux/nm-random-utils.h" -#include "systemd/nm-sd-utils-shared.h" +#include "libnm-systemd-shared/nm-sd-utils-shared.h" #include "nm-base/nm-ethtool-base.h" #include "libnm-core-aux-intern/nm-common-macros.h" diff --git a/src/core/dhcp/nm-dhcp-manager.c b/src/core/dhcp/nm-dhcp-manager.c index bc114ad80c..aeaac63571 100644 --- a/src/core/dhcp/nm-dhcp-manager.c +++ b/src/core/dhcp/nm-dhcp-manager.c @@ -17,7 +17,7 @@ #include #include "nm-glib-aux/nm-dedup-multi.h" -#include "systemd/nm-sd-utils-shared.h" +#include "libnm-systemd-shared/nm-sd-utils-shared.h" #include "nm-config.h" #include "NetworkManagerUtils.h" diff --git a/src/core/dhcp/nm-dhcp-nettools.c b/src/core/dhcp/nm-dhcp-nettools.c index 116e1bdb24..783d0be2cd 100644 --- a/src/core/dhcp/nm-dhcp-nettools.c +++ b/src/core/dhcp/nm-dhcp-nettools.c @@ -26,7 +26,7 @@ #include "platform/nm-platform.h" #include "nm-dhcp-client-logging.h" #include "n-dhcp4/src/n-dhcp4.h" -#include "systemd/nm-sd-utils-shared.h" +#include "libnm-systemd-shared/nm-sd-utils-shared.h" #include "systemd/nm-sd-utils-dhcp.h" /*****************************************************************************/ diff --git a/src/core/dhcp/nm-dhcp-utils.c b/src/core/dhcp/nm-dhcp-utils.c index 9867e4c16e..26de6d6276 100644 --- a/src/core/dhcp/nm-dhcp-utils.c +++ b/src/core/dhcp/nm-dhcp-utils.c @@ -11,7 +11,7 @@ #include "nm-std-aux/unaligned.h" #include "nm-glib-aux/nm-dedup-multi.h" #include "nm-glib-aux/nm-str-buf.h" -#include "systemd/nm-sd-utils-shared.h" +#include "libnm-systemd-shared/nm-sd-utils-shared.h" #include "nm-dhcp-utils.h" #include "nm-utils.h" diff --git a/src/core/initrd/nmi-cmdline-reader.c b/src/core/initrd/nmi-cmdline-reader.c index 3bde667888..646faefbd3 100644 --- a/src/core/initrd/nmi-cmdline-reader.c +++ b/src/core/initrd/nmi-cmdline-reader.c @@ -10,7 +10,7 @@ #include "libnm-core-intern/nm-core-internal.h" #include "nm-initrd-generator.h" -#include "systemd/nm-sd-utils-shared.h" +#include "libnm-systemd-shared/nm-sd-utils-shared.h" /*****************************************************************************/ diff --git a/src/core/ndisc/nm-lndp-ndisc.c b/src/core/ndisc/nm-lndp-ndisc.c index f773478f51..31f6081463 100644 --- a/src/core/ndisc/nm-lndp-ndisc.c +++ b/src/core/ndisc/nm-lndp-ndisc.c @@ -14,7 +14,7 @@ #include #include "nm-glib-aux/nm-str-buf.h" -#include "systemd/nm-sd-utils-shared.h" +#include "libnm-systemd-shared/nm-sd-utils-shared.h" #include "nm-ndisc-private.h" #include "NetworkManagerUtils.h" #include "platform/nm-platform.h" diff --git a/src/core/settings/plugins/keyfile/nms-keyfile-plugin.c b/src/core/settings/plugins/keyfile/nms-keyfile-plugin.c index 6d3e879611..902270158a 100644 --- a/src/core/settings/plugins/keyfile/nms-keyfile-plugin.c +++ b/src/core/settings/plugins/keyfile/nms-keyfile-plugin.c @@ -25,7 +25,7 @@ #include "libnm-core-intern/nm-core-internal.h" #include "libnm-core-intern/nm-keyfile-internal.h" -#include "systemd/nm-sd-utils-shared.h" +#include "libnm-systemd-shared/nm-sd-utils-shared.h" #include "settings/nm-settings-plugin.h" #include "settings/nm-settings-storage.h" diff --git a/src/core/systemd/sd-adapt-core/nm-sd-adapt-core.h b/src/core/systemd/sd-adapt-core/nm-sd-adapt-core.h index f627d7d471..ceedfdb06b 100644 --- a/src/core/systemd/sd-adapt-core/nm-sd-adapt-core.h +++ b/src/core/systemd/sd-adapt-core/nm-sd-adapt-core.h @@ -13,7 +13,7 @@ #include #undef NETWORKMANAGER_COMPILATION -#include "systemd/sd-adapt-shared/nm-sd-adapt-shared.h" +#include "libnm-systemd-shared/sd-adapt-shared/nm-sd-adapt-shared.h" #undef NETWORKMANAGER_COMPILATION #define NETWORKMANAGER_COMPILATION NM_NETWORKMANAGER_COMPILATION_SYSTEMD diff --git a/src/core/tests/test-systemd.c b/src/core/tests/test-systemd.c index 03576c133c..c6711f0b2b 100644 --- a/src/core/tests/test-systemd.c +++ b/src/core/tests/test-systemd.c @@ -6,7 +6,7 @@ #include "src/core/systemd/nm-default-systemd.h" #include "systemd/nm-sd.h" -#include "systemd/nm-sd-utils-shared.h" +#include "libnm-systemd-shared/nm-sd-utils-shared.h" #include "nm-test-utils-core.h" diff --git a/src/libnm-core-impl/nm-keyfile.c b/src/libnm-core-impl/nm-keyfile.c index 4e12f13c7e..f15e004f61 100644 --- a/src/libnm-core-impl/nm-keyfile.c +++ b/src/libnm-core-impl/nm-keyfile.c @@ -20,7 +20,7 @@ #include "nm-glib-aux/nm-str-buf.h" #include "nm-glib-aux/nm-secret-utils.h" -#include "systemd/nm-sd-utils-shared.h" +#include "libnm-systemd-shared/nm-sd-utils-shared.h" #include "libnm-core-aux-intern/nm-common-macros.h" #include "libnm-core-intern/nm-core-internal.h" diff --git a/src/libnm-core-impl/nm-setting-connection.c b/src/libnm-core-impl/nm-setting-connection.c index 38ba6663fb..241a871e05 100644 --- a/src/libnm-core-impl/nm-setting-connection.c +++ b/src/libnm-core-impl/nm-setting-connection.c @@ -17,7 +17,7 @@ #include "nm-setting-bridge.h" #include "nm-setting-team.h" #include "nm-setting-vlan.h" -#include "systemd/nm-sd-utils-shared.h" +#include "libnm-systemd-shared/nm-sd-utils-shared.h" /** * SECTION:nm-setting-connection diff --git a/src/libnm-core-impl/nm-utils.c b/src/libnm-core-impl/nm-utils.c index d4ab51df5f..7a1789caef 100644 --- a/src/libnm-core-impl/nm-utils.c +++ b/src/libnm-core-impl/nm-utils.c @@ -23,7 +23,7 @@ #include "nm-glib-aux/nm-enum-utils.h" #include "nm-glib-aux/nm-time-utils.h" #include "nm-glib-aux/nm-secret-utils.h" -#include "systemd/nm-sd-utils-shared.h" +#include "libnm-systemd-shared/nm-sd-utils-shared.h" #include "libnm-core-aux-intern/nm-common-macros.h" #include "nm-utils-private.h" #include "nm-setting-private.h" diff --git a/src/libnm-core-impl/tests/test-general.c b/src/libnm-core-impl/tests/test-general.c index 80ec0e0c77..b8a3def342 100644 --- a/src/libnm-core-impl/tests/test-general.c +++ b/src/libnm-core-impl/tests/test-general.c @@ -18,7 +18,7 @@ #include "nm-glib-aux/nm-str-buf.h" #include "nm-glib-aux/nm-json-aux.h" #include "nm-base/nm-base.h" -#include "systemd/nm-sd-utils-shared.h" +#include "libnm-systemd-shared/nm-sd-utils-shared.h" #include "nm-utils.h" #include "nm-setting-private.h" diff --git a/src/libnm-systemd-shared/meson.build b/src/libnm-systemd-shared/meson.build new file mode 100644 index 0000000000..cb4c49b7a5 --- /dev/null +++ b/src/libnm-systemd-shared/meson.build @@ -0,0 +1,65 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +libnm_systemd_shared = static_library( + 'nm-systemd-shared', + sources: files( + 'nm-sd-utils-shared.c', + 'src/basic/alloc-util.c', + 'src/basic/env-file.c', + 'src/basic/env-util.c', + 'src/basic/escape.c', + 'src/basic/ether-addr-util.c', + 'src/basic/extract-word.c', + 'src/basic/fd-util.c', + 'src/basic/fileio.c', + 'src/basic/format-util.c', + 'src/basic/fs-util.c', + 'src/basic/hash-funcs.c', + 'src/basic/hashmap.c', + 'src/basic/hexdecoct.c', + 'src/basic/hostname-util.c', + 'src/basic/in-addr-util.c', + 'src/basic/io-util.c', + 'src/basic/memory-util.c', + 'src/basic/mempool.c', + 'src/basic/parse-util.c', + 'src/basic/path-util.c', + 'src/basic/prioq.c', + 'src/basic/process-util.c', + 'src/basic/random-util.c', + 'src/basic/ratelimit.c', + 'src/basic/signal-util.c', + 'src/basic/socket-util.c', + 'src/basic/stat-util.c', + 'src/basic/string-table.c', + 'src/basic/string-util.c', + 'src/basic/strv.c', + 'src/basic/strxcpyx.c', + 'src/basic/time-util.c', + 'src/basic/tmpfile-util.c', + 'src/basic/utf8.c', + 'src/basic/util.c', + 'src/shared/dns-domain.c', + 'src/shared/web-util.c', + ), + include_directories: [ + include_directories( + 'sd-adapt-shared', + 'src/basic', + 'src/shared', + ), + top_inc, + src_inc, + ], + dependencies: glib_nm_default_dep, +) + +libnm_systemd_shared_dep = declare_dependency( + include_directories: include_directories( + 'sd-adapt-shared', + 'src/basic', + 'src/shared', + ), + dependencies: glib_dep, + link_with: libnm_systemd_shared, +) diff --git a/shared/systemd/nm-default-systemd-shared.h b/src/libnm-systemd-shared/nm-default-systemd-shared.h similarity index 100% rename from shared/systemd/nm-default-systemd-shared.h rename to src/libnm-systemd-shared/nm-default-systemd-shared.h diff --git a/shared/systemd/nm-sd-utils-shared.c b/src/libnm-systemd-shared/nm-sd-utils-shared.c similarity index 98% rename from shared/systemd/nm-sd-utils-shared.c rename to src/libnm-systemd-shared/nm-sd-utils-shared.c index f0504aa937..8c8934b1a4 100644 --- a/shared/systemd/nm-sd-utils-shared.c +++ b/src/libnm-systemd-shared/nm-sd-utils-shared.c @@ -3,7 +3,7 @@ * Copyright (C) 2018 Red Hat, Inc. */ -#include "shared/systemd/nm-default-systemd-shared.h" +#include "libnm-systemd-shared/nm-default-systemd-shared.h" #include "nm-sd-utils-shared.h" diff --git a/shared/systemd/nm-sd-utils-shared.h b/src/libnm-systemd-shared/nm-sd-utils-shared.h similarity index 100% rename from shared/systemd/nm-sd-utils-shared.h rename to src/libnm-systemd-shared/nm-sd-utils-shared.h diff --git a/shared/systemd/sd-adapt-shared/architecture.h b/src/libnm-systemd-shared/sd-adapt-shared/architecture.h similarity index 100% rename from shared/systemd/sd-adapt-shared/architecture.h rename to src/libnm-systemd-shared/sd-adapt-shared/architecture.h diff --git a/shared/systemd/sd-adapt-shared/arphrd-list.h b/src/libnm-systemd-shared/sd-adapt-shared/arphrd-list.h similarity index 100% rename from shared/systemd/sd-adapt-shared/arphrd-list.h rename to src/libnm-systemd-shared/sd-adapt-shared/arphrd-list.h diff --git a/shared/systemd/sd-adapt-shared/blockdev-util.h b/src/libnm-systemd-shared/sd-adapt-shared/blockdev-util.h similarity index 100% rename from shared/systemd/sd-adapt-shared/blockdev-util.h rename to src/libnm-systemd-shared/sd-adapt-shared/blockdev-util.h diff --git a/shared/systemd/sd-adapt-shared/build.h b/src/libnm-systemd-shared/sd-adapt-shared/build.h similarity index 100% rename from shared/systemd/sd-adapt-shared/build.h rename to src/libnm-systemd-shared/sd-adapt-shared/build.h diff --git a/shared/systemd/sd-adapt-shared/copy.h b/src/libnm-systemd-shared/sd-adapt-shared/copy.h similarity index 100% rename from shared/systemd/sd-adapt-shared/copy.h rename to src/libnm-systemd-shared/sd-adapt-shared/copy.h diff --git a/shared/systemd/sd-adapt-shared/def.h b/src/libnm-systemd-shared/sd-adapt-shared/def.h similarity index 100% rename from shared/systemd/sd-adapt-shared/def.h rename to src/libnm-systemd-shared/sd-adapt-shared/def.h diff --git a/shared/systemd/sd-adapt-shared/dhcp-server-internal.h b/src/libnm-systemd-shared/sd-adapt-shared/dhcp-server-internal.h similarity index 100% rename from shared/systemd/sd-adapt-shared/dhcp-server-internal.h rename to src/libnm-systemd-shared/sd-adapt-shared/dhcp-server-internal.h diff --git a/shared/systemd/sd-adapt-shared/dirent-util.h b/src/libnm-systemd-shared/sd-adapt-shared/dirent-util.h similarity index 100% rename from shared/systemd/sd-adapt-shared/dirent-util.h rename to src/libnm-systemd-shared/sd-adapt-shared/dirent-util.h diff --git a/shared/systemd/sd-adapt-shared/errno-list.h b/src/libnm-systemd-shared/sd-adapt-shared/errno-list.h similarity index 100% rename from shared/systemd/sd-adapt-shared/errno-list.h rename to src/libnm-systemd-shared/sd-adapt-shared/errno-list.h diff --git a/shared/systemd/sd-adapt-shared/glob-util.h b/src/libnm-systemd-shared/sd-adapt-shared/glob-util.h similarity index 100% rename from shared/systemd/sd-adapt-shared/glob-util.h rename to src/libnm-systemd-shared/sd-adapt-shared/glob-util.h diff --git a/shared/systemd/sd-adapt-shared/gunicode.h b/src/libnm-systemd-shared/sd-adapt-shared/gunicode.h similarity index 100% rename from shared/systemd/sd-adapt-shared/gunicode.h rename to src/libnm-systemd-shared/sd-adapt-shared/gunicode.h diff --git a/shared/systemd/sd-adapt-shared/idn-util.h b/src/libnm-systemd-shared/sd-adapt-shared/idn-util.h similarity index 100% rename from shared/systemd/sd-adapt-shared/idn-util.h rename to src/libnm-systemd-shared/sd-adapt-shared/idn-util.h diff --git a/shared/systemd/sd-adapt-shared/ioprio.h b/src/libnm-systemd-shared/sd-adapt-shared/ioprio.h similarity index 100% rename from shared/systemd/sd-adapt-shared/ioprio.h rename to src/libnm-systemd-shared/sd-adapt-shared/ioprio.h diff --git a/shared/systemd/sd-adapt-shared/locale-util.h b/src/libnm-systemd-shared/sd-adapt-shared/locale-util.h similarity index 100% rename from shared/systemd/sd-adapt-shared/locale-util.h rename to src/libnm-systemd-shared/sd-adapt-shared/locale-util.h diff --git a/shared/systemd/sd-adapt-shared/memfd-util.h b/src/libnm-systemd-shared/sd-adapt-shared/memfd-util.h similarity index 100% rename from shared/systemd/sd-adapt-shared/memfd-util.h rename to src/libnm-systemd-shared/sd-adapt-shared/memfd-util.h diff --git a/shared/systemd/sd-adapt-shared/missing_fs.h b/src/libnm-systemd-shared/sd-adapt-shared/missing_fs.h similarity index 100% rename from shared/systemd/sd-adapt-shared/missing_fs.h rename to src/libnm-systemd-shared/sd-adapt-shared/missing_fs.h diff --git a/shared/systemd/sd-adapt-shared/missing_keyctl.h b/src/libnm-systemd-shared/sd-adapt-shared/missing_keyctl.h similarity index 100% rename from shared/systemd/sd-adapt-shared/missing_keyctl.h rename to src/libnm-systemd-shared/sd-adapt-shared/missing_keyctl.h diff --git a/shared/systemd/sd-adapt-shared/missing_magic.h b/src/libnm-systemd-shared/sd-adapt-shared/missing_magic.h similarity index 100% rename from shared/systemd/sd-adapt-shared/missing_magic.h rename to src/libnm-systemd-shared/sd-adapt-shared/missing_magic.h diff --git a/shared/systemd/sd-adapt-shared/missing_network.h b/src/libnm-systemd-shared/sd-adapt-shared/missing_network.h similarity index 100% rename from shared/systemd/sd-adapt-shared/missing_network.h rename to src/libnm-systemd-shared/sd-adapt-shared/missing_network.h diff --git a/shared/systemd/sd-adapt-shared/missing_sched.h b/src/libnm-systemd-shared/sd-adapt-shared/missing_sched.h similarity index 100% rename from shared/systemd/sd-adapt-shared/missing_sched.h rename to src/libnm-systemd-shared/sd-adapt-shared/missing_sched.h diff --git a/shared/systemd/sd-adapt-shared/missing_timerfd.h b/src/libnm-systemd-shared/sd-adapt-shared/missing_timerfd.h similarity index 100% rename from shared/systemd/sd-adapt-shared/missing_timerfd.h rename to src/libnm-systemd-shared/sd-adapt-shared/missing_timerfd.h diff --git a/shared/systemd/sd-adapt-shared/mkdir.h b/src/libnm-systemd-shared/sd-adapt-shared/mkdir.h similarity index 100% rename from shared/systemd/sd-adapt-shared/mkdir.h rename to src/libnm-systemd-shared/sd-adapt-shared/mkdir.h diff --git a/shared/systemd/sd-adapt-shared/namespace-util.h b/src/libnm-systemd-shared/sd-adapt-shared/namespace-util.h similarity index 100% rename from shared/systemd/sd-adapt-shared/namespace-util.h rename to src/libnm-systemd-shared/sd-adapt-shared/namespace-util.h diff --git a/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h b/src/libnm-systemd-shared/sd-adapt-shared/nm-sd-adapt-shared.h similarity index 99% rename from shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h rename to src/libnm-systemd-shared/sd-adapt-shared/nm-sd-adapt-shared.h index b094ce40b6..83531e230e 100644 --- a/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h +++ b/src/libnm-systemd-shared/sd-adapt-shared/nm-sd-adapt-shared.h @@ -6,7 +6,7 @@ #ifndef __NM_SD_ADAPT_SHARED_H__ #define __NM_SD_ADAPT_SHARED_H__ -#include "shared/systemd/nm-default-systemd-shared.h" +#include "libnm-systemd-shared/nm-default-systemd-shared.h" #include "nm-glib-aux/nm-logging-fwd.h" diff --git a/shared/systemd/sd-adapt-shared/nulstr-util.h b/src/libnm-systemd-shared/sd-adapt-shared/nulstr-util.h similarity index 100% rename from shared/systemd/sd-adapt-shared/nulstr-util.h rename to src/libnm-systemd-shared/sd-adapt-shared/nulstr-util.h diff --git a/shared/systemd/sd-adapt-shared/raw-clone.h b/src/libnm-systemd-shared/sd-adapt-shared/raw-clone.h similarity index 100% rename from shared/systemd/sd-adapt-shared/raw-clone.h rename to src/libnm-systemd-shared/sd-adapt-shared/raw-clone.h diff --git a/shared/systemd/sd-adapt-shared/rlimit-util.h b/src/libnm-systemd-shared/sd-adapt-shared/rlimit-util.h similarity index 100% rename from shared/systemd/sd-adapt-shared/rlimit-util.h rename to src/libnm-systemd-shared/sd-adapt-shared/rlimit-util.h diff --git a/shared/systemd/sd-adapt-shared/terminal-util.h b/src/libnm-systemd-shared/sd-adapt-shared/terminal-util.h similarity index 100% rename from shared/systemd/sd-adapt-shared/terminal-util.h rename to src/libnm-systemd-shared/sd-adapt-shared/terminal-util.h diff --git a/shared/systemd/sd-adapt-shared/unaligned.h b/src/libnm-systemd-shared/sd-adapt-shared/unaligned.h similarity index 100% rename from shared/systemd/sd-adapt-shared/unaligned.h rename to src/libnm-systemd-shared/sd-adapt-shared/unaligned.h diff --git a/shared/systemd/sd-adapt-shared/user-util.h b/src/libnm-systemd-shared/sd-adapt-shared/user-util.h similarity index 100% rename from shared/systemd/sd-adapt-shared/user-util.h rename to src/libnm-systemd-shared/sd-adapt-shared/user-util.h diff --git a/shared/systemd/sd-adapt-shared/virt.h b/src/libnm-systemd-shared/sd-adapt-shared/virt.h similarity index 100% rename from shared/systemd/sd-adapt-shared/virt.h rename to src/libnm-systemd-shared/sd-adapt-shared/virt.h diff --git a/shared/systemd/src/basic/alloc-util.c b/src/libnm-systemd-shared/src/basic/alloc-util.c similarity index 100% rename from shared/systemd/src/basic/alloc-util.c rename to src/libnm-systemd-shared/src/basic/alloc-util.c diff --git a/shared/systemd/src/basic/alloc-util.h b/src/libnm-systemd-shared/src/basic/alloc-util.h similarity index 100% rename from shared/systemd/src/basic/alloc-util.h rename to src/libnm-systemd-shared/src/basic/alloc-util.h diff --git a/shared/systemd/src/basic/async.h b/src/libnm-systemd-shared/src/basic/async.h similarity index 100% rename from shared/systemd/src/basic/async.h rename to src/libnm-systemd-shared/src/basic/async.h diff --git a/shared/systemd/src/basic/cgroup-util.h b/src/libnm-systemd-shared/src/basic/cgroup-util.h similarity index 100% rename from shared/systemd/src/basic/cgroup-util.h rename to src/libnm-systemd-shared/src/basic/cgroup-util.h diff --git a/shared/systemd/src/basic/env-file.c b/src/libnm-systemd-shared/src/basic/env-file.c similarity index 100% rename from shared/systemd/src/basic/env-file.c rename to src/libnm-systemd-shared/src/basic/env-file.c diff --git a/shared/systemd/src/basic/env-file.h b/src/libnm-systemd-shared/src/basic/env-file.h similarity index 100% rename from shared/systemd/src/basic/env-file.h rename to src/libnm-systemd-shared/src/basic/env-file.h diff --git a/shared/systemd/src/basic/env-util.c b/src/libnm-systemd-shared/src/basic/env-util.c similarity index 100% rename from shared/systemd/src/basic/env-util.c rename to src/libnm-systemd-shared/src/basic/env-util.c diff --git a/shared/systemd/src/basic/env-util.h b/src/libnm-systemd-shared/src/basic/env-util.h similarity index 100% rename from shared/systemd/src/basic/env-util.h rename to src/libnm-systemd-shared/src/basic/env-util.h diff --git a/shared/systemd/src/basic/errno-util.h b/src/libnm-systemd-shared/src/basic/errno-util.h similarity index 100% rename from shared/systemd/src/basic/errno-util.h rename to src/libnm-systemd-shared/src/basic/errno-util.h diff --git a/shared/systemd/src/basic/escape.c b/src/libnm-systemd-shared/src/basic/escape.c similarity index 100% rename from shared/systemd/src/basic/escape.c rename to src/libnm-systemd-shared/src/basic/escape.c diff --git a/shared/systemd/src/basic/escape.h b/src/libnm-systemd-shared/src/basic/escape.h similarity index 100% rename from shared/systemd/src/basic/escape.h rename to src/libnm-systemd-shared/src/basic/escape.h diff --git a/shared/systemd/src/basic/ether-addr-util.c b/src/libnm-systemd-shared/src/basic/ether-addr-util.c similarity index 100% rename from shared/systemd/src/basic/ether-addr-util.c rename to src/libnm-systemd-shared/src/basic/ether-addr-util.c diff --git a/shared/systemd/src/basic/ether-addr-util.h b/src/libnm-systemd-shared/src/basic/ether-addr-util.h similarity index 100% rename from shared/systemd/src/basic/ether-addr-util.h rename to src/libnm-systemd-shared/src/basic/ether-addr-util.h diff --git a/shared/systemd/src/basic/extract-word.c b/src/libnm-systemd-shared/src/basic/extract-word.c similarity index 100% rename from shared/systemd/src/basic/extract-word.c rename to src/libnm-systemd-shared/src/basic/extract-word.c diff --git a/shared/systemd/src/basic/extract-word.h b/src/libnm-systemd-shared/src/basic/extract-word.h similarity index 100% rename from shared/systemd/src/basic/extract-word.h rename to src/libnm-systemd-shared/src/basic/extract-word.h diff --git a/shared/systemd/src/basic/fd-util.c b/src/libnm-systemd-shared/src/basic/fd-util.c similarity index 100% rename from shared/systemd/src/basic/fd-util.c rename to src/libnm-systemd-shared/src/basic/fd-util.c diff --git a/shared/systemd/src/basic/fd-util.h b/src/libnm-systemd-shared/src/basic/fd-util.h similarity index 100% rename from shared/systemd/src/basic/fd-util.h rename to src/libnm-systemd-shared/src/basic/fd-util.h diff --git a/shared/systemd/src/basic/fileio.c b/src/libnm-systemd-shared/src/basic/fileio.c similarity index 100% rename from shared/systemd/src/basic/fileio.c rename to src/libnm-systemd-shared/src/basic/fileio.c diff --git a/shared/systemd/src/basic/fileio.h b/src/libnm-systemd-shared/src/basic/fileio.h similarity index 100% rename from shared/systemd/src/basic/fileio.h rename to src/libnm-systemd-shared/src/basic/fileio.h diff --git a/shared/systemd/src/basic/format-util.c b/src/libnm-systemd-shared/src/basic/format-util.c similarity index 100% rename from shared/systemd/src/basic/format-util.c rename to src/libnm-systemd-shared/src/basic/format-util.c diff --git a/shared/systemd/src/basic/format-util.h b/src/libnm-systemd-shared/src/basic/format-util.h similarity index 100% rename from shared/systemd/src/basic/format-util.h rename to src/libnm-systemd-shared/src/basic/format-util.h diff --git a/shared/systemd/src/basic/fs-util.c b/src/libnm-systemd-shared/src/basic/fs-util.c similarity index 100% rename from shared/systemd/src/basic/fs-util.c rename to src/libnm-systemd-shared/src/basic/fs-util.c diff --git a/shared/systemd/src/basic/fs-util.h b/src/libnm-systemd-shared/src/basic/fs-util.h similarity index 100% rename from shared/systemd/src/basic/fs-util.h rename to src/libnm-systemd-shared/src/basic/fs-util.h diff --git a/shared/systemd/src/basic/hash-funcs.c b/src/libnm-systemd-shared/src/basic/hash-funcs.c similarity index 100% rename from shared/systemd/src/basic/hash-funcs.c rename to src/libnm-systemd-shared/src/basic/hash-funcs.c diff --git a/shared/systemd/src/basic/hash-funcs.h b/src/libnm-systemd-shared/src/basic/hash-funcs.h similarity index 100% rename from shared/systemd/src/basic/hash-funcs.h rename to src/libnm-systemd-shared/src/basic/hash-funcs.h diff --git a/shared/systemd/src/basic/hashmap.c b/src/libnm-systemd-shared/src/basic/hashmap.c similarity index 100% rename from shared/systemd/src/basic/hashmap.c rename to src/libnm-systemd-shared/src/basic/hashmap.c diff --git a/shared/systemd/src/basic/hashmap.h b/src/libnm-systemd-shared/src/basic/hashmap.h similarity index 100% rename from shared/systemd/src/basic/hashmap.h rename to src/libnm-systemd-shared/src/basic/hashmap.h diff --git a/shared/systemd/src/basic/hexdecoct.c b/src/libnm-systemd-shared/src/basic/hexdecoct.c similarity index 100% rename from shared/systemd/src/basic/hexdecoct.c rename to src/libnm-systemd-shared/src/basic/hexdecoct.c diff --git a/shared/systemd/src/basic/hexdecoct.h b/src/libnm-systemd-shared/src/basic/hexdecoct.h similarity index 100% rename from shared/systemd/src/basic/hexdecoct.h rename to src/libnm-systemd-shared/src/basic/hexdecoct.h diff --git a/shared/systemd/src/basic/hostname-util.c b/src/libnm-systemd-shared/src/basic/hostname-util.c similarity index 100% rename from shared/systemd/src/basic/hostname-util.c rename to src/libnm-systemd-shared/src/basic/hostname-util.c diff --git a/shared/systemd/src/basic/hostname-util.h b/src/libnm-systemd-shared/src/basic/hostname-util.h similarity index 100% rename from shared/systemd/src/basic/hostname-util.h rename to src/libnm-systemd-shared/src/basic/hostname-util.h diff --git a/shared/systemd/src/basic/in-addr-util.c b/src/libnm-systemd-shared/src/basic/in-addr-util.c similarity index 100% rename from shared/systemd/src/basic/in-addr-util.c rename to src/libnm-systemd-shared/src/basic/in-addr-util.c diff --git a/shared/systemd/src/basic/in-addr-util.h b/src/libnm-systemd-shared/src/basic/in-addr-util.h similarity index 100% rename from shared/systemd/src/basic/in-addr-util.h rename to src/libnm-systemd-shared/src/basic/in-addr-util.h diff --git a/shared/systemd/src/basic/io-util.c b/src/libnm-systemd-shared/src/basic/io-util.c similarity index 100% rename from shared/systemd/src/basic/io-util.c rename to src/libnm-systemd-shared/src/basic/io-util.c diff --git a/shared/systemd/src/basic/io-util.h b/src/libnm-systemd-shared/src/basic/io-util.h similarity index 100% rename from shared/systemd/src/basic/io-util.h rename to src/libnm-systemd-shared/src/basic/io-util.h diff --git a/shared/systemd/src/basic/list.h b/src/libnm-systemd-shared/src/basic/list.h similarity index 100% rename from shared/systemd/src/basic/list.h rename to src/libnm-systemd-shared/src/basic/list.h diff --git a/shared/systemd/src/basic/log.h b/src/libnm-systemd-shared/src/basic/log.h similarity index 100% rename from shared/systemd/src/basic/log.h rename to src/libnm-systemd-shared/src/basic/log.h diff --git a/shared/systemd/src/basic/macro.h b/src/libnm-systemd-shared/src/basic/macro.h similarity index 100% rename from shared/systemd/src/basic/macro.h rename to src/libnm-systemd-shared/src/basic/macro.h diff --git a/shared/systemd/src/basic/memory-util.c b/src/libnm-systemd-shared/src/basic/memory-util.c similarity index 100% rename from shared/systemd/src/basic/memory-util.c rename to src/libnm-systemd-shared/src/basic/memory-util.c diff --git a/shared/systemd/src/basic/memory-util.h b/src/libnm-systemd-shared/src/basic/memory-util.h similarity index 100% rename from shared/systemd/src/basic/memory-util.h rename to src/libnm-systemd-shared/src/basic/memory-util.h diff --git a/shared/systemd/src/basic/mempool.c b/src/libnm-systemd-shared/src/basic/mempool.c similarity index 100% rename from shared/systemd/src/basic/mempool.c rename to src/libnm-systemd-shared/src/basic/mempool.c diff --git a/shared/systemd/src/basic/mempool.h b/src/libnm-systemd-shared/src/basic/mempool.h similarity index 100% rename from shared/systemd/src/basic/mempool.h rename to src/libnm-systemd-shared/src/basic/mempool.h diff --git a/shared/systemd/src/basic/missing_fcntl.h b/src/libnm-systemd-shared/src/basic/missing_fcntl.h similarity index 100% rename from shared/systemd/src/basic/missing_fcntl.h rename to src/libnm-systemd-shared/src/basic/missing_fcntl.h diff --git a/shared/systemd/src/basic/missing_random.h b/src/libnm-systemd-shared/src/basic/missing_random.h similarity index 100% rename from shared/systemd/src/basic/missing_random.h rename to src/libnm-systemd-shared/src/basic/missing_random.h diff --git a/shared/systemd/src/basic/missing_socket.h b/src/libnm-systemd-shared/src/basic/missing_socket.h similarity index 100% rename from shared/systemd/src/basic/missing_socket.h rename to src/libnm-systemd-shared/src/basic/missing_socket.h diff --git a/shared/systemd/src/basic/missing_stat.h b/src/libnm-systemd-shared/src/basic/missing_stat.h similarity index 100% rename from shared/systemd/src/basic/missing_stat.h rename to src/libnm-systemd-shared/src/basic/missing_stat.h diff --git a/shared/systemd/src/basic/missing_syscall.h b/src/libnm-systemd-shared/src/basic/missing_syscall.h similarity index 100% rename from shared/systemd/src/basic/missing_syscall.h rename to src/libnm-systemd-shared/src/basic/missing_syscall.h diff --git a/shared/systemd/src/basic/missing_type.h b/src/libnm-systemd-shared/src/basic/missing_type.h similarity index 100% rename from shared/systemd/src/basic/missing_type.h rename to src/libnm-systemd-shared/src/basic/missing_type.h diff --git a/shared/systemd/src/basic/parse-util.c b/src/libnm-systemd-shared/src/basic/parse-util.c similarity index 100% rename from shared/systemd/src/basic/parse-util.c rename to src/libnm-systemd-shared/src/basic/parse-util.c diff --git a/shared/systemd/src/basic/parse-util.h b/src/libnm-systemd-shared/src/basic/parse-util.h similarity index 100% rename from shared/systemd/src/basic/parse-util.h rename to src/libnm-systemd-shared/src/basic/parse-util.h diff --git a/shared/systemd/src/basic/path-util.c b/src/libnm-systemd-shared/src/basic/path-util.c similarity index 100% rename from shared/systemd/src/basic/path-util.c rename to src/libnm-systemd-shared/src/basic/path-util.c diff --git a/shared/systemd/src/basic/path-util.h b/src/libnm-systemd-shared/src/basic/path-util.h similarity index 100% rename from shared/systemd/src/basic/path-util.h rename to src/libnm-systemd-shared/src/basic/path-util.h diff --git a/shared/systemd/src/basic/prioq.c b/src/libnm-systemd-shared/src/basic/prioq.c similarity index 100% rename from shared/systemd/src/basic/prioq.c rename to src/libnm-systemd-shared/src/basic/prioq.c diff --git a/shared/systemd/src/basic/prioq.h b/src/libnm-systemd-shared/src/basic/prioq.h similarity index 100% rename from shared/systemd/src/basic/prioq.h rename to src/libnm-systemd-shared/src/basic/prioq.h diff --git a/shared/systemd/src/basic/process-util.c b/src/libnm-systemd-shared/src/basic/process-util.c similarity index 100% rename from shared/systemd/src/basic/process-util.c rename to src/libnm-systemd-shared/src/basic/process-util.c diff --git a/shared/systemd/src/basic/process-util.h b/src/libnm-systemd-shared/src/basic/process-util.h similarity index 100% rename from shared/systemd/src/basic/process-util.h rename to src/libnm-systemd-shared/src/basic/process-util.h diff --git a/shared/systemd/src/basic/random-util.c b/src/libnm-systemd-shared/src/basic/random-util.c similarity index 100% rename from shared/systemd/src/basic/random-util.c rename to src/libnm-systemd-shared/src/basic/random-util.c diff --git a/shared/systemd/src/basic/random-util.h b/src/libnm-systemd-shared/src/basic/random-util.h similarity index 100% rename from shared/systemd/src/basic/random-util.h rename to src/libnm-systemd-shared/src/basic/random-util.h diff --git a/shared/systemd/src/basic/ratelimit.c b/src/libnm-systemd-shared/src/basic/ratelimit.c similarity index 100% rename from shared/systemd/src/basic/ratelimit.c rename to src/libnm-systemd-shared/src/basic/ratelimit.c diff --git a/shared/systemd/src/basic/ratelimit.h b/src/libnm-systemd-shared/src/basic/ratelimit.h similarity index 100% rename from shared/systemd/src/basic/ratelimit.h rename to src/libnm-systemd-shared/src/basic/ratelimit.h diff --git a/shared/systemd/src/basic/set.h b/src/libnm-systemd-shared/src/basic/set.h similarity index 100% rename from shared/systemd/src/basic/set.h rename to src/libnm-systemd-shared/src/basic/set.h diff --git a/shared/systemd/src/basic/signal-util.c b/src/libnm-systemd-shared/src/basic/signal-util.c similarity index 100% rename from shared/systemd/src/basic/signal-util.c rename to src/libnm-systemd-shared/src/basic/signal-util.c diff --git a/shared/systemd/src/basic/signal-util.h b/src/libnm-systemd-shared/src/basic/signal-util.h similarity index 100% rename from shared/systemd/src/basic/signal-util.h rename to src/libnm-systemd-shared/src/basic/signal-util.h diff --git a/shared/systemd/src/basic/siphash24.h b/src/libnm-systemd-shared/src/basic/siphash24.h similarity index 100% rename from shared/systemd/src/basic/siphash24.h rename to src/libnm-systemd-shared/src/basic/siphash24.h diff --git a/shared/systemd/src/basic/socket-util.c b/src/libnm-systemd-shared/src/basic/socket-util.c similarity index 100% rename from shared/systemd/src/basic/socket-util.c rename to src/libnm-systemd-shared/src/basic/socket-util.c diff --git a/shared/systemd/src/basic/socket-util.h b/src/libnm-systemd-shared/src/basic/socket-util.h similarity index 100% rename from shared/systemd/src/basic/socket-util.h rename to src/libnm-systemd-shared/src/basic/socket-util.h diff --git a/shared/systemd/src/basic/sort-util.h b/src/libnm-systemd-shared/src/basic/sort-util.h similarity index 100% rename from shared/systemd/src/basic/sort-util.h rename to src/libnm-systemd-shared/src/basic/sort-util.h diff --git a/shared/systemd/src/basic/sparse-endian.h b/src/libnm-systemd-shared/src/basic/sparse-endian.h similarity index 100% rename from shared/systemd/src/basic/sparse-endian.h rename to src/libnm-systemd-shared/src/basic/sparse-endian.h diff --git a/shared/systemd/src/basic/stat-util.c b/src/libnm-systemd-shared/src/basic/stat-util.c similarity index 100% rename from shared/systemd/src/basic/stat-util.c rename to src/libnm-systemd-shared/src/basic/stat-util.c diff --git a/shared/systemd/src/basic/stat-util.h b/src/libnm-systemd-shared/src/basic/stat-util.h similarity index 100% rename from shared/systemd/src/basic/stat-util.h rename to src/libnm-systemd-shared/src/basic/stat-util.h diff --git a/shared/systemd/src/basic/stdio-util.h b/src/libnm-systemd-shared/src/basic/stdio-util.h similarity index 100% rename from shared/systemd/src/basic/stdio-util.h rename to src/libnm-systemd-shared/src/basic/stdio-util.h diff --git a/shared/systemd/src/basic/string-table.c b/src/libnm-systemd-shared/src/basic/string-table.c similarity index 100% rename from shared/systemd/src/basic/string-table.c rename to src/libnm-systemd-shared/src/basic/string-table.c diff --git a/shared/systemd/src/basic/string-table.h b/src/libnm-systemd-shared/src/basic/string-table.h similarity index 100% rename from shared/systemd/src/basic/string-table.h rename to src/libnm-systemd-shared/src/basic/string-table.h diff --git a/shared/systemd/src/basic/string-util.c b/src/libnm-systemd-shared/src/basic/string-util.c similarity index 100% rename from shared/systemd/src/basic/string-util.c rename to src/libnm-systemd-shared/src/basic/string-util.c diff --git a/shared/systemd/src/basic/string-util.h b/src/libnm-systemd-shared/src/basic/string-util.h similarity index 100% rename from shared/systemd/src/basic/string-util.h rename to src/libnm-systemd-shared/src/basic/string-util.h diff --git a/shared/systemd/src/basic/strv.c b/src/libnm-systemd-shared/src/basic/strv.c similarity index 100% rename from shared/systemd/src/basic/strv.c rename to src/libnm-systemd-shared/src/basic/strv.c diff --git a/shared/systemd/src/basic/strv.h b/src/libnm-systemd-shared/src/basic/strv.h similarity index 100% rename from shared/systemd/src/basic/strv.h rename to src/libnm-systemd-shared/src/basic/strv.h diff --git a/shared/systemd/src/basic/strxcpyx.c b/src/libnm-systemd-shared/src/basic/strxcpyx.c similarity index 100% rename from shared/systemd/src/basic/strxcpyx.c rename to src/libnm-systemd-shared/src/basic/strxcpyx.c diff --git a/shared/systemd/src/basic/strxcpyx.h b/src/libnm-systemd-shared/src/basic/strxcpyx.h similarity index 100% rename from shared/systemd/src/basic/strxcpyx.h rename to src/libnm-systemd-shared/src/basic/strxcpyx.h diff --git a/shared/systemd/src/basic/time-util.c b/src/libnm-systemd-shared/src/basic/time-util.c similarity index 100% rename from shared/systemd/src/basic/time-util.c rename to src/libnm-systemd-shared/src/basic/time-util.c diff --git a/shared/systemd/src/basic/time-util.h b/src/libnm-systemd-shared/src/basic/time-util.h similarity index 100% rename from shared/systemd/src/basic/time-util.h rename to src/libnm-systemd-shared/src/basic/time-util.h diff --git a/shared/systemd/src/basic/tmpfile-util.c b/src/libnm-systemd-shared/src/basic/tmpfile-util.c similarity index 100% rename from shared/systemd/src/basic/tmpfile-util.c rename to src/libnm-systemd-shared/src/basic/tmpfile-util.c diff --git a/shared/systemd/src/basic/tmpfile-util.h b/src/libnm-systemd-shared/src/basic/tmpfile-util.h similarity index 100% rename from shared/systemd/src/basic/tmpfile-util.h rename to src/libnm-systemd-shared/src/basic/tmpfile-util.h diff --git a/shared/systemd/src/basic/umask-util.h b/src/libnm-systemd-shared/src/basic/umask-util.h similarity index 100% rename from shared/systemd/src/basic/umask-util.h rename to src/libnm-systemd-shared/src/basic/umask-util.h diff --git a/shared/systemd/src/basic/user-util.h b/src/libnm-systemd-shared/src/basic/user-util.h similarity index 100% rename from shared/systemd/src/basic/user-util.h rename to src/libnm-systemd-shared/src/basic/user-util.h diff --git a/shared/systemd/src/basic/utf8.c b/src/libnm-systemd-shared/src/basic/utf8.c similarity index 100% rename from shared/systemd/src/basic/utf8.c rename to src/libnm-systemd-shared/src/basic/utf8.c diff --git a/shared/systemd/src/basic/utf8.h b/src/libnm-systemd-shared/src/basic/utf8.h similarity index 100% rename from shared/systemd/src/basic/utf8.h rename to src/libnm-systemd-shared/src/basic/utf8.h diff --git a/shared/systemd/src/basic/util.c b/src/libnm-systemd-shared/src/basic/util.c similarity index 100% rename from shared/systemd/src/basic/util.c rename to src/libnm-systemd-shared/src/basic/util.c diff --git a/shared/systemd/src/basic/util.h b/src/libnm-systemd-shared/src/basic/util.h similarity index 100% rename from shared/systemd/src/basic/util.h rename to src/libnm-systemd-shared/src/basic/util.h diff --git a/shared/systemd/src/shared/dns-domain.c b/src/libnm-systemd-shared/src/shared/dns-domain.c similarity index 100% rename from shared/systemd/src/shared/dns-domain.c rename to src/libnm-systemd-shared/src/shared/dns-domain.c diff --git a/shared/systemd/src/shared/dns-domain.h b/src/libnm-systemd-shared/src/shared/dns-domain.h similarity index 100% rename from shared/systemd/src/shared/dns-domain.h rename to src/libnm-systemd-shared/src/shared/dns-domain.h diff --git a/shared/systemd/src/shared/log-link.h b/src/libnm-systemd-shared/src/shared/log-link.h similarity index 100% rename from shared/systemd/src/shared/log-link.h rename to src/libnm-systemd-shared/src/shared/log-link.h diff --git a/shared/systemd/src/shared/web-util.c b/src/libnm-systemd-shared/src/shared/web-util.c similarity index 100% rename from shared/systemd/src/shared/web-util.c rename to src/libnm-systemd-shared/src/shared/web-util.c diff --git a/shared/systemd/src/shared/web-util.h b/src/libnm-systemd-shared/src/shared/web-util.h similarity index 100% rename from shared/systemd/src/shared/web-util.h rename to src/libnm-systemd-shared/src/shared/web-util.h diff --git a/src/meson.build b/src/meson.build index c4bcd14d63..b8fc19f1fb 100644 --- a/src/meson.build +++ b/src/meson.build @@ -2,6 +2,7 @@ src_inc = include_directories('.') +subdir('libnm-systemd-shared') subdir('libnm-core-public') subdir('libnm-core-intern') subdir('libnm-core-aux-intern')