From 100fd93f550d0531d2060d9968e4a2cff8a04501 Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 1 Jan 2021 04:37:10 +0900
Subject: [PATCH] tmpfiles: move offline-passwd.[ch] to src/tmpfiles

offline-passwd.[ch] are only used by systemd-tmpfiles and the relevant
test. And are not included in libshared. So, it is not suitable to
located under src/shared.
---
 src/test/meson.build                         |  6 ------
 src/tmpfiles/meson.build                     | 15 +++++++++++----
 src/{shared => tmpfiles}/offline-passwd.c    |  0
 src/{shared => tmpfiles}/offline-passwd.h    |  0
 src/{test => tmpfiles}/test-offline-passwd.c |  0
 5 files changed, 11 insertions(+), 10 deletions(-)
 rename src/{shared => tmpfiles}/offline-passwd.c (100%)
 rename src/{shared => tmpfiles}/offline-passwd.h (100%)
 rename src/{test => tmpfiles}/test-offline-passwd.c (100%)

diff --git a/src/test/meson.build b/src/test/meson.build
index 5d1c7166ea6..7280cd31b31 100644
--- a/src/test/meson.build
+++ b/src/test/meson.build
@@ -290,12 +290,6 @@ tests += [
          [],
          '', 'timeout=120'],
 
-        [['src/test/test-offline-passwd.c',
-          'src/shared/offline-passwd.c',
-          'src/shared/offline-passwd.h'],
-         [],
-         []],
-
         [['src/test/test-escape.c'],
          [],
          []],
diff --git a/src/tmpfiles/meson.build b/src/tmpfiles/meson.build
index 2d61568c664..a372bcded06 100644
--- a/src/tmpfiles/meson.build
+++ b/src/tmpfiles/meson.build
@@ -1,7 +1,14 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
-systemd_tmpfiles_sources = [
-        'src/tmpfiles/tmpfiles.c',
-        'src/shared/offline-passwd.c',
-        'src/shared/offline-passwd.h',
+systemd_tmpfiles_sources = files(
+        'tmpfiles.c',
+        'offline-passwd.c',
+        'offline-passwd.h')
+
+tests += [
+        [['src/tmpfiles/test-offline-passwd.c',
+          'src/tmpfiles/offline-passwd.c',
+          'src/tmpfiles/offline-passwd.h'],
+         [],
+         []],
 ]
diff --git a/src/shared/offline-passwd.c b/src/tmpfiles/offline-passwd.c
similarity index 100%
rename from src/shared/offline-passwd.c
rename to src/tmpfiles/offline-passwd.c
diff --git a/src/shared/offline-passwd.h b/src/tmpfiles/offline-passwd.h
similarity index 100%
rename from src/shared/offline-passwd.h
rename to src/tmpfiles/offline-passwd.h
diff --git a/src/test/test-offline-passwd.c b/src/tmpfiles/test-offline-passwd.c
similarity index 100%
rename from src/test/test-offline-passwd.c
rename to src/tmpfiles/test-offline-passwd.c
-- 
2.47.3