From: Mike Yuan <me@yhndnzj.com>
Date: Sun, 15 Sep 2024 18:57:03 +0000 (+0200)
Subject: path-lookup: move from basic/ to libsystemd/
X-Git-Tag: v257-rc1~317^2~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f005e267bc09e3cc78576a960434890892c2b517;p=thirdparty%2Fsystemd.git

path-lookup: move from basic/ to libsystemd/

So that sd_path_lookup() can be utilized to replace
duplicate functions.
---

diff --git a/meson.build b/meson.build
index e258a65a1ac..651fb30584d 100644
--- a/meson.build
+++ b/meson.build
@@ -2092,6 +2092,7 @@ libsystemd_includes = [basic_includes, include_directories(
         'src/libsystemd/sd-json',
         'src/libsystemd/sd-netlink',
         'src/libsystemd/sd-network',
+        'src/libsystemd/sd-path',
         'src/libsystemd/sd-resolve',
         'src/libsystemd/sd-varlink')]
 
diff --git a/src/basic/meson.build b/src/basic/meson.build
index 9a3361bb077..e02f787c75e 100644
--- a/src/basic/meson.build
+++ b/src/basic/meson.build
@@ -70,7 +70,6 @@ basic_sources = files(
         'ordered-set.c',
         'os-util.c',
         'parse-util.c',
-        'path-lookup.c',
         'path-util.c',
         'percent-util.c',
         'pidref.c',
diff --git a/src/libsystemd/meson.build b/src/libsystemd/meson.build
index d73c3a89741..fa28aa09fb8 100644
--- a/src/libsystemd/meson.build
+++ b/src/libsystemd/meson.build
@@ -44,7 +44,7 @@ sd_journal_sources += [audit_type_to_name]
 
 ############################################################
 
-id128_sources = files(
+sd_id128_sources = files(
         'sd-id128/id128-util.c',
         'sd-id128/sd-id128.c',
 )
@@ -62,28 +62,7 @@ sd_event_sources = files(
 
 ############################################################
 
-sd_login_sources = files('sd-login/sd-login.c')
-
-############################################################
-
-sd_json_sources = files(
-        'sd-json/json-util.c',
-        'sd-json/sd-json.c',
-)
-
-############################################################
-
-sd_varlink_sources = files(
-        'sd-varlink/sd-varlink.c',
-        'sd-varlink/sd-varlink-idl.c',
-        'sd-varlink/varlink-io.systemd.c',
-        'sd-varlink/varlink-org.varlink.service.c',
-        'sd-varlink/varlink-util.c',
-)
-
-############################################################
-
-libsystemd_sources = files(
+sd_bus_sources = files(
         'sd-bus/bus-common-errors.c',
         'sd-bus/bus-container.c',
         'sd-bus/bus-control.c',
@@ -103,13 +82,50 @@ libsystemd_sources = files(
         'sd-bus/bus-track.c',
         'sd-bus/bus-type.c',
         'sd-bus/sd-bus.c',
+)
+
+############################################################
+
+sd_device_sources = files(
         'sd-device/device-enumerator.c',
         'sd-device/device-filter.c',
         'sd-device/device-monitor.c',
         'sd-device/device-private.c',
         'sd-device/device-util.c',
         'sd-device/sd-device.c',
-        'sd-hwdb/sd-hwdb.c',
+)
+
+############################################################
+
+sd_login_sources = files('sd-login/sd-login.c')
+
+############################################################
+
+sd_json_sources = files(
+        'sd-json/json-util.c',
+        'sd-json/sd-json.c',
+)
+
+############################################################
+
+sd_varlink_sources = files(
+        'sd-varlink/sd-varlink.c',
+        'sd-varlink/sd-varlink-idl.c',
+        'sd-varlink/varlink-io.systemd.c',
+        'sd-varlink/varlink-org.varlink.service.c',
+        'sd-varlink/varlink-util.c',
+)
+
+############################################################
+
+sd_path_sources = files(
+        'sd-path/path-lookup.c',
+        'sd-path/sd-path.c',
+)
+
+############################################################
+
+sd_netlink_sources = files(
         'sd-netlink/netlink-genl.c',
         'sd-netlink/netlink-message-nfnl.c',
         'sd-netlink/netlink-message-rtnl.c',
@@ -122,11 +138,24 @@ libsystemd_sources = files(
         'sd-netlink/netlink-types.c',
         'sd-netlink/netlink-util.c',
         'sd-netlink/sd-netlink.c',
+)
+
+############################################################
+
+sd_network_sources = files(
         'sd-network/network-util.c',
         'sd-network/sd-network.c',
-        'sd-path/sd-path.c',
+)
+
+############################################################
+
+libsystemd_sources = files(
+        'sd-hwdb/sd-hwdb.c',
         'sd-resolve/sd-resolve.c',
-) + sd_journal_sources + id128_sources + sd_daemon_sources + sd_event_sources + sd_login_sources + sd_json_sources + sd_varlink_sources
+) + sd_journal_sources + sd_id128_sources + sd_daemon_sources \
+  + sd_event_sources + sd_bus_sources + sd_device_sources \
+  + sd_login_sources + sd_json_sources + sd_varlink_sources \
+  + sd_path_sources + sd_netlink_sources + sd_network_sources
 
 libsystemd_c_args = ['-fvisibility=default']
 
diff --git a/src/basic/path-lookup.c b/src/libsystemd/sd-path/path-lookup.c
similarity index 100%
rename from src/basic/path-lookup.c
rename to src/libsystemd/sd-path/path-lookup.c
diff --git a/src/basic/path-lookup.h b/src/libsystemd/sd-path/path-lookup.h
similarity index 100%
rename from src/basic/path-lookup.h
rename to src/libsystemd/sd-path/path-lookup.h