libudev: Don't pull in libshared_static

- Move devices-nodes.c to src/basic as it's super trivial anyway
- Duplicate udev_queue_is_empty() in libudev-util.c as it's trivial
  anyway.

diff --git a/meson.build b/meson.build
index 65191c3511a3a706fb6f64f6e54ea8309dc1d2df..858d7926a7ae7ba4555ae43840b1453ae95e3bee 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -2227,7 +2227,7 @@ libudev = shared_library(
         implicit_include_directories : false,
         link_args : ['-shared',
                      '-Wl,--version-script=' + libudev_sym_path],
-        link_with : [libsystemd_static, libshared_static],
+        link_with : [libsystemd_static],
         link_whole : libudev_basic,
         dependencies : [threads,
                         userspace],

diff --git a/src/shared/device-nodes.c b/src/basic/device-nodes.c
similarity index 100%
rename from src/shared/device-nodes.c
rename to src/basic/device-nodes.c

diff --git a/src/shared/device-nodes.h b/src/basic/device-nodes.h
similarity index 89%
rename from src/shared/device-nodes.h
rename to src/basic/device-nodes.h
index 5b2e0432c1c8809fbc147410ccba776188ba8f18..21118b5bd1dead12378512ac1797ccdbc20a5f6c 100644 (file)
--- a/src/shared/device-nodes.h
+++ b/src/basic/device-nodes.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "shared-forward.h"
+#include "basic-forward.h"
 
 int encode_devnode_name(const char *str, char *str_enc, size_t len);
 int allow_listed_char_for_devnode(char c, const char *additional);

diff --git a/src/basic/meson.build b/src/basic/meson.build
index 3ae3517a269fd7bdccbc62c699c7768a4f5a769d..c4427ee03756520e0415ab6cb8d4d42079fce16e 100644 (file)
--- a/src/basic/meson.build
+++ b/src/basic/meson.build
@@ -23,6 +23,7 @@ basic_sources = files(
         'compress.c',
         'conf-files.c',
         'confidential-virt.c',
+        'device-nodes.c',
         'devnum-util.c',
         'dirent-util.c',
         'dlfcn-util.c',

diff --git a/src/libudev/libudev-queue.c b/src/libudev/libudev-queue.c
index a6064e5b666655d2146e0d96df591c6277842bab..a86bf6953a36fca83c8c42f4d9c83eb0083ebb8d 100644 (file)
--- a/src/libudev/libudev-queue.c
+++ b/src/libudev/libudev-queue.c
@@ -12,7 +12,6 @@
 #include "errno-util.h"
 #include "fd-util.h"
 #include "io-util.h"
-#include "udev-util.h"
 
 /**
  * SECTION:libudev-queue
@@ -64,6 +63,11 @@ static struct udev_queue* udev_queue_free(struct udev_queue *udev_queue) {
         return mfree(udev_queue);
 }
 
+static int udev_queue_is_empty(void) {
+        return access("/run/udev/queue", F_OK) < 0 ?
+                (errno == ENOENT ? true : -errno) : false;
+}
+
 /**
  * udev_queue_ref:
  * @udev_queue: udev queue context

diff --git a/src/shared/meson.build b/src/shared/meson.build
index acc80d3e347c3d19ea38f7bd9ca87034dd6bfc2d..f2d73118bbe05ef695114f4732705b4398d90740 100644 (file)
--- a/src/shared/meson.build
+++ b/src/shared/meson.build
@@ -57,7 +57,6 @@ shared_sources = files(
         'daemon-util.c',
         'data-fd-util.c',
         'dev-setup.c',
-        'device-nodes.c',
         'discover-image.c',
         'dissect-image.c',
         'dm-util.c',