platform: move "nm-platform-utils.[hc]" to "shared/nm-platform" libraryth/shared-nm-platform

By now it has no further dependencies on libnm-core or NetworkManager core.
Make it part of "shared/nm-platform" library.

23 files changed, 22 insertions, 21 deletions

diff --git a/Makefile.am b/Makefile.am
index 019439041d..3ff90639ec 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -527,6 +527,8 @@ shared_nm_platform_libnm_platform_la_CPPFLAGS = \
 shared_nm_platform_libnm_platform_la_SOURCES = \
 	shared/nm-platform/nm-netlink.c \
 	shared/nm-platform/nm-netlink.h \
+	shared/nm-platform/nm-platform-utils.c \
+	shared/nm-platform/nm-platform-utils.h \
 	shared/nm-platform/nmp-base.h \
 	shared/nm-platform/nmp-netns.c \
 	shared/nm-platform/nmp-netns.h \
@@ -2235,8 +2237,6 @@ src_libNetworkManagerBase_la_SOURCES = \
 	\
 	src/platform/nmp-object.c \
 	src/platform/nmp-object.h \
-	src/platform/nm-platform-utils.c \
-	src/platform/nm-platform-utils.h \
 	src/platform/nm-platform.c \
 	src/platform/nm-platform.h \
 	src/platform/nm-platform-private.h \
