diff options
Diffstat (limited to 'src/grp-udev/libudev-core')
24 files changed, 100 insertions, 94 deletions
diff --git a/src/grp-udev/libudev-core/Makefile b/src/grp-udev/libudev-core/Makefile index 4323fa96ec..01115354c7 100644 --- a/src/grp-udev/libudev-core/Makefile +++ b/src/grp-udev/libudev-core/Makefile @@ -71,8 +71,11 @@ libudev_core_la_CFLAGS = \ $(KMOD_CFLAGS) libudev_core_la_LIBADD = \ + libsystemd-internal.la \ + libsystemd-basic.la \ + libsystemd-shared.la \ libsystemd-network.la \ - libshared.la \ + libsystemd-staging.la \ $(BLKID_LIBS) \ $(KMOD_LIBS) diff --git a/src/grp-udev/libudev-core/net/Makefile b/src/grp-udev/libudev-core/net/Makefile index 5ccbd00002..5094fa6050 100644 --- a/src/grp-udev/libudev-core/net/Makefile +++ b/src/grp-udev/libudev-core/net/Makefile @@ -24,7 +24,10 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk -sd.CPPFLAGS += $(libshared.CPPFLAGS) +sd.CPPFLAGS += $(libsystemd-internal.CPPFLAGS) +sd.CPPFLAGS += $(libsystemd-basic.CPPFLAGS) sd.CPPFLAGS += $(libsystemd-network.CPPFLAGS) +sd.CPPFLAGS += $(libsystemd-shared.CPPFLAGS) +sd.CPPFLAGS += $(libsystemd-staging.CPPFLAGS) include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-udev/libudev-core/net/ethtool-util.c b/src/grp-udev/libudev-core/net/ethtool-util.c index b381284a6b..9c67e807ff 100644 --- a/src/grp-udev/libudev-core/net/ethtool-util.c +++ b/src/grp-udev/libudev-core/net/ethtool-util.c @@ -23,11 +23,11 @@ #include <linux/ethtool.h> #include <linux/sockios.h> -#include "basic/log.h" -#include "basic/string-table.h" -#include "basic/strxcpyx.h" -#include "basic/util.h" -#include "shared/conf-parser.h" +#include "systemd-basic/log.h" +#include "systemd-basic/string-table.h" +#include "systemd-basic/strxcpyx.h" +#include "systemd-basic/util.h" +#include "systemd-shared/conf-parser.h" #include "ethtool-util.h" diff --git a/src/grp-udev/libudev-core/net/ethtool-util.h b/src/grp-udev/libudev-core/net/ethtool-util.h index 7d103d9f2f..61699d4225 100644 --- a/src/grp-udev/libudev-core/net/ethtool-util.h +++ b/src/grp-udev/libudev-core/net/ethtool-util.h @@ -19,7 +19,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "basic/macro.h" +#include "systemd-basic/macro.h" /* we can't use DUPLEX_ prefix, as it * clashes with <linux/ethtool.h> */ diff --git a/src/grp-udev/libudev-core/net/link-config-gperf.gperf b/src/grp-udev/libudev-core/net/link-config-gperf.gperf index c84f4599ce..a75f6f8358 100644 --- a/src/grp-udev/libudev-core/net/link-config-gperf.gperf +++ b/src/grp-udev/libudev-core/net/link-config-gperf.gperf @@ -1,8 +1,8 @@ %{ #include <stddef.h> -#include "shared/conf-parser.h" #include "systemd-network/network-internal.h" +#include "systemd-shared/conf-parser.h" #include "ethtool-util.h" #include "link-config.h" diff --git a/src/grp-udev/libudev-core/net/link-config.c b/src/grp-udev/libudev-core/net/link-config.c index f6803e00df..df06447e6c 100644 --- a/src/grp-udev/libudev-core/net/link-config.c +++ b/src/grp-udev/libudev-core/net/link-config.c @@ -19,25 +19,25 @@ #include <netinet/ether.h> -#include "basic/alloc-util.h" -#include "basic/conf-files.h" -#include "basic/fd-util.h" -#include "basic/log.h" -#include "basic/missing.h" -#include "basic/parse-util.h" -#include "basic/path-util.h" -#include "basic/proc-cmdline.h" -#include "basic/random-util.h" -#include "basic/stat-util.h" -#include "basic/string-table.h" -#include "basic/string-util.h" -#include "basic/strv.h" -#include "basic/util.h" #include "libudev-private.h" #include "sd-netlink/netlink-util.h" -#include "sd-netlink/sd-netlink.h" -#include "shared/conf-parser.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/conf-files.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/log.h" +#include "systemd-basic/missing.h" +#include "systemd-basic/parse-util.h" +#include "systemd-basic/path-util.h" +#include "systemd-basic/proc-cmdline.h" +#include "systemd-basic/random-util.h" +#include "systemd-basic/stat-util.h" +#include "systemd-basic/string-table.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/util.h" #include "systemd-network/network-internal.h" +#include "systemd-shared/conf-parser.h" +#include "systemd-staging/sd-netlink.h" #include "ethtool-util.h" #include "link-config.h" diff --git a/src/grp-udev/libudev-core/net/link-config.h b/src/grp-udev/libudev-core/net/link-config.h index ad5211610a..3fedc60f51 100644 --- a/src/grp-udev/libudev-core/net/link-config.h +++ b/src/grp-udev/libudev-core/net/link-config.h @@ -21,8 +21,8 @@ #include <libudev.h> -#include "basic/list.h" -#include "shared/condition.h" +#include "systemd-basic/list.h" +#include "systemd-shared/condition.h" #include "ethtool-util.h" diff --git a/src/grp-udev/libudev-core/udev-builtin-blkid.c b/src/grp-udev/libudev-core/udev-builtin-blkid.c index a2784aa03e..b56ffa62a3 100644 --- a/src/grp-udev/libudev-core/udev-builtin-blkid.c +++ b/src/grp-udev/libudev-core/udev-builtin-blkid.c @@ -29,11 +29,11 @@ #include <systemd/sd-id128.h> -#include "basic/alloc-util.h" -#include "basic/fd-util.h" -#include "basic/string-util.h" -#include "shared/efivars.h" -#include "shared/gpt.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/string-util.h" +#include "systemd-shared/efivars.h" +#include "systemd-shared/gpt.h" #include "udev.h" static void print_property(struct udev_device *dev, bool test, const char *name, const char *value) { diff --git a/src/grp-udev/libudev-core/udev-builtin-btrfs.c b/src/grp-udev/libudev-core/udev-builtin-btrfs.c index 333229de55..dbaf65d8f9 100644 --- a/src/grp-udev/libudev-core/udev-builtin-btrfs.c +++ b/src/grp-udev/libudev-core/udev-builtin-btrfs.c @@ -25,9 +25,9 @@ #include <linux/btrfs.h> #endif -#include "basic/fd-util.h" -#include "basic/missing.h" -#include "basic/string-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/missing.h" +#include "systemd-basic/string-util.h" #include "udev.h" static int builtin_btrfs(struct udev_device *dev, int argc, char *argv[], bool test) { diff --git a/src/grp-udev/libudev-core/udev-builtin-hwdb.c b/src/grp-udev/libudev-core/udev-builtin-hwdb.c index d2d95bf394..9587845ac2 100644 --- a/src/grp-udev/libudev-core/udev-builtin-hwdb.c +++ b/src/grp-udev/libudev-core/udev-builtin-hwdb.c @@ -22,11 +22,11 @@ #include <stdio.h> #include <stdlib.h> -#include "basic/alloc-util.h" -#include "basic/string-util.h" #include "sd-hwdb/hwdb-util.h" -#include "sd-hwdb/sd-hwdb.h" -#include "shared/udev-util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/string-util.h" +#include "systemd-shared/udev-util.h" +#include "systemd-staging/sd-hwdb.h" #include "udev.h" static sd_hwdb *hwdb; diff --git a/src/grp-udev/libudev-core/udev-builtin-input_id.c b/src/grp-udev/libudev-core/udev-builtin-input_id.c index 711ec0b665..e34b761cd1 100644 --- a/src/grp-udev/libudev-core/udev-builtin-input_id.c +++ b/src/grp-udev/libudev-core/udev-builtin-input_id.c @@ -31,10 +31,10 @@ #include <linux/input.h> #include <linux/limits.h> -#include "basic/fd-util.h" -#include "basic/stdio-util.h" -#include "basic/string-util.h" -#include "basic/util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/stdio-util.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/util.h" #include "udev.h" /* we must use this kernel-compatible implementation */ diff --git a/src/grp-udev/libudev-core/udev-builtin-keyboard.c b/src/grp-udev/libudev-core/udev-builtin-keyboard.c index d07eff08d6..22faeb488b 100644 --- a/src/grp-udev/libudev-core/udev-builtin-keyboard.c +++ b/src/grp-udev/libudev-core/udev-builtin-keyboard.c @@ -24,10 +24,10 @@ #include <linux/input.h> -#include "basic/fd-util.h" -#include "basic/parse-util.h" -#include "basic/stdio-util.h" -#include "basic/string-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/parse-util.h" +#include "systemd-basic/stdio-util.h" +#include "systemd-basic/string-util.h" #include "udev.h" static const struct key *keyboard_lookup_key(const char *str, unsigned len); diff --git a/src/grp-udev/libudev-core/udev-builtin-kmod.c b/src/grp-udev/libudev-core/udev-builtin-kmod.c index 15d23c0f0e..91732bbfa4 100644 --- a/src/grp-udev/libudev-core/udev-builtin-kmod.c +++ b/src/grp-udev/libudev-core/udev-builtin-kmod.c @@ -24,7 +24,7 @@ #include <stdio.h> #include <stdlib.h> -#include "basic/string-util.h" +#include "systemd-basic/string-util.h" #include "udev.h" static struct kmod_ctx *ctx = NULL; diff --git a/src/grp-udev/libudev-core/udev-builtin-net_id.c b/src/grp-udev/libudev-core/udev-builtin-net_id.c index 51f734d2c1..599e8ef091 100644 --- a/src/grp-udev/libudev-core/udev-builtin-net_id.c +++ b/src/grp-udev/libudev-core/udev-builtin-net_id.c @@ -99,10 +99,10 @@ #include <linux/pci_regs.h> -#include "basic/fd-util.h" -#include "basic/fileio.h" -#include "basic/stdio-util.h" -#include "basic/string-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/fileio.h" +#include "systemd-basic/stdio-util.h" +#include "systemd-basic/string-util.h" #include "udev.h" #define ONBOARD_INDEX_MAX (16*1024-1) diff --git a/src/grp-udev/libudev-core/udev-builtin-net_setup_link.c b/src/grp-udev/libudev-core/udev-builtin-net_setup_link.c index 3f3522f5e1..b64ea049ec 100644 --- a/src/grp-udev/libudev-core/udev-builtin-net_setup_link.c +++ b/src/grp-udev/libudev-core/udev-builtin-net_setup_link.c @@ -17,8 +17,8 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "basic/alloc-util.h" -#include "basic/log.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/log.h" #include "udev.h" #include "net/link-config.h" diff --git a/src/grp-udev/libudev-core/udev-builtin-path_id.c b/src/grp-udev/libudev-core/udev-builtin-path_id.c index 4476b90c72..f7802cd905 100644 --- a/src/grp-udev/libudev-core/udev-builtin-path_id.c +++ b/src/grp-udev/libudev-core/udev-builtin-path_id.c @@ -30,8 +30,8 @@ #include <string.h> #include <unistd.h> -#include "basic/alloc-util.h" -#include "basic/string-util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/string-util.h" #include "udev.h" _printf_(2,3) diff --git a/src/grp-udev/libudev-core/udev-builtin-uaccess.c b/src/grp-udev/libudev-core/udev-builtin-uaccess.c index aab1c376de..64773b90f5 100644 --- a/src/grp-udev/libudev-core/udev-builtin-uaccess.c +++ b/src/grp-udev/libudev-core/udev-builtin-uaccess.c @@ -24,8 +24,8 @@ #include <systemd/sd-login.h> -#include "basic/login-util.h" -#include "basic/util.h" +#include "systemd-basic/login-util.h" +#include "systemd-basic/util.h" #include "udev.h" #include "logind-acl.h" diff --git a/src/grp-udev/libudev-core/udev-builtin-usb_id.c b/src/grp-udev/libudev-core/udev-builtin-usb_id.c index fcaf8551d8..68989580f2 100644 --- a/src/grp-udev/libudev-core/udev-builtin-usb_id.c +++ b/src/grp-udev/libudev-core/udev-builtin-usb_id.c @@ -29,9 +29,9 @@ #include <string.h> #include <unistd.h> -#include "basic/alloc-util.h" -#include "basic/fd-util.h" -#include "basic/string-util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/string-util.h" #include "udev.h" static void set_usb_iftype(char *to, int if_class_num, size_t len) { diff --git a/src/grp-udev/libudev-core/udev-builtin.c b/src/grp-udev/libudev-core/udev-builtin.c index 13d3cd4ee0..fb80e715ad 100644 --- a/src/grp-udev/libudev-core/udev-builtin.c +++ b/src/grp-udev/libudev-core/udev-builtin.c @@ -21,7 +21,7 @@ #include <stdio.h> #include <string.h> -#include "basic/string-util.h" +#include "systemd-basic/string-util.h" #include "udev.h" static bool initialized; diff --git a/src/grp-udev/libudev-core/udev-ctrl.c b/src/grp-udev/libudev-core/udev-ctrl.c index 4336aa58ab..f399f2dfa2 100644 --- a/src/grp-udev/libudev-core/udev-ctrl.c +++ b/src/grp-udev/libudev-core/udev-ctrl.c @@ -18,10 +18,10 @@ #include <sys/un.h> #include <unistd.h> -#include "basic/alloc-util.h" -#include "basic/fd-util.h" -#include "basic/formats-util.h" -#include "basic/socket-util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/formats-util.h" +#include "systemd-basic/socket-util.h" #include "udev.h" /* wire protocol magic must match */ diff --git a/src/grp-udev/libudev-core/udev-event.c b/src/grp-udev/libudev-core/udev-event.c index 5bdf5aad02..f553b8b73d 100644 --- a/src/grp-udev/libudev-core/udev-event.c +++ b/src/grp-udev/libudev-core/udev-event.c @@ -30,13 +30,13 @@ #include <sys/wait.h> #include <unistd.h> -#include "basic/alloc-util.h" -#include "basic/fd-util.h" -#include "basic/formats-util.h" -#include "basic/process-util.h" -#include "basic/signal-util.h" -#include "basic/string-util.h" #include "sd-netlink/netlink-util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/formats-util.h" +#include "systemd-basic/process-util.h" +#include "systemd-basic/signal-util.h" +#include "systemd-basic/string-util.h" #include "udev.h" typedef struct Spawn { diff --git a/src/grp-udev/libudev-core/udev-node.c b/src/grp-udev/libudev-core/udev-node.c index 3a2daa89ad..3007dec316 100644 --- a/src/grp-udev/libudev-core/udev-node.c +++ b/src/grp-udev/libudev-core/udev-node.c @@ -25,12 +25,12 @@ #include <sys/stat.h> #include <unistd.h> -#include "basic/formats-util.h" -#include "basic/fs-util.h" -#include "basic/selinux-util.h" -#include "basic/smack-util.h" -#include "basic/stdio-util.h" -#include "basic/string-util.h" +#include "systemd-basic/formats-util.h" +#include "systemd-basic/fs-util.h" +#include "systemd-basic/selinux-util.h" +#include "systemd-basic/smack-util.h" +#include "systemd-basic/stdio-util.h" +#include "systemd-basic/string-util.h" #include "udev.h" static int node_symlink(struct udev_device *dev, const char *node, const char *slink) { diff --git a/src/grp-udev/libudev-core/udev-rules.c b/src/grp-udev/libudev-core/udev-rules.c index 134d269fd8..286d8e136b 100644 --- a/src/grp-udev/libudev-core/udev-rules.c +++ b/src/grp-udev/libudev-core/udev-rules.c @@ -29,21 +29,21 @@ #include <time.h> #include <unistd.h> -#include "basic/alloc-util.h" -#include "basic/conf-files.h" -#include "basic/escape.h" -#include "basic/fd-util.h" -#include "basic/fs-util.h" -#include "basic/glob-util.h" -#include "basic/path-util.h" -#include "basic/stat-util.h" -#include "basic/stdio-util.h" -#include "basic/strbuf.h" -#include "basic/string-util.h" -#include "basic/strv.h" -#include "basic/user-util.h" -#include "basic/util.h" -#include "shared/sysctl-util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/conf-files.h" +#include "systemd-basic/escape.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/fs-util.h" +#include "systemd-basic/glob-util.h" +#include "systemd-basic/path-util.h" +#include "systemd-basic/stat-util.h" +#include "systemd-basic/stdio-util.h" +#include "systemd-basic/strbuf.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/user-util.h" +#include "systemd-basic/util.h" +#include "systemd-shared/sysctl-util.h" #include "udev.h" #define PREALLOC_TOKEN 2048 diff --git a/src/grp-udev/libudev-core/udev-watch.c b/src/grp-udev/libudev-core/udev-watch.c index 7dcc71556e..193207d2c2 100644 --- a/src/grp-udev/libudev-core/udev-watch.c +++ b/src/grp-udev/libudev-core/udev-watch.c @@ -24,7 +24,7 @@ #include <sys/inotify.h> #include <unistd.h> -#include "basic/stdio-util.h" +#include "systemd-basic/stdio-util.h" #include "udev.h" static int inotify_fd = -1; |