system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-07-22 10:46:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse source 
By now it has no further dependencies on libnm-core or NetworkManager core.
Make it part of "shared/nm-platform" library.
This commit is contained in:
Thomas Haller 2021-01-10 09:55:06 +01:00
parent c0bc296a51
commit 9901aeef2c
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
23 changed files with 22 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile.am
View file

@ -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 \

1
shared/meson.build
View file

@ -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: [

1
src/platform/nm-platform-utils.c → shared/nm-platform/nm-platform-utils.c
View file

@ -19,6 +19,7 @@
#include <libudev.h>
#include "nm-base/nm-ethtool-base.h"
#include "nm-log-core/nm-logging.h"
/*****************************************************************************/

0
src/platform/nm-platform-utils.h → shared/nm-platform/nm-platform-utils.h
View file

2
src/devices/nm-device-ethernet.c
View file

@ -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"

2
src/devices/nm-device.c
View file

@ -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"

1
src/meson.build
View file

@ -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',

2
src/nm-iface-helper.c
View file

@ -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"

2
src/nm-ip4-config.c
View file

@ -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"

2
src/nm-ip6-config.c
View file

@ -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"

2
src/nm-l3-config-data.c
View file

@ -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"

2
src/platform/nm-fake-platform.c
View file

@ -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"

2
src/platform/nm-linux-platform.c
View file

@ -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"

2
src/platform/nm-platform.c
View file

@ -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"

2
src/platform/nmp-object.c
View file

@ -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"

2
src/platform/tests/test-link.c
View file

@ -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"

2
src/platform/tests/test-platform-general.c
View file

@ -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"

2
src/platform/tests/test-route.c
View file

@ -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"

2
src/platform/tests/test-tc.c
View file

@ -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 *

2
src/platform/wifi/nm-wifi-utils-nl80211.c
View file

@ -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"

2
src/platform/wifi/nm-wifi-utils-wext.c
View file

@ -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"

2
src/platform/wifi/nm-wifi-utils.c
View file

@ -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)

2
src/platform/wpan/nm-wpan-utils.c
View file

@ -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, ...) \