summaryrefslogtreecommitdiff
path: root/src/grp-udev
diff options
context:
space:
mode:
Diffstat (limited to 'src/grp-udev')
-rw-r--r--src/grp-udev/Makefile10
-rw-r--r--src/grp-udev/libudev-core/Makefile14
-rw-r--r--src/grp-udev/libudev-core/net/Makefile6
-rw-r--r--src/grp-udev/libudev-core/udev-builtin-input_id.c2
-rw-r--r--src/grp-udev/libudev-core/udev-builtin-net_setup_link.c3
-rw-r--r--src/grp-udev/mtd_probe/Makefile2
-rw-r--r--src/grp-udev/scsi_id/scsi.h1
-rw-r--r--src/grp-udev/scsi_id/scsi_id.h2
-rw-r--r--src/grp-udev/systemd-hwdb/Makefile3
-rw-r--r--src/grp-udev/systemd-udevd/udevd.c1
-rw-r--r--src/grp-udev/udevadm/Makefile3
11 files changed, 35 insertions, 12 deletions
diff --git a/src/grp-udev/Makefile b/src/grp-udev/Makefile
index ac635bfdba..e826b46a5c 100644
--- a/src/grp-udev/Makefile
+++ b/src/grp-udev/Makefile
@@ -43,6 +43,11 @@ dist_udevrules_DATA += \
rules/78-sound-card.rules \
rules/80-net-setup-link.rules
+ifneq ($(HAVE_KMOD),)
+dist_udevrules_DATA += \
+ rules/80-drivers.rules
+endif # HAVE_KMOD
+
nodist_udevrules_DATA += \
rules/99-systemd.rules
@@ -70,11 +75,6 @@ SYSINIT_TARGET_WANTS += \
systemd-udevd.service \
systemd-udev-trigger.service
-ifneq ($(HAVE_KMOD),)
-dist_udevrules_DATA += \
- rules/80-drivers.rules
-endif # HAVE_KMOD
-
nested.subdirs += ata_id
nested.subdirs += cdrom_id
nested.subdirs += collect
diff --git a/src/grp-udev/libudev-core/Makefile b/src/grp-udev/libudev-core/Makefile
index 14d4e827a0..01115354c7 100644
--- a/src/grp-udev/libudev-core/Makefile
+++ b/src/grp-udev/libudev-core/Makefile
@@ -38,7 +38,7 @@ $(outdir)/keyboard-keys-from-name.h: $(outdir)/keyboard-keys-from-name.gperf
gperf_txt_sources += \
src/udev/keyboard-keys-list.txt
-libudev_core_la_SOURCES = \
+_libudev_core_la_SOURCES = \
src/udev/udev.h \
src/udev/udev-event.c \
src/udev/udev-watch.c \
@@ -59,7 +59,7 @@ libudev_core_la_SOURCES = \
src/udev/net/ethtool-util.h \
src/udev/net/ethtool-util.c
-nodist_libudev_core_la_SOURCES = \
+_nodist_libudev_core_la_SOURCES = \
src/udev/keyboard-keys-from-name.h \
src/udev/net/link-config-gperf.c
@@ -71,8 +71,11 @@ libudev_core_la_CFLAGS = \
$(KMOD_CFLAGS)
libudev_core_la_LIBADD = \
- libsystemd-network.la \
+ libsystemd-internal.la \
+ libsystemd-basic.la \
libsystemd-shared.la \
+ libsystemd-network.la \
+ libsystemd-staging.la \
$(BLKID_LIBS) \
$(KMOD_LIBS)
@@ -94,6 +97,11 @@ libudev_core_la_SOURCES += \
src/systemd/sd-login.h
endif # HAVE_ACL
+sd.libudev-core_SOURCES = $(patsubst src/udev/%,%,$(filter %.c,$(_libudev_core_la_SOURCES) $(_nodist_libudev_core_la_SOURCES)))
+$(outdir)/libudev-core.la: $(addprefix $(outdir)/,$(sd.libudev-core_SOURCES:.c=.lo))
+$(outdir)/udev-builtin-keyboard.lo: $(outdir)/keyboard-keys-from-name.h
+sd.CPPFLAGS += -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\"
+
nested.subdirs += net
include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-udev/libudev-core/net/Makefile b/src/grp-udev/libudev-core/net/Makefile
index ac615aad3b..5094fa6050 100644
--- a/src/grp-udev/libudev-core/net/Makefile
+++ b/src/grp-udev/libudev-core/net/Makefile
@@ -20,10 +20,14 @@
#
# You should have received a copy of the GNU Lesser General Public License
# along with systemd; If not, see <http://www.gnu.org/licenses/>.
+
include $(dir $(lastword $(MAKEFILE_LIST)))/../../../../config.mk
include $(topsrcdir)/build-aux/Makefile.head.mk
-sd.CPPFLAGS += $(libsystemd-shared.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/udev-builtin-input_id.c b/src/grp-udev/libudev-core/udev-builtin-input_id.c
index d4ba49addd..e34b761cd1 100644
--- a/src/grp-udev/libudev-core/udev-builtin-input_id.c
+++ b/src/grp-udev/libudev-core/udev-builtin-input_id.c
@@ -28,8 +28,8 @@
#include <string.h>
#include <unistd.h>
-#include <linux/limits.h>
#include <linux/input.h>
+#include <linux/limits.h>
#include "systemd-basic/fd-util.h"
#include "systemd-basic/stdio-util.h"
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 38d0955f3d..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,11 +17,12 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#include "link-config.h"
#include "systemd-basic/alloc-util.h"
#include "systemd-basic/log.h"
#include "udev.h"
+#include "net/link-config.h"
+
static link_config_ctx *ctx = NULL;
static int builtin_net_setup_link(struct udev_device *dev, int argc, char **argv, bool test) {
diff --git a/src/grp-udev/mtd_probe/Makefile b/src/grp-udev/mtd_probe/Makefile
index d7392a8a3b..dc408a7d4e 100644
--- a/src/grp-udev/mtd_probe/Makefile
+++ b/src/grp-udev/mtd_probe/Makefile
@@ -34,4 +34,6 @@ dist_udevrules_DATA += \
udevlibexec_PROGRAMS += \
mtd_probe
+mtd_probe_LDADD += libsystemd-basic.la
+
include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-udev/scsi_id/scsi.h b/src/grp-udev/scsi_id/scsi.h
index a27a84a40a..497cfe3e31 100644
--- a/src/grp-udev/scsi_id/scsi.h
+++ b/src/grp-udev/scsi_id/scsi.h
@@ -13,6 +13,7 @@
*/
#include <scsi/scsi.h>
+#include <sys/types.h>
struct scsi_ioctl_command {
unsigned int inlen; /* excluding scsi command length */
diff --git a/src/grp-udev/scsi_id/scsi_id.h b/src/grp-udev/scsi_id/scsi_id.h
index 5c2e1c28ee..86d56a0c3f 100644
--- a/src/grp-udev/scsi_id/scsi_id.h
+++ b/src/grp-udev/scsi_id/scsi_id.h
@@ -17,6 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include <libudev.h>
+
#define MAX_PATH_LEN 512
/*
diff --git a/src/grp-udev/systemd-hwdb/Makefile b/src/grp-udev/systemd-hwdb/Makefile
index 4c620614ca..1bb6efb352 100644
--- a/src/grp-udev/systemd-hwdb/Makefile
+++ b/src/grp-udev/systemd-hwdb/Makefile
@@ -32,6 +32,7 @@ systemd_hwdb_SOURCES = \
src/hwdb/hwdb.c
systemd_hwdb_LDADD = \
+ libsystemd-internal.la \
libsystemd-shared.la
rootbin_PROGRAMS += \
@@ -74,4 +75,6 @@ EXTRA_DIST += \
hwdb/ids-update.pl \
hwdb/sdio.ids
+sd.CPPFLAGS += -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\"
+
include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-udev/systemd-udevd/udevd.c b/src/grp-udev/systemd-udevd/udevd.c
index ffe1ddbe2b..3b94386a38 100644
--- a/src/grp-udev/systemd-udevd/udevd.c
+++ b/src/grp-udev/systemd-udevd/udevd.c
@@ -43,7 +43,6 @@
#include <systemd/sd-daemon.h>
#include <systemd/sd-event.h>
-#include "sd-netlink/netlink-util.h"
#include "systemd-basic/alloc-util.h"
#include "systemd-basic/cgroup-util.h"
#include "systemd-basic/cpu-set-util.h"
diff --git a/src/grp-udev/udevadm/Makefile b/src/grp-udev/udevadm/Makefile
index 8f723e3a58..537dbcc5b2 100644
--- a/src/grp-udev/udevadm/Makefile
+++ b/src/grp-udev/udevadm/Makefile
@@ -41,6 +41,9 @@ udevadm_SOURCES = \
udevadm_LDADD = \
libudev-core.la \
+ libsystemd-internal.la \
libsystemd-basic.la
+sd.CPPFLAGS += -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\"
+
include $(topsrcdir)/build-aux/Makefile.tail.mk
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2025-08-24 09:14:31 +0000