diff --git a/shared/meson.build b/shared/meson.build
index 5d6c21707a..58c29b7c76 100644
--- a/shared/meson.build
+++ b/shared/meson.build
@@ -222,6 +222,7 @@ libnm_platform = static_library(
   'nm-platform',
   sources: [
     'nm-platform/nm-netlink.c',
+    'nm-platform/nm-platform-utils.c',
     'nm-platform/nmp-netns.c',
   ],
   dependencies: [
diff --git a/src/platform/nm-platform-utils.c b/shared/nm-platform/nm-platform-utils.c
index 0947ef4c81..59e4a24491 100644
--- a/src/platform/nm-platform-utils.c
+++ b/shared/nm-platform/nm-platform-utils.c
@@ -19,6 +19,7 @@
 #include <libudev.h>
 
 #include "nm-base/nm-ethtool-base.h"
+#include "nm-log-core/nm-logging.h"
 
 /*****************************************************************************/
 
diff --git a/src/platform/nm-platform-utils.h b/shared/nm-platform/nm-platform-utils.h
index d74723eb9f..d74723eb9f 100644
--- a/src/platform/nm-platform-utils.h
+++ b/shared/nm-platform/nm-platform-utils.h
diff --git a/src/devices/nm-device-ethernet.c b/src/devices/nm-device-ethernet.c
index 05f5fe1e8d..f67baead46 100644
--- a/src/devices/nm-device-ethernet.c
+++ b/src/devices/nm-device-ethernet.c
@@ -25,7 +25,7 @@
 #include "ppp/nm-ppp-manager-call.h"
 #include "ppp/nm-ppp-status.h"
 #include "platform/nm-platform.h"
-#include "platform/nm-platform-utils.h"
+#include "nm-platform/nm-platform-utils.h"
 #include "nm-dcb.h"
 #include "settings/nm-settings-connection.h"
 #include "nm-config.h"
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index 53c42dbedf..8316107123 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -36,7 +36,7 @@
 #include "NetworkManagerUtils.h"
 #include "nm-manager.h"
 #include "platform/nm-platform.h"
-#include "platform/nm-platform-utils.h"
+#include "nm-platform/nm-platform-utils.h"
 #include "platform/nmp-object.h"
 #include "platform/nmp-rules-manager.h"
 #include "ndisc/nm-ndisc.h"
diff --git a/src/meson.build b/src/meson.build
index 8cb5089cad..8c0c141c29 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -37,7 +37,6 @@ sources = files(
   'platform/wpan/nm-wpan-utils.c',
   'platform/nm-linux-platform.c',
   'platform/nm-platform.c',
-  'platform/nm-platform-utils.c',
   'platform/nmp-object.c',
   'platform/nmp-rules-manager.c',
   'main-utils.c',
diff --git a/src/nm-iface-helper.c b/src/nm-iface-helper.c
index 8fc30adb8b..42483cf756 100644
--- a/src/nm-iface-helper.c
+++ b/src/nm-iface-helper.c
@@ -21,7 +21,7 @@
 #include "main-utils.h"
 #include "NetworkManagerUtils.h"
 #include "platform/nm-linux-platform.h"
-#include "platform/nm-platform-utils.h"
+#include "nm-platform/nm-platform-utils.h"
 #include "dhcp/nm-dhcp-manager.h"
 #include "ndisc/nm-ndisc.h"
 #include "ndisc/nm-lndp-ndisc.h"
diff --git a/src/nm-ip4-config.c b/src/nm-ip4-config.c
index b881871c5a..8014549f4d 100644
--- a/src/nm-ip4-config.c
+++ b/src/nm-ip4-config.c
@@ -17,7 +17,7 @@
 #include "nm-utils.h"
 #include "platform/nmp-object.h"
 #include "platform/nm-platform.h"
-#include "platform/nm-platform-utils.h"
+#include "nm-platform/nm-platform-utils.h"
 #include "NetworkManagerUtils.h"
 #include "nm-core-internal.h"
 #include "nm-dbus-object.h"
diff --git a/src/nm-ip6-config.c b/src/nm-ip6-config.c
index 0be98e5fe6..eeb69946a4 100644
--- a/src/nm-ip6-config.c
+++ b/src/nm-ip6-config.c
@@ -18,7 +18,7 @@
 #include "nm-utils.h"
 #include "platform/nmp-object.h"
 #include "platform/nm-platform.h"
-#include "platform/nm-platform-utils.h"
+#include "nm-platform/nm-platform-utils.h"
 #include "nm-core-internal.h"
 #include "NetworkManagerUtils.h"
 #include "nm-ip4-config.h"
diff --git a/src/nm-l3-config-data.c b/src/nm-l3-config-data.c
index daff7312db..0f689d409b 100644
--- a/src/nm-l3-config-data.c
+++ b/src/nm-l3-config-data.c
@@ -11,7 +11,7 @@
 #include "nm-glib-aux/nm-enum-utils.h"
 #include "nm-core-internal.h"
 #include "platform/nm-platform.h"
-#include "platform/nm-platform-utils.h"
+#include "nm-platform/nm-platform-utils.h"
 #include "platform/nmp-object.h"
 #include "NetworkManagerUtils.h"
 
diff --git a/src/platform/nm-fake-platform.c b/src/platform/nm-fake-platform.c
index 21f1e92465..fbd3e3fbc7 100644
--- a/src/platform/nm-fake-platform.c
+++ b/src/platform/nm-fake-platform.c
@@ -16,7 +16,7 @@
 #include "nm-utils.h"
 
 #include "nm-core-utils.h"
-#include "nm-platform-utils.h"
+#include "nm-platform/nm-platform-utils.h"
 #include "nm-platform-private.h"
 #include "nmp-object.h"
 
diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c
index e21c31e0a6..3d992704eb 100644
--- a/src/platform/nm-linux-platform.c
+++ b/src/platform/nm-linux-platform.c
@@ -44,7 +44,7 @@
 #include "nm-core-utils.h"
 #include "nmp-object.h"
 #include "nm-platform/nmp-netns.h"
-#include "nm-platform-utils.h"
+#include "nm-platform/nm-platform-utils.h"
 #include "nm-platform-private.h"
 #include "wifi/nm-wifi-utils.h"
 #include "wifi/nm-wifi-utils-wext.h"
diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c
index bf2ee5d19c..6411abbacc 100644
--- a/src/platform/nm-platform.c
+++ b/src/platform/nm-platform.c
@@ -29,7 +29,7 @@
 #include "nm-glib-aux/nm-secret-utils.h"
 
 #include "nm-core-utils.h"
-#include "nm-platform-utils.h"
+#include "nm-platform/nm-platform-utils.h"
 #include "nm-platform-private.h"
 #include "nmp-object.h"
 #include "nm-platform/nmp-netns.h"
diff --git a/src/platform/nmp-object.c b/src/platform/nmp-object.c
index 16edbd1216..9520013ad7 100644
--- a/src/platform/nmp-object.c
+++ b/src/platform/nmp-object.c
@@ -16,7 +16,7 @@
 #include "nm-glib-aux/nm-secret-utils.h"
 
 #include "nm-core-utils.h"
-#include "nm-platform-utils.h"
+#include "nm-platform/nm-platform-utils.h"
 
 #include "wifi/nm-wifi-utils.h"
 #include "wpan/nm-wpan-utils.h"
diff --git a/src/platform/tests/test-link.c b/src/platform/tests/test-link.c
index 6dc9f3e453..895b89a09b 100644
--- a/src/platform/tests/test-link.c
+++ b/src/platform/tests/test-link.c
@@ -15,7 +15,7 @@
 #include "nm-base/nm-ethtool-base.h"
 #include "platform/nmp-object.h"
 #include "nm-platform/nmp-netns.h"
-#include "platform/nm-platform-utils.h"
+#include "nm-platform/nm-platform-utils.h"
 
 #include "test-common.h"
 #include "nm-test-utils-core.h"
diff --git a/src/platform/tests/test-platform-general.c b/src/platform/tests/test-platform-general.c
index ee99348077..00671cfba0 100644
--- a/src/platform/tests/test-platform-general.c
+++ b/src/platform/tests/test-platform-general.c
@@ -7,7 +7,7 @@
 
 #include <linux/rtnetlink.h>
 
-#include "platform/nm-platform-utils.h"
+#include "nm-platform/nm-platform-utils.h"
 #include "platform/nm-linux-platform.h"
 
 #include "nm-test-utils-core.h"
diff --git a/src/platform/tests/test-route.c b/src/platform/tests/test-route.c
index f814d8c78b..0aa94ecd2d 100644
--- a/src/platform/tests/test-route.c
+++ b/src/platform/tests/test-route.c
@@ -9,7 +9,7 @@
 #include <linux/fib_rules.h>
 
 #include "nm-core-utils.h"
-#include "platform/nm-platform-utils.h"
+#include "nm-platform/nm-platform-utils.h"
 #include "platform/nmp-rules-manager.h"
 
 #include "test-common.h"
diff --git a/src/platform/tests/test-tc.c b/src/platform/tests/test-tc.c
index d178398eb8..c005b069f0 100644
--- a/src/platform/tests/test-tc.c
+++ b/src/platform/tests/test-tc.c
@@ -7,7 +7,7 @@
 #include "nm-test-utils-core.h"
 #include "platform/nmp-object.h"
 #include "nm-platform/nmp-netns.h"
-#include "platform/nm-platform-utils.h"
+#include "nm-platform/nm-platform-utils.h"
 #include "test-common.h"
 
 static NMPObject *
diff --git a/src/platform/wifi/nm-wifi-utils-nl80211.c b/src/platform/wifi/nm-wifi-utils-nl80211.c
index 0bca7acc46..aae6af1ec8 100644
--- a/src/platform/wifi/nm-wifi-utils-nl80211.c
+++ b/src/platform/wifi/nm-wifi-utils-nl80211.c
@@ -18,7 +18,7 @@
 #include "nm-platform/nm-netlink.h"
 #include "nm-wifi-utils-private.h"
 #include "platform/nm-platform.h"
-#include "platform/nm-platform-utils.h"
+#include "nm-platform/nm-platform-utils.h"
 #include "nm-utils.h"
 
 #define _NMLOG_PREFIX_NAME "wifi-nl80211"
diff --git a/src/platform/wifi/nm-wifi-utils-wext.c b/src/platform/wifi/nm-wifi-utils-wext.c
index 4d024174c8..2b070b5abe 100644
--- a/src/platform/wifi/nm-wifi-utils-wext.c
+++ b/src/platform/wifi/nm-wifi-utils-wext.c
@@ -23,7 +23,7 @@
 
 #include "nm-wifi-utils-private.h"
 #include "nm-utils.h"
-#include "platform/nm-platform-utils.h"
+#include "nm-platform/nm-platform-utils.h"
 #include "nm-core-internal.h"
 #include "nm-core-utils.h"
 
diff --git a/src/platform/wifi/nm-wifi-utils.c b/src/platform/wifi/nm-wifi-utils.c
index a9d5f2484c..66d6a05a75 100644
--- a/src/platform/wifi/nm-wifi-utils.c
+++ b/src/platform/wifi/nm-wifi-utils.c
@@ -19,7 +19,7 @@
 #endif
 #include "nm-core-utils.h"
 
-#include "platform/nm-platform-utils.h"
+#include "nm-platform/nm-platform-utils.h"
 
 G_DEFINE_ABSTRACT_TYPE(NMWifiUtils, nm_wifi_utils, G_TYPE_OBJECT)
 
diff --git a/src/platform/wpan/nm-wpan-utils.c b/src/platform/wpan/nm-wpan-utils.c
index d7c93b19b6..96897ae04d 100644
--- a/src/platform/wpan/nm-wpan-utils.c
+++ b/src/platform/wpan/nm-wpan-utils.c
@@ -11,7 +11,7 @@
 
 #include "nm-platform/nm-netlink.h"
 #include "platform/linux/nl802154.h"
-#include "platform/nm-platform-utils.h"
+#include "nm-platform/nm-platform-utils.h"
 
 #define _NMLOG_PREFIX_NAME "wpan-nl802154"
 #define _NMLOG(level, domain, ...)                                                                \