mirror of
https://github.com/morgan9e/systemd
synced 2026-04-14 00:14:32 +09:00
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.
This commit is contained in:
@@ -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],
|
||||
|
||||
@@ -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);
|
||||
@@ -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',
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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',
|
||||
|
||||
Reference in New Issue
Block a user