diff options
| author | Lennart Poettering <lennart@poettering.net> | 2019-07-23 14:22:06 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2019-07-24 09:06:50 +0200 |
| commit | 733cbd00b0190bb7d16d12e001ddf7817754e46d (patch) | |
| tree | 6d4f503318df7efaf706657739914a9a67239601 /src | |
| parent | e5c8524447cc7309c703b5eb803a48e30b4cf050 (diff) | |
| download | systemd-733cbd00b0190bb7d16d12e001ddf7817754e46d.tar.gz | |
netlink: move local-addresses.[ch] to src/shared
This code is not part of the public API of sd-netlink, nor used by it
internally and hence should not be in the sd-netlink directory.
Also, move the test case for it to src/test/.
Diffstat (limited to 'src')
| -rw-r--r-- | src/libsystemd/meson.build | 2 | ||||
| -rw-r--r-- | src/shared/local-addresses.c (renamed from src/libsystemd/sd-netlink/local-addresses.c) | 0 | ||||
| -rw-r--r-- | src/shared/local-addresses.h (renamed from src/libsystemd/sd-netlink/local-addresses.h) | 0 | ||||
| -rw-r--r-- | src/shared/meson.build | 2 | ||||
| -rw-r--r-- | src/test/meson.build | 8 | ||||
| -rw-r--r-- | src/test/test-local-addresses.c (renamed from src/libsystemd/sd-netlink/test-local-addresses.c) | 0 |
6 files changed, 6 insertions, 6 deletions
diff --git a/src/libsystemd/meson.build b/src/libsystemd/meson.build index 67add387e6..77fe6e780f 100644 --- a/src/libsystemd/meson.build +++ b/src/libsystemd/meson.build @@ -71,8 +71,6 @@ libsystemd_sources = files(''' sd-hwdb/hwdb-util.h sd-hwdb/sd-hwdb.c sd-netlink/generic-netlink.c - sd-netlink/local-addresses.c - sd-netlink/local-addresses.h sd-netlink/netlink-internal.h sd-netlink/netlink-message.c sd-netlink/netlink-slot.c diff --git a/src/libsystemd/sd-netlink/local-addresses.c b/src/shared/local-addresses.c index 751144539b..751144539b 100644 --- a/src/libsystemd/sd-netlink/local-addresses.c +++ b/src/shared/local-addresses.c diff --git a/src/libsystemd/sd-netlink/local-addresses.h b/src/shared/local-addresses.h index e88c5e5d21..e88c5e5d21 100644 --- a/src/libsystemd/sd-netlink/local-addresses.h +++ b/src/shared/local-addresses.h diff --git a/src/shared/meson.build b/src/shared/meson.build index ca24d15eab..ca1a5547c4 100644 --- a/src/shared/meson.build +++ b/src/shared/meson.build @@ -109,6 +109,8 @@ shared_sources = files(''' linux/bpf_insn.h linux/dm-ioctl.h linux/ethtool.h + local-addresses.c + local-addresses.h lockfile-util.c lockfile-util.h log-link.h diff --git a/src/test/meson.build b/src/test/meson.build index ddc04dda65..e337e50146 100644 --- a/src/test/meson.build +++ b/src/test/meson.build @@ -754,6 +754,10 @@ tests += [ [['src/test/test-sd-hwdb.c'], [], []], + + [['src/test/test-local-addresses.c'], + [], + []], ] ############################################################ @@ -964,10 +968,6 @@ tests += [ [], []], - [['src/libsystemd/sd-netlink/test-local-addresses.c'], - [], - []], - [['src/libsystemd/sd-resolve/test-resolve.c'], [], [threads], diff --git a/src/libsystemd/sd-netlink/test-local-addresses.c b/src/test/test-local-addresses.c index 37505ea783..37505ea783 100644 --- a/src/libsystemd/sd-netlink/test-local-addresses.c +++ b/src/test/test-local-addresses.c |