diff --git a/Makefile.am b/Makefile.am index 1806992bb5..84e20fe980 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2071,7 +2071,7 @@ libexec_PROGRAMS += \ noinst_LTLIBRARIES += \ src/core/libNetworkManagerBase.la \ src/core/libNetworkManager.la \ - src/core/libnm-systemd-core.la \ + src/libnm-systemd-core/libnm-systemd-core.la \ $(NULL) check-config-options: @@ -2250,102 +2250,98 @@ EXTRA_DIST += src/libnm-systemd-shared/meson.build ############################################################################### -src_core_libnm_systemd_core_la_cppflags = \ +src_libnm_systemd_core_libnm_systemd_core_la_cppflags = \ $(libsystemd_cppflags) \ - -I$(builddir)/src/libnm-core-public \ - -I$(srcdir)/src/libnm-core-public \ - -I$(srcdir)/src \ - -I$(srcdir)/src/core \ - -I$(srcdir)/src/core/systemd/sd-adapt-core \ - -I$(srcdir)/src/core/systemd/src/systemd \ - -I$(srcdir)/src/core/systemd/src/libsystemd-network \ - -I$(srcdir)/src/core/systemd/src/libsystemd/sd-event \ + -I$(srcdir)/src/libnm-systemd-core/sd-adapt-core \ + -I$(srcdir)/src/libnm-systemd-core/src/systemd \ + -I$(srcdir)/src/libnm-systemd-core/src/libsystemd-network \ + -I$(srcdir)/src/libnm-systemd-core/src/libsystemd/sd-event \ $(NULL) -src_core_libnm_systemd_core_la_libadd = \ +src_libnm_systemd_core_libnm_systemd_core_la_libadd = \ $(GLIB_LIBS) \ $(CODE_COVERAGE_LDFLAGS) \ $(NULL) -src_core_libnm_systemd_core_la_SOURCES = \ - src/core/systemd/nm-default-systemd.h \ - src/core/systemd/nm-sd-utils-core.c \ - src/core/systemd/nm-sd-utils-core.h \ - src/core/systemd/nm-sd.c \ - src/core/systemd/nm-sd.h \ - src/core/systemd/nm-sd-utils-dhcp.h \ - src/core/systemd/nm-sd-utils-dhcp.c \ - src/core/systemd/sd-adapt-core/condition.h \ - src/core/systemd/sd-adapt-core/conf-parser.h \ - src/core/systemd/sd-adapt-core/device-util.h \ - src/core/systemd/sd-adapt-core/khash.h \ - src/core/systemd/sd-adapt-core/network-util.h \ - src/core/systemd/sd-adapt-core/nm-sd-adapt-core.c \ - src/core/systemd/sd-adapt-core/nm-sd-adapt-core.h \ - src/core/systemd/sd-adapt-core/sd-daemon.h \ - src/core/systemd/sd-adapt-core/sd-device.h \ - src/core/systemd/sd-adapt-core/udev-util.h \ - src/core/systemd/src/libsystemd-network/arp-util.c \ - src/core/systemd/src/libsystemd-network/arp-util.h \ - src/core/systemd/src/libsystemd-network/dhcp-identifier.c \ - src/core/systemd/src/libsystemd-network/dhcp-identifier.h \ - src/core/systemd/src/libsystemd-network/dhcp-internal.h \ - src/core/systemd/src/libsystemd-network/dhcp-lease-internal.h \ - src/core/systemd/src/libsystemd-network/dhcp-network.c \ - src/core/systemd/src/libsystemd-network/dhcp-option.c \ - src/core/systemd/src/libsystemd-network/dhcp-packet.c \ - src/core/systemd/src/libsystemd-network/dhcp-protocol.h \ - src/core/systemd/src/libsystemd-network/dhcp6-internal.h \ - src/core/systemd/src/libsystemd-network/dhcp6-lease-internal.h \ - src/core/systemd/src/libsystemd-network/dhcp6-network.c \ - src/core/systemd/src/libsystemd-network/dhcp6-option.c \ - src/core/systemd/src/libsystemd-network/dhcp6-protocol.h \ - src/core/systemd/src/libsystemd-network/lldp-internal.h \ - src/core/systemd/src/libsystemd-network/lldp-neighbor.c \ - src/core/systemd/src/libsystemd-network/lldp-neighbor.h \ - src/core/systemd/src/libsystemd-network/lldp-network.c \ - src/core/systemd/src/libsystemd-network/lldp-network.h \ - src/core/systemd/src/libsystemd-network/network-common.c \ - src/core/systemd/src/libsystemd-network/network-common.h \ - src/core/systemd/src/libsystemd-network/network-internal.c \ - src/core/systemd/src/libsystemd-network/network-internal.h \ - src/core/systemd/src/libsystemd-network/sd-dhcp-client.c \ - src/core/systemd/src/libsystemd-network/sd-dhcp-lease.c \ - src/core/systemd/src/libsystemd-network/sd-dhcp6-client.c \ - src/core/systemd/src/libsystemd-network/sd-dhcp6-lease.c \ - src/core/systemd/src/libsystemd-network/sd-ipv4acd.c \ - src/core/systemd/src/libsystemd-network/sd-ipv4ll.c \ - src/core/systemd/src/libsystemd-network/sd-lldp.c \ - src/core/systemd/src/libsystemd/sd-event/event-source.h \ - src/core/systemd/src/libsystemd/sd-event/event-util.c \ - src/core/systemd/src/libsystemd/sd-event/event-util.h \ - src/core/systemd/src/libsystemd/sd-event/sd-event.c \ - src/core/systemd/src/libsystemd/sd-id128/id128-util.c \ - src/core/systemd/src/libsystemd/sd-id128/id128-util.h \ - src/core/systemd/src/libsystemd/sd-id128/sd-id128.c \ - src/core/systemd/src/systemd/_sd-common.h \ - src/core/systemd/src/systemd/sd-dhcp-client.h \ - src/core/systemd/src/systemd/sd-dhcp-lease.h \ - src/core/systemd/src/systemd/sd-dhcp-option.h \ - src/core/systemd/src/systemd/sd-dhcp6-client.h \ - src/core/systemd/src/systemd/sd-dhcp6-lease.h \ - src/core/systemd/src/systemd/sd-dhcp6-option.h \ - src/core/systemd/src/systemd/sd-event.h \ - src/core/systemd/src/systemd/sd-id128.h \ - src/core/systemd/src/systemd/sd-ipv4acd.h \ - src/core/systemd/src/systemd/sd-ipv4ll.h \ - src/core/systemd/src/systemd/sd-lldp.h \ - src/core/systemd/src/systemd/sd-ndisc.h \ +src_libnm_systemd_core_libnm_systemd_core_la_SOURCES = \ + src/libnm-systemd-core/nm-default-systemd-core.h \ + src/libnm-systemd-core/nm-sd-utils-core.c \ + src/libnm-systemd-core/nm-sd-utils-core.h \ + src/libnm-systemd-core/nm-sd.c \ + src/libnm-systemd-core/nm-sd.h \ + src/libnm-systemd-core/nm-sd-utils-dhcp.h \ + src/libnm-systemd-core/nm-sd-utils-dhcp.c \ + src/libnm-systemd-core/sd-adapt-core/condition.h \ + src/libnm-systemd-core/sd-adapt-core/conf-parser.h \ + src/libnm-systemd-core/sd-adapt-core/device-util.h \ + src/libnm-systemd-core/sd-adapt-core/khash.h \ + src/libnm-systemd-core/sd-adapt-core/network-util.h \ + src/libnm-systemd-core/sd-adapt-core/nm-sd-adapt-core.c \ + src/libnm-systemd-core/sd-adapt-core/nm-sd-adapt-core.h \ + src/libnm-systemd-core/sd-adapt-core/sd-daemon.h \ + src/libnm-systemd-core/sd-adapt-core/sd-device.h \ + src/libnm-systemd-core/sd-adapt-core/udev-util.h \ + src/libnm-systemd-core/src/libsystemd-network/arp-util.c \ + src/libnm-systemd-core/src/libsystemd-network/arp-util.h \ + src/libnm-systemd-core/src/libsystemd-network/dhcp-identifier.c \ + src/libnm-systemd-core/src/libsystemd-network/dhcp-identifier.h \ + src/libnm-systemd-core/src/libsystemd-network/dhcp-internal.h \ + src/libnm-systemd-core/src/libsystemd-network/dhcp-lease-internal.h \ + src/libnm-systemd-core/src/libsystemd-network/dhcp-network.c \ + src/libnm-systemd-core/src/libsystemd-network/dhcp-option.c \ + src/libnm-systemd-core/src/libsystemd-network/dhcp-packet.c \ + src/libnm-systemd-core/src/libsystemd-network/dhcp-protocol.h \ + src/libnm-systemd-core/src/libsystemd-network/dhcp6-internal.h \ + src/libnm-systemd-core/src/libsystemd-network/dhcp6-lease-internal.h \ + src/libnm-systemd-core/src/libsystemd-network/dhcp6-network.c \ + src/libnm-systemd-core/src/libsystemd-network/dhcp6-option.c \ + src/libnm-systemd-core/src/libsystemd-network/dhcp6-protocol.h \ + src/libnm-systemd-core/src/libsystemd-network/lldp-internal.h \ + src/libnm-systemd-core/src/libsystemd-network/lldp-neighbor.c \ + src/libnm-systemd-core/src/libsystemd-network/lldp-neighbor.h \ + src/libnm-systemd-core/src/libsystemd-network/lldp-network.c \ + src/libnm-systemd-core/src/libsystemd-network/lldp-network.h \ + src/libnm-systemd-core/src/libsystemd-network/network-common.c \ + src/libnm-systemd-core/src/libsystemd-network/network-common.h \ + src/libnm-systemd-core/src/libsystemd-network/network-internal.c \ + src/libnm-systemd-core/src/libsystemd-network/network-internal.h \ + src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-client.c \ + src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-lease.c \ + src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-client.c \ + src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-lease.c \ + src/libnm-systemd-core/src/libsystemd-network/sd-ipv4acd.c \ + src/libnm-systemd-core/src/libsystemd-network/sd-ipv4ll.c \ + src/libnm-systemd-core/src/libsystemd-network/sd-lldp.c \ + src/libnm-systemd-core/src/libsystemd/sd-event/event-source.h \ + src/libnm-systemd-core/src/libsystemd/sd-event/event-util.c \ + src/libnm-systemd-core/src/libsystemd/sd-event/event-util.h \ + src/libnm-systemd-core/src/libsystemd/sd-event/sd-event.c \ + src/libnm-systemd-core/src/libsystemd/sd-id128/id128-util.c \ + src/libnm-systemd-core/src/libsystemd/sd-id128/id128-util.h \ + src/libnm-systemd-core/src/libsystemd/sd-id128/sd-id128.c \ + src/libnm-systemd-core/src/systemd/_sd-common.h \ + src/libnm-systemd-core/src/systemd/sd-dhcp-client.h \ + src/libnm-systemd-core/src/systemd/sd-dhcp-lease.h \ + src/libnm-systemd-core/src/systemd/sd-dhcp-option.h \ + src/libnm-systemd-core/src/systemd/sd-dhcp6-client.h \ + src/libnm-systemd-core/src/systemd/sd-dhcp6-lease.h \ + src/libnm-systemd-core/src/systemd/sd-dhcp6-option.h \ + src/libnm-systemd-core/src/systemd/sd-event.h \ + src/libnm-systemd-core/src/systemd/sd-id128.h \ + src/libnm-systemd-core/src/systemd/sd-ipv4acd.h \ + src/libnm-systemd-core/src/systemd/sd-ipv4ll.h \ + src/libnm-systemd-core/src/systemd/sd-lldp.h \ + src/libnm-systemd-core/src/systemd/sd-ndisc.h \ $(NULL) -src_core_libnm_systemd_core_la_CPPFLAGS = $(src_core_libnm_systemd_core_la_cppflags) -src_core_libnm_systemd_core_la_LIBADD = \ +src_libnm_systemd_core_libnm_systemd_core_la_CPPFLAGS = $(src_libnm_systemd_core_libnm_systemd_core_la_cppflags) +src_libnm_systemd_core_libnm_systemd_core_la_LIBADD = \ $(GLIB_LIBS) \ $(CODE_COVERAGE_LDFLAGS) \ $(NULL) -$(src_core_libnm_systemd_core_la_OBJECTS): $(src_libnm_core_public_mkenums_h) +$(src_libnm_systemd_core_libnm_systemd_core_la_OBJECTS): $(src_libnm_core_public_mkenums_h) -EXTRA_DIST += src/core/systemd/meson.build +EXTRA_DIST += src/libnm-systemd-core/meson.build ############################################################################### @@ -2609,7 +2605,7 @@ src_core_libNetworkManager_la_LIBADD = \ src/libnm-udev-aux/libnm-udev-aux.la \ src/libnm-glib-aux/libnm-glib-aux.la \ src/libnm-std-aux/libnm-std-aux.la \ - src/core/libnm-systemd-core.la \ + src/libnm-systemd-core/libnm-systemd-core.la \ src/libnm-systemd-shared/libnm-systemd-shared.la \ src/n-acd/libn-acd.la \ src/n-dhcp4/libn-dhcp4.la \ @@ -2723,7 +2719,7 @@ src_core_nm_iface_helper_LDADD = \ src/libnm-udev-aux/libnm-udev-aux.la \ src/libnm-glib-aux/libnm-glib-aux.la \ src/libnm-std-aux/libnm-std-aux.la \ - src/core/libnm-systemd-core.la \ + src/libnm-systemd-core/libnm-systemd-core.la \ src/libnm-systemd-shared/libnm-systemd-shared.la \ src/n-acd/libn-acd.la \ src/n-dhcp4/libn-dhcp4.la \ @@ -4423,7 +4419,7 @@ $(src_core_tests_test_utils_OBJECTS): $(src_libnm_core_public_mkenums_h) $(src_core_tests_test_wired_defname_OBJECTS): $(src_libnm_core_public_mkenums_h) src_core_tests_test_systemd_CPPFLAGS = \ - $(src_core_libnm_systemd_core_la_cppflags) \ + $(src_libnm_systemd_core_libnm_systemd_core_la_cppflags) \ $(NULL) src_core_tests_test_systemd_LDFLAGS = \ @@ -4431,8 +4427,9 @@ src_core_tests_test_systemd_LDFLAGS = \ $(NULL) src_core_tests_test_systemd_LDADD = \ - src/core/libnm-systemd-core.la \ + src/libnm-systemd-core/libnm-systemd-core.la \ src/libnm-systemd-shared/libnm-systemd-shared.la \ + src/libnm-log-null/libnm-log-null.la \ src/c-siphash/libc-siphash.la \ $(GLIB_LIBS) \ $(CODE_COVERAGE_LDFLAGS) \ diff --git a/contrib/scripts/nm-code-format.sh b/contrib/scripts/nm-code-format.sh index a44506585c..d73cc72f6d 100755 --- a/contrib/scripts/nm-code-format.sh +++ b/contrib/scripts/nm-code-format.sh @@ -14,9 +14,9 @@ EXCLUDE=( ":(exclude)src/c-rbtree" ":(exclude)src/c-siphash" ":(exclude)src/c-stdaux" - ":(exclude)src/core/systemd/src" ":(exclude)src/libnm-std-aux/unaligned.h" ":(exclude)src/libnm-systemd-shared/src" + ":(exclude)src/libnm-systemd-core/src" ":(exclude)src/n-acd" ":(exclude)src/n-dhcp4" ) diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c index 1e677a9bc9..e3e549b129 100644 --- a/src/core/devices/nm-device.c +++ b/src/core/devices/nm-device.c @@ -68,7 +68,7 @@ #include "dns/nm-dns-manager.h" #include "nm-acd-manager.h" #include "libnm-core-intern/nm-core-internal.h" -#include "systemd/nm-sd.h" +#include "libnm-systemd-core/nm-sd.h" #include "nm-lldp-listener.h" #include "nm-audit-manager.h" #include "nm-connectivity.h" diff --git a/src/core/devices/nm-lldp-listener.c b/src/core/devices/nm-lldp-listener.c index 3cf28cebf0..aba972ae44 100644 --- a/src/core/devices/nm-lldp-listener.c +++ b/src/core/devices/nm-lldp-listener.c @@ -17,7 +17,7 @@ #include "libnm-glib-aux/nm-c-list.h" #include "nm-utils.h" -#include "systemd/nm-sd.h" +#include "libnm-systemd-core/nm-sd.h" #define MAX_NEIGHBORS 128 #define MIN_UPDATE_INTERVAL_NSEC (2 * NM_UTILS_NSEC_PER_SEC) diff --git a/src/core/devices/tests/test-lldp.c b/src/core/devices/tests/test-lldp.c index fd0deae4d0..c64c7c1140 100644 --- a/src/core/devices/tests/test-lldp.c +++ b/src/core/devices/tests/test-lldp.c @@ -13,7 +13,7 @@ #include #include "devices/nm-lldp-listener.h" -#include "systemd/nm-sd.h" +#include "libnm-systemd-core/nm-sd.h" #include "platform/tests/test-common.h" diff --git a/src/core/dhcp/nm-dhcp-nettools.c b/src/core/dhcp/nm-dhcp-nettools.c index e6a09138ff..fe71f587a4 100644 --- a/src/core/dhcp/nm-dhcp-nettools.c +++ b/src/core/dhcp/nm-dhcp-nettools.c @@ -27,7 +27,7 @@ #include "nm-dhcp-client-logging.h" #include "n-dhcp4/src/n-dhcp4.h" #include "libnm-systemd-shared/nm-sd-utils-shared.h" -#include "systemd/nm-sd-utils-dhcp.h" +#include "libnm-systemd-core/nm-sd-utils-dhcp.h" /*****************************************************************************/ @@ -949,7 +949,7 @@ nettools_create(NMDhcpNettools *self, GError **error) NM_DHCP_CLIENT_FLAGS_REQUEST_BROADCAST)); r = n_dhcp4_client_config_set_client_id(config, client_id_arr, - NM_MIN(client_id_len, 1 + _NM_SD_MAX_CLIENT_ID_LEN)); + NM_MIN(client_id_len, 1 + _NM_MAX_CLIENT_ID_LEN)); if (r) { set_error_nettools(error, r, "failed to set client-id"); return FALSE; diff --git a/src/core/dhcp/nm-dhcp-systemd.c b/src/core/dhcp/nm-dhcp-systemd.c index 94cb443d18..c789aaee0f 100644 --- a/src/core/dhcp/nm-dhcp-systemd.c +++ b/src/core/dhcp/nm-dhcp-systemd.c @@ -23,8 +23,8 @@ #include "NetworkManagerUtils.h" #include "libnm-platform/nm-platform.h" #include "nm-dhcp-client-logging.h" -#include "systemd/nm-sd.h" -#include "systemd/nm-sd-utils-dhcp.h" +#include "libnm-systemd-core/nm-sd.h" +#include "libnm-systemd-core/nm-sd-utils-dhcp.h" /*****************************************************************************/ @@ -678,7 +678,7 @@ ip4_start(NMDhcpClient *client, const char *last_ip4_address, GError **error) r = sd_dhcp_client_set_client_id(sd_client, client_id_arr[0], client_id_arr + 1, - NM_MIN(client_id_len - 1, _NM_SD_MAX_CLIENT_ID_LEN)); + NM_MIN(client_id_len - 1, _NM_MAX_CLIENT_ID_LEN)); if (r < 0) { nm_utils_error_set_errno(error, r, "failed to set IPv4 client-id: %s"); return FALSE; diff --git a/src/core/main.c b/src/core/main.c index 263b86e3c0..cfcdb860dd 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -34,7 +34,7 @@ #include "nm-dbus-object.h" #include "nm-connectivity.h" #include "dns/nm-dns-manager.h" -#include "systemd/nm-sd.h" +#include "libnm-systemd-core/nm-sd.h" #include "nm-netns.h" #if !defined(NM_DIST_VERSION) diff --git a/src/core/meson.build b/src/core/meson.build index ba7dad998b..f4d7af6407 100644 --- a/src/core/meson.build +++ b/src/core/meson.build @@ -30,8 +30,6 @@ install_data( install_dir: dbus_conf_dir, ) -subdir('systemd') - core_plugins = [] libNetworkManagerBase = static_library( diff --git a/src/core/nm-iface-helper.c b/src/core/nm-iface-helper.c index 227363deac..296bf091ee 100644 --- a/src/core/nm-iface-helper.c +++ b/src/core/nm-iface-helper.c @@ -28,7 +28,7 @@ #include "nm-utils.h" #include "libnm-core-intern/nm-core-internal.h" #include "nm-setting-ip6-config.h" -#include "systemd/nm-sd.h" +#include "libnm-systemd-core/nm-sd.h" #if !defined(NM_DIST_VERSION) #define NM_DIST_VERSION VERSION diff --git a/src/core/nm-types.h b/src/core/nm-types.h index b6abc1b984..7ad5aee15a 100644 --- a/src/core/nm-types.h +++ b/src/core/nm-types.h @@ -10,8 +10,6 @@ #error Cannot use this header. #endif -#define _NM_SD_MAX_CLIENT_ID_LEN (sizeof(guint32) + 128) - /* core */ typedef struct _NMDBusObject NMDBusObject; typedef struct _NMActiveConnection NMActiveConnection; diff --git a/src/core/tests/meson.build b/src/core/tests/meson.build index 5415bb2aee..316f20ccb8 100644 --- a/src/core/tests/meson.build +++ b/src/core/tests/meson.build @@ -35,14 +35,16 @@ exe = executable( include_directories: [ top_inc, src_inc, - src_core_inc, ], dependencies: [ - libnm_core_public_dep, - libnm_systemd_core_dep, + libnm_systemd_shared_dep_inc, + libnm_systemd_core_dep_inc, + glib_dep, ], link_with: [ libnm_systemd_shared, + libnm_systemd_core, + libnm_log_null, libc_siphash, ], ) diff --git a/src/core/tests/test-core.c b/src/core/tests/test-core.c index 15be7af1ed..3775f9d2e9 100644 --- a/src/core/tests/test-core.c +++ b/src/core/tests/test-core.c @@ -15,7 +15,7 @@ #include "NetworkManagerUtils.h" #include "libnm-core-intern/nm-core-internal.h" #include "nm-core-utils.h" -#include "systemd/nm-sd-utils-core.h" +#include "libnm-systemd-core/nm-sd-utils-core.h" #include "dns/nm-dns-manager.h" #include "nm-connectivity.h" diff --git a/src/core/tests/test-systemd.c b/src/core/tests/test-systemd.c index 810632f8db..ec795777f6 100644 --- a/src/core/tests/test-systemd.c +++ b/src/core/tests/test-systemd.c @@ -3,68 +3,12 @@ * Copyright (C) 2016 Red Hat, Inc. */ -#include "src/core/systemd/nm-default-systemd.h" +#include "libnm-systemd-core/nm-default-systemd-core.h" -#include "systemd/nm-sd.h" +#include "libnm-systemd-core/nm-sd.h" #include "libnm-systemd-shared/nm-sd-utils-shared.h" -#include "nm-test-utils-core.h" - -/***************************************************************************** - * Stub implementations of libNetworkManagerBase symbols - *****************************************************************************/ - -gboolean -nm_utils_get_testing_initialized(void) -{ - return TRUE; -} - -void -_nm_utils_set_testing(NMUtilsTestFlags flags) -{ - g_assert_not_reached(); -} - -gint32 -nm_utils_get_monotonic_timestamp_sec(void) -{ - return 1; -} - -NMLogDomain _nm_logging_enabled_state[_LOGL_N_REAL]; - -gboolean -_nm_log_enabled_impl(gboolean mt_require_locking, NMLogLevel level, NMLogDomain domain) -{ - return FALSE; -} - -void -_nm_log_impl(const char *file, - guint line, - const char *func, - gboolean mt_require_locking, - NMLogLevel level, - NMLogDomain domain, - int error, - const char *ifname, - const char *con_uuid, - const char *fmt, - ...) -{} - -gboolean -nm_logging_setup(const char *level, const char *domains, char **bad_domains, GError **error) -{ - return TRUE; -} - -const char * -nm_strerror_native(int errsv) -{ - return g_strerror(errsv); -} +#include "libnm-glib-aux/nm-test-utils.h" /*****************************************************************************/ @@ -327,7 +271,7 @@ NMTST_DEFINE(); int main(int argc, char **argv) { - nmtst_init_assert_logging(&argc, &argv, "INFO", "ALL"); + nmtst_init(&argc, &argv, TRUE); g_test_add_func("/systemd/dhcp/create", test_dhcp_create); g_test_add_func("/systemd/lldp/create", test_lldp_create); diff --git a/src/libnm-base/nm-base.h b/src/libnm-base/nm-base.h index 7855017776..3257b3f0a5 100644 --- a/src/libnm-base/nm-base.h +++ b/src/libnm-base/nm-base.h @@ -11,6 +11,8 @@ /* this must be the same as NM_UTILS_HWADDR_LEN_MAX from libnm. */ #define _NM_UTILS_HWADDR_LEN_MAX 20 +#define _NM_MAX_CLIENT_ID_LEN (sizeof(guint32) + 128) + /*****************************************************************************/ typedef enum { diff --git a/src/core/systemd/meson.build b/src/libnm-systemd-core/meson.build similarity index 77% rename from src/core/systemd/meson.build rename to src/libnm-systemd-core/meson.build index c0d8a27c07..7ecf31640a 100644 --- a/src/core/systemd/meson.build +++ b/src/libnm-systemd-core/meson.build @@ -1,12 +1,5 @@ # SPDX-License-Identifier: LGPL-2.1-or-later -incs = include_directories( - 'sd-adapt-core', - 'src/libsystemd-network', - 'src/libsystemd/sd-event', - 'src/systemd', -) - libnm_systemd_core = static_library( 'nm-systemd-core', sources: files( @@ -38,28 +31,26 @@ libnm_systemd_core = static_library( 'sd-adapt-core/nm-sd-adapt-core.c', ), include_directories: [ - incs, + include_directories( + 'sd-adapt-core', + 'src/libsystemd-network', + 'src/libsystemd/sd-event', + 'src/systemd', + ), top_inc, src_inc, - src_core_inc, ], dependencies: [ - libnm_core_public_dep, libnm_systemd_shared_dep_inc, glib_dep, ], ) -libnm_systemd_core_dep = declare_dependency( - include_directories: [ - incs, - ], - dependencies: [ - glib_dep, - ], - link_with: [ - libnm_core_impl, - libnm_systemd_shared, - libnm_systemd_core, - ], +libnm_systemd_core_dep_inc = declare_dependency( + include_directories: include_directories( + 'sd-adapt-core', + 'src/libsystemd-network', + 'src/libsystemd/sd-event', + 'src/systemd', + ), ) diff --git a/src/core/systemd/nm-default-systemd.h b/src/libnm-systemd-core/nm-default-systemd-core.h similarity index 91% rename from src/core/systemd/nm-default-systemd.h rename to src/libnm-systemd-core/nm-default-systemd-core.h index 1979d9c990..07d45568d5 100644 --- a/src/core/systemd/nm-default-systemd.h +++ b/src/libnm-systemd-core/nm-default-systemd-core.h @@ -8,7 +8,7 @@ /*****************************************************************************/ -#include "nm-default-daemon.h" +#include "libnm-glib-aux/nm-default-glib.h" #undef NETWORKMANAGER_COMPILATION #define NETWORKMANAGER_COMPILATION NM_NETWORKMANAGER_COMPILATION_SYSTEMD diff --git a/src/core/systemd/nm-sd-utils-core.c b/src/libnm-systemd-core/nm-sd-utils-core.c similarity index 90% rename from src/core/systemd/nm-sd-utils-core.c rename to src/libnm-systemd-core/nm-sd-utils-core.c index 451e8b600b..21e8a3044e 100644 --- a/src/core/systemd/nm-sd-utils-core.c +++ b/src/libnm-systemd-core/nm-sd-utils-core.c @@ -3,7 +3,7 @@ * Copyright (C) 2018 Red Hat, Inc. */ -#include "src/core/systemd/nm-default-systemd.h" +#include "libnm-systemd-core/nm-default-systemd-core.h" #include "nm-sd-utils-core.h" diff --git a/src/core/systemd/nm-sd-utils-core.h b/src/libnm-systemd-core/nm-sd-utils-core.h similarity index 100% rename from src/core/systemd/nm-sd-utils-core.h rename to src/libnm-systemd-core/nm-sd-utils-core.h diff --git a/src/core/systemd/nm-sd-utils-dhcp.c b/src/libnm-systemd-core/nm-sd-utils-dhcp.c similarity index 94% rename from src/core/systemd/nm-sd-utils-dhcp.c rename to src/libnm-systemd-core/nm-sd-utils-dhcp.c index b5aa315a97..7fe889fda9 100644 --- a/src/core/systemd/nm-sd-utils-dhcp.c +++ b/src/libnm-systemd-core/nm-sd-utils-dhcp.c @@ -3,7 +3,7 @@ * Copyright (C) 2019 Red Hat, Inc. */ -#include "src/core/systemd/nm-default-systemd.h" +#include "libnm-systemd-core/nm-default-systemd-core.h" #include "nm-sd-utils-dhcp.h" diff --git a/src/core/systemd/nm-sd-utils-dhcp.h b/src/libnm-systemd-core/nm-sd-utils-dhcp.h similarity index 100% rename from src/core/systemd/nm-sd-utils-dhcp.h rename to src/libnm-systemd-core/nm-sd-utils-dhcp.h diff --git a/src/core/systemd/nm-sd.c b/src/libnm-systemd-core/nm-sd.c similarity index 97% rename from src/core/systemd/nm-sd.c rename to src/libnm-systemd-core/nm-sd.c index 11f3abbd36..9978a159c4 100644 --- a/src/core/systemd/nm-sd.c +++ b/src/libnm-systemd-core/nm-sd.c @@ -3,7 +3,7 @@ * Copyright (C) 2014 - 2016 Red Hat, Inc. */ -#include "src/core/systemd/nm-default-systemd.h" +#include "libnm-systemd-core/nm-default-systemd-core.h" #include "nm-sd.h" diff --git a/src/core/systemd/nm-sd.h b/src/libnm-systemd-core/nm-sd.h similarity index 79% rename from src/core/systemd/nm-sd.h rename to src/libnm-systemd-core/nm-sd.h index 0ea4be2229..f346197440 100644 --- a/src/core/systemd/nm-sd.h +++ b/src/libnm-systemd-core/nm-sd.h @@ -6,10 +6,10 @@ #ifndef __NM_SD_H__ #define __NM_SD_H__ -#include "systemd/src/systemd/sd-dhcp-client.h" -#include "systemd/src/systemd/sd-dhcp6-client.h" -#include "systemd/src/systemd/sd-lldp.h" -#include "systemd/src/systemd/sd-ipv4ll.h" +#include "src/systemd/sd-dhcp-client.h" +#include "src/systemd/sd-dhcp6-client.h" +#include "src/systemd/sd-lldp.h" +#include "src/systemd/sd-ipv4ll.h" /*****************************************************************************/ diff --git a/src/core/systemd/sd-adapt-core/condition.h b/src/libnm-systemd-core/sd-adapt-core/condition.h similarity index 100% rename from src/core/systemd/sd-adapt-core/condition.h rename to src/libnm-systemd-core/sd-adapt-core/condition.h diff --git a/src/core/systemd/sd-adapt-core/conf-parser.h b/src/libnm-systemd-core/sd-adapt-core/conf-parser.h similarity index 100% rename from src/core/systemd/sd-adapt-core/conf-parser.h rename to src/libnm-systemd-core/sd-adapt-core/conf-parser.h diff --git a/src/core/systemd/sd-adapt-core/device-util.h b/src/libnm-systemd-core/sd-adapt-core/device-util.h similarity index 100% rename from src/core/systemd/sd-adapt-core/device-util.h rename to src/libnm-systemd-core/sd-adapt-core/device-util.h diff --git a/src/core/systemd/sd-adapt-core/khash.h b/src/libnm-systemd-core/sd-adapt-core/khash.h similarity index 100% rename from src/core/systemd/sd-adapt-core/khash.h rename to src/libnm-systemd-core/sd-adapt-core/khash.h diff --git a/src/core/systemd/sd-adapt-core/network-util.h b/src/libnm-systemd-core/sd-adapt-core/network-util.h similarity index 100% rename from src/core/systemd/sd-adapt-core/network-util.h rename to src/libnm-systemd-core/sd-adapt-core/network-util.h diff --git a/src/core/systemd/sd-adapt-core/nm-sd-adapt-core.c b/src/libnm-systemd-core/sd-adapt-core/nm-sd-adapt-core.c similarity index 87% rename from src/core/systemd/sd-adapt-core/nm-sd-adapt-core.c rename to src/libnm-systemd-core/sd-adapt-core/nm-sd-adapt-core.c index 9339b33dc8..e4d2d2e1db 100644 --- a/src/core/systemd/sd-adapt-core/nm-sd-adapt-core.c +++ b/src/libnm-systemd-core/sd-adapt-core/nm-sd-adapt-core.c @@ -3,7 +3,7 @@ * Copyright (C) 2014 - 2016 Red Hat, Inc. */ -#include "src/core/systemd/nm-default-systemd.h" +#include "libnm-systemd-core/nm-default-systemd-core.h" #include "nm-sd-adapt-core.h" diff --git a/src/core/systemd/sd-adapt-core/nm-sd-adapt-core.h b/src/libnm-systemd-core/sd-adapt-core/nm-sd-adapt-core.h similarity index 95% rename from src/core/systemd/sd-adapt-core/nm-sd-adapt-core.h rename to src/libnm-systemd-core/sd-adapt-core/nm-sd-adapt-core.h index ceedfdb06b..4aae34b8b7 100644 --- a/src/core/systemd/sd-adapt-core/nm-sd-adapt-core.h +++ b/src/libnm-systemd-core/sd-adapt-core/nm-sd-adapt-core.h @@ -6,7 +6,7 @@ #ifndef __NM_SD_ADAPT_CORE_H__ #define __NM_SD_ADAPT_CORE_H__ -#include "src/core/systemd/nm-default-systemd.h" +#include "libnm-systemd-core/nm-default-systemd-core.h" #include #include @@ -57,6 +57,8 @@ #endif #endif + #include "libnm-base/nm-base.h" + /*****************************************************************************/ static inline int diff --git a/src/core/systemd/sd-adapt-core/sd-daemon.h b/src/libnm-systemd-core/sd-adapt-core/sd-daemon.h similarity index 100% rename from src/core/systemd/sd-adapt-core/sd-daemon.h rename to src/libnm-systemd-core/sd-adapt-core/sd-daemon.h diff --git a/src/core/systemd/sd-adapt-core/sd-device.h b/src/libnm-systemd-core/sd-adapt-core/sd-device.h similarity index 100% rename from src/core/systemd/sd-adapt-core/sd-device.h rename to src/libnm-systemd-core/sd-adapt-core/sd-device.h diff --git a/src/core/systemd/sd-adapt-core/udev-util.h b/src/libnm-systemd-core/sd-adapt-core/udev-util.h similarity index 100% rename from src/core/systemd/sd-adapt-core/udev-util.h rename to src/libnm-systemd-core/sd-adapt-core/udev-util.h diff --git a/src/core/systemd/src/libsystemd-network/arp-util.c b/src/libnm-systemd-core/src/libsystemd-network/arp-util.c similarity index 100% rename from src/core/systemd/src/libsystemd-network/arp-util.c rename to src/libnm-systemd-core/src/libsystemd-network/arp-util.c diff --git a/src/core/systemd/src/libsystemd-network/arp-util.h b/src/libnm-systemd-core/src/libsystemd-network/arp-util.h similarity index 100% rename from src/core/systemd/src/libsystemd-network/arp-util.h rename to src/libnm-systemd-core/src/libsystemd-network/arp-util.h diff --git a/src/core/systemd/src/libsystemd-network/dhcp-identifier.c b/src/libnm-systemd-core/src/libsystemd-network/dhcp-identifier.c similarity index 100% rename from src/core/systemd/src/libsystemd-network/dhcp-identifier.c rename to src/libnm-systemd-core/src/libsystemd-network/dhcp-identifier.c diff --git a/src/core/systemd/src/libsystemd-network/dhcp-identifier.h b/src/libnm-systemd-core/src/libsystemd-network/dhcp-identifier.h similarity index 100% rename from src/core/systemd/src/libsystemd-network/dhcp-identifier.h rename to src/libnm-systemd-core/src/libsystemd-network/dhcp-identifier.h diff --git a/src/core/systemd/src/libsystemd-network/dhcp-internal.h b/src/libnm-systemd-core/src/libsystemd-network/dhcp-internal.h similarity index 100% rename from src/core/systemd/src/libsystemd-network/dhcp-internal.h rename to src/libnm-systemd-core/src/libsystemd-network/dhcp-internal.h diff --git a/src/core/systemd/src/libsystemd-network/dhcp-lease-internal.h b/src/libnm-systemd-core/src/libsystemd-network/dhcp-lease-internal.h similarity index 100% rename from src/core/systemd/src/libsystemd-network/dhcp-lease-internal.h rename to src/libnm-systemd-core/src/libsystemd-network/dhcp-lease-internal.h diff --git a/src/core/systemd/src/libsystemd-network/dhcp-network.c b/src/libnm-systemd-core/src/libsystemd-network/dhcp-network.c similarity index 100% rename from src/core/systemd/src/libsystemd-network/dhcp-network.c rename to src/libnm-systemd-core/src/libsystemd-network/dhcp-network.c diff --git a/src/core/systemd/src/libsystemd-network/dhcp-option.c b/src/libnm-systemd-core/src/libsystemd-network/dhcp-option.c similarity index 100% rename from src/core/systemd/src/libsystemd-network/dhcp-option.c rename to src/libnm-systemd-core/src/libsystemd-network/dhcp-option.c diff --git a/src/core/systemd/src/libsystemd-network/dhcp-packet.c b/src/libnm-systemd-core/src/libsystemd-network/dhcp-packet.c similarity index 100% rename from src/core/systemd/src/libsystemd-network/dhcp-packet.c rename to src/libnm-systemd-core/src/libsystemd-network/dhcp-packet.c diff --git a/src/core/systemd/src/libsystemd-network/dhcp-protocol.h b/src/libnm-systemd-core/src/libsystemd-network/dhcp-protocol.h similarity index 100% rename from src/core/systemd/src/libsystemd-network/dhcp-protocol.h rename to src/libnm-systemd-core/src/libsystemd-network/dhcp-protocol.h diff --git a/src/core/systemd/src/libsystemd-network/dhcp6-internal.h b/src/libnm-systemd-core/src/libsystemd-network/dhcp6-internal.h similarity index 100% rename from src/core/systemd/src/libsystemd-network/dhcp6-internal.h rename to src/libnm-systemd-core/src/libsystemd-network/dhcp6-internal.h diff --git a/src/core/systemd/src/libsystemd-network/dhcp6-lease-internal.h b/src/libnm-systemd-core/src/libsystemd-network/dhcp6-lease-internal.h similarity index 100% rename from src/core/systemd/src/libsystemd-network/dhcp6-lease-internal.h rename to src/libnm-systemd-core/src/libsystemd-network/dhcp6-lease-internal.h diff --git a/src/core/systemd/src/libsystemd-network/dhcp6-network.c b/src/libnm-systemd-core/src/libsystemd-network/dhcp6-network.c similarity index 100% rename from src/core/systemd/src/libsystemd-network/dhcp6-network.c rename to src/libnm-systemd-core/src/libsystemd-network/dhcp6-network.c diff --git a/src/core/systemd/src/libsystemd-network/dhcp6-option.c b/src/libnm-systemd-core/src/libsystemd-network/dhcp6-option.c similarity index 100% rename from src/core/systemd/src/libsystemd-network/dhcp6-option.c rename to src/libnm-systemd-core/src/libsystemd-network/dhcp6-option.c diff --git a/src/core/systemd/src/libsystemd-network/dhcp6-protocol.h b/src/libnm-systemd-core/src/libsystemd-network/dhcp6-protocol.h similarity index 100% rename from src/core/systemd/src/libsystemd-network/dhcp6-protocol.h rename to src/libnm-systemd-core/src/libsystemd-network/dhcp6-protocol.h diff --git a/src/core/systemd/src/libsystemd-network/lldp-internal.h b/src/libnm-systemd-core/src/libsystemd-network/lldp-internal.h similarity index 100% rename from src/core/systemd/src/libsystemd-network/lldp-internal.h rename to src/libnm-systemd-core/src/libsystemd-network/lldp-internal.h diff --git a/src/core/systemd/src/libsystemd-network/lldp-neighbor.c b/src/libnm-systemd-core/src/libsystemd-network/lldp-neighbor.c similarity index 100% rename from src/core/systemd/src/libsystemd-network/lldp-neighbor.c rename to src/libnm-systemd-core/src/libsystemd-network/lldp-neighbor.c diff --git a/src/core/systemd/src/libsystemd-network/lldp-neighbor.h b/src/libnm-systemd-core/src/libsystemd-network/lldp-neighbor.h similarity index 100% rename from src/core/systemd/src/libsystemd-network/lldp-neighbor.h rename to src/libnm-systemd-core/src/libsystemd-network/lldp-neighbor.h diff --git a/src/core/systemd/src/libsystemd-network/lldp-network.c b/src/libnm-systemd-core/src/libsystemd-network/lldp-network.c similarity index 100% rename from src/core/systemd/src/libsystemd-network/lldp-network.c rename to src/libnm-systemd-core/src/libsystemd-network/lldp-network.c diff --git a/src/core/systemd/src/libsystemd-network/lldp-network.h b/src/libnm-systemd-core/src/libsystemd-network/lldp-network.h similarity index 100% rename from src/core/systemd/src/libsystemd-network/lldp-network.h rename to src/libnm-systemd-core/src/libsystemd-network/lldp-network.h diff --git a/src/core/systemd/src/libsystemd-network/network-common.c b/src/libnm-systemd-core/src/libsystemd-network/network-common.c similarity index 100% rename from src/core/systemd/src/libsystemd-network/network-common.c rename to src/libnm-systemd-core/src/libsystemd-network/network-common.c diff --git a/src/core/systemd/src/libsystemd-network/network-common.h b/src/libnm-systemd-core/src/libsystemd-network/network-common.h similarity index 100% rename from src/core/systemd/src/libsystemd-network/network-common.h rename to src/libnm-systemd-core/src/libsystemd-network/network-common.h diff --git a/src/core/systemd/src/libsystemd-network/network-internal.c b/src/libnm-systemd-core/src/libsystemd-network/network-internal.c similarity index 100% rename from src/core/systemd/src/libsystemd-network/network-internal.c rename to src/libnm-systemd-core/src/libsystemd-network/network-internal.c diff --git a/src/core/systemd/src/libsystemd-network/network-internal.h b/src/libnm-systemd-core/src/libsystemd-network/network-internal.h similarity index 100% rename from src/core/systemd/src/libsystemd-network/network-internal.h rename to src/libnm-systemd-core/src/libsystemd-network/network-internal.h diff --git a/src/core/systemd/src/libsystemd-network/sd-dhcp-client.c b/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-client.c similarity index 99% rename from src/core/systemd/src/libsystemd-network/sd-dhcp-client.c rename to src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-client.c index 91ef7b2c41..07dc17691a 100644 --- a/src/core/systemd/src/libsystemd-network/sd-dhcp-client.c +++ b/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-client.c @@ -394,7 +394,7 @@ int sd_dhcp_client_set_client_id( assert_return(client, -EINVAL); assert_return(data, -EINVAL); assert_return(data_len > 0 && data_len <= MAX_CLIENT_ID_LEN, -EINVAL); - G_STATIC_ASSERT_EXPR (_NM_SD_MAX_CLIENT_ID_LEN == MAX_CLIENT_ID_LEN); + G_STATIC_ASSERT_EXPR (_NM_MAX_CLIENT_ID_LEN == MAX_CLIENT_ID_LEN); if (client->client_id_len == data_len + sizeof(client->client_id.type) && client->client_id.type == type && diff --git a/src/core/systemd/src/libsystemd-network/sd-dhcp-lease.c b/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-lease.c similarity index 100% rename from src/core/systemd/src/libsystemd-network/sd-dhcp-lease.c rename to src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-lease.c diff --git a/src/core/systemd/src/libsystemd-network/sd-dhcp6-client.c b/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-client.c similarity index 100% rename from src/core/systemd/src/libsystemd-network/sd-dhcp6-client.c rename to src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-client.c diff --git a/src/core/systemd/src/libsystemd-network/sd-dhcp6-lease.c b/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-lease.c similarity index 100% rename from src/core/systemd/src/libsystemd-network/sd-dhcp6-lease.c rename to src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-lease.c diff --git a/src/core/systemd/src/libsystemd-network/sd-ipv4acd.c b/src/libnm-systemd-core/src/libsystemd-network/sd-ipv4acd.c similarity index 100% rename from src/core/systemd/src/libsystemd-network/sd-ipv4acd.c rename to src/libnm-systemd-core/src/libsystemd-network/sd-ipv4acd.c diff --git a/src/core/systemd/src/libsystemd-network/sd-ipv4ll.c b/src/libnm-systemd-core/src/libsystemd-network/sd-ipv4ll.c similarity index 100% rename from src/core/systemd/src/libsystemd-network/sd-ipv4ll.c rename to src/libnm-systemd-core/src/libsystemd-network/sd-ipv4ll.c diff --git a/src/core/systemd/src/libsystemd-network/sd-lldp.c b/src/libnm-systemd-core/src/libsystemd-network/sd-lldp.c similarity index 100% rename from src/core/systemd/src/libsystemd-network/sd-lldp.c rename to src/libnm-systemd-core/src/libsystemd-network/sd-lldp.c diff --git a/src/core/systemd/src/libsystemd/sd-event/event-source.h b/src/libnm-systemd-core/src/libsystemd/sd-event/event-source.h similarity index 100% rename from src/core/systemd/src/libsystemd/sd-event/event-source.h rename to src/libnm-systemd-core/src/libsystemd/sd-event/event-source.h diff --git a/src/core/systemd/src/libsystemd/sd-event/event-util.c b/src/libnm-systemd-core/src/libsystemd/sd-event/event-util.c similarity index 100% rename from src/core/systemd/src/libsystemd/sd-event/event-util.c rename to src/libnm-systemd-core/src/libsystemd/sd-event/event-util.c diff --git a/src/core/systemd/src/libsystemd/sd-event/event-util.h b/src/libnm-systemd-core/src/libsystemd/sd-event/event-util.h similarity index 100% rename from src/core/systemd/src/libsystemd/sd-event/event-util.h rename to src/libnm-systemd-core/src/libsystemd/sd-event/event-util.h diff --git a/src/core/systemd/src/libsystemd/sd-event/sd-event.c b/src/libnm-systemd-core/src/libsystemd/sd-event/sd-event.c similarity index 100% rename from src/core/systemd/src/libsystemd/sd-event/sd-event.c rename to src/libnm-systemd-core/src/libsystemd/sd-event/sd-event.c diff --git a/src/core/systemd/src/libsystemd/sd-id128/id128-util.c b/src/libnm-systemd-core/src/libsystemd/sd-id128/id128-util.c similarity index 100% rename from src/core/systemd/src/libsystemd/sd-id128/id128-util.c rename to src/libnm-systemd-core/src/libsystemd/sd-id128/id128-util.c diff --git a/src/core/systemd/src/libsystemd/sd-id128/id128-util.h b/src/libnm-systemd-core/src/libsystemd/sd-id128/id128-util.h similarity index 100% rename from src/core/systemd/src/libsystemd/sd-id128/id128-util.h rename to src/libnm-systemd-core/src/libsystemd/sd-id128/id128-util.h diff --git a/src/core/systemd/src/libsystemd/sd-id128/sd-id128.c b/src/libnm-systemd-core/src/libsystemd/sd-id128/sd-id128.c similarity index 100% rename from src/core/systemd/src/libsystemd/sd-id128/sd-id128.c rename to src/libnm-systemd-core/src/libsystemd/sd-id128/sd-id128.c diff --git a/src/core/systemd/src/systemd/_sd-common.h b/src/libnm-systemd-core/src/systemd/_sd-common.h similarity index 100% rename from src/core/systemd/src/systemd/_sd-common.h rename to src/libnm-systemd-core/src/systemd/_sd-common.h diff --git a/src/core/systemd/src/systemd/sd-dhcp-client.h b/src/libnm-systemd-core/src/systemd/sd-dhcp-client.h similarity index 100% rename from src/core/systemd/src/systemd/sd-dhcp-client.h rename to src/libnm-systemd-core/src/systemd/sd-dhcp-client.h diff --git a/src/core/systemd/src/systemd/sd-dhcp-lease.h b/src/libnm-systemd-core/src/systemd/sd-dhcp-lease.h similarity index 100% rename from src/core/systemd/src/systemd/sd-dhcp-lease.h rename to src/libnm-systemd-core/src/systemd/sd-dhcp-lease.h diff --git a/src/core/systemd/src/systemd/sd-dhcp-option.h b/src/libnm-systemd-core/src/systemd/sd-dhcp-option.h similarity index 100% rename from src/core/systemd/src/systemd/sd-dhcp-option.h rename to src/libnm-systemd-core/src/systemd/sd-dhcp-option.h diff --git a/src/core/systemd/src/systemd/sd-dhcp6-client.h b/src/libnm-systemd-core/src/systemd/sd-dhcp6-client.h similarity index 100% rename from src/core/systemd/src/systemd/sd-dhcp6-client.h rename to src/libnm-systemd-core/src/systemd/sd-dhcp6-client.h diff --git a/src/core/systemd/src/systemd/sd-dhcp6-lease.h b/src/libnm-systemd-core/src/systemd/sd-dhcp6-lease.h similarity index 100% rename from src/core/systemd/src/systemd/sd-dhcp6-lease.h rename to src/libnm-systemd-core/src/systemd/sd-dhcp6-lease.h diff --git a/src/core/systemd/src/systemd/sd-dhcp6-option.h b/src/libnm-systemd-core/src/systemd/sd-dhcp6-option.h similarity index 100% rename from src/core/systemd/src/systemd/sd-dhcp6-option.h rename to src/libnm-systemd-core/src/systemd/sd-dhcp6-option.h diff --git a/src/core/systemd/src/systemd/sd-event.h b/src/libnm-systemd-core/src/systemd/sd-event.h similarity index 100% rename from src/core/systemd/src/systemd/sd-event.h rename to src/libnm-systemd-core/src/systemd/sd-event.h diff --git a/src/core/systemd/src/systemd/sd-id128.h b/src/libnm-systemd-core/src/systemd/sd-id128.h similarity index 100% rename from src/core/systemd/src/systemd/sd-id128.h rename to src/libnm-systemd-core/src/systemd/sd-id128.h diff --git a/src/core/systemd/src/systemd/sd-ipv4acd.h b/src/libnm-systemd-core/src/systemd/sd-ipv4acd.h similarity index 100% rename from src/core/systemd/src/systemd/sd-ipv4acd.h rename to src/libnm-systemd-core/src/systemd/sd-ipv4acd.h diff --git a/src/core/systemd/src/systemd/sd-ipv4ll.h b/src/libnm-systemd-core/src/systemd/sd-ipv4ll.h similarity index 100% rename from src/core/systemd/src/systemd/sd-ipv4ll.h rename to src/libnm-systemd-core/src/systemd/sd-ipv4ll.h diff --git a/src/core/systemd/src/systemd/sd-lldp.h b/src/libnm-systemd-core/src/systemd/sd-lldp.h similarity index 100% rename from src/core/systemd/src/systemd/sd-lldp.h rename to src/libnm-systemd-core/src/systemd/sd-lldp.h diff --git a/src/core/systemd/src/systemd/sd-ndisc.h b/src/libnm-systemd-core/src/systemd/sd-ndisc.h similarity index 100% rename from src/core/systemd/src/systemd/sd-ndisc.h rename to src/libnm-systemd-core/src/systemd/sd-ndisc.h diff --git a/src/meson.build b/src/meson.build index b7aa4dcde1..962e2f87fe 100644 --- a/src/meson.build +++ b/src/meson.build @@ -74,6 +74,7 @@ subdir('libnm-glib-aux') subdir('libnm-log-null') subdir('libnm-log-core') subdir('libnm-systemd-shared') +subdir('libnm-systemd-core') subdir('libnm-udev-aux') subdir('libnm-base') subdir('libnm-platform')