From 902b4c677eb8a15df7e3a7ca0968812ad1b99827 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Thu, 3 Jun 2021 03:12:53 +0900 Subject: [PATCH] util: move device-node.[ch] to shared --- src/basic/btrfs-util.c | 1 - src/basic/meson.build | 2 -- src/{basic => shared}/device-nodes.c | 0 src/{basic => shared}/device-nodes.h | 0 src/shared/meson.build | 2 ++ 5 files changed, 2 insertions(+), 3 deletions(-) rename src/{basic => shared}/device-nodes.c (100%) rename src/{basic => shared}/device-nodes.h (100%) diff --git a/src/basic/btrfs-util.c b/src/basic/btrfs-util.c index bc1fb8d29d0..adf9d03eb90 100644 --- a/src/basic/btrfs-util.c +++ b/src/basic/btrfs-util.c @@ -19,7 +19,6 @@ #include "btrfs-util.h" #include "chattr-util.h" #include "copy.h" -#include "device-nodes.h" #include "fd-util.h" #include "fileio.h" #include "fs-util.h" diff --git a/src/basic/meson.build b/src/basic/meson.build index 18084875bdf..034f30093d7 100644 --- a/src/basic/meson.build +++ b/src/basic/meson.build @@ -38,8 +38,6 @@ basic_sources = files(''' creds-util.c creds-util.h def.h - device-nodes.c - device-nodes.h dirent-util.c dirent-util.h dlfcn-util.c diff --git a/src/basic/device-nodes.c b/src/shared/device-nodes.c similarity index 100% rename from src/basic/device-nodes.c rename to src/shared/device-nodes.c diff --git a/src/basic/device-nodes.h b/src/shared/device-nodes.h similarity index 100% rename from src/basic/device-nodes.h rename to src/shared/device-nodes.h diff --git a/src/shared/meson.build b/src/shared/meson.build index 6ecdf576ab8..8d9cb323559 100644 --- a/src/shared/meson.build +++ b/src/shared/meson.build @@ -80,6 +80,8 @@ shared_sources = files(''' daemon-util.h dev-setup.c dev-setup.h + device-nodes.c + device-nodes.h devnode-acl.h discover-image.c discover-image.h