tmpfiles: create static device nodes before udev is started

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 342116761e23b8b426ae4d939621f70ea4ac1209..eee73e59509966aeb69b30f99cd2df102ed9b982 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,28 +32,28 @@ SUBDIRS = . po
 .SECONDARY:
 
 LIBUDEV_CURRENT=4
-LIBUDEV_REVISION=1
+LIBUDEV_REVISION=2
 LIBUDEV_AGE=3
 
 LIBGUDEV_CURRENT=1
 LIBGUDEV_REVISION=3
 LIBGUDEV_AGE=1
 
-LIBSYSTEMD_LOGIN_CURRENT=4
-LIBSYSTEMD_LOGIN_REVISION=2
-LIBSYSTEMD_LOGIN_AGE=4
+LIBSYSTEMD_LOGIN_CURRENT=5
+LIBSYSTEMD_LOGIN_REVISION=0
+LIBSYSTEMD_LOGIN_AGE=5
 
 LIBSYSTEMD_DAEMON_CURRENT=0
-LIBSYSTEMD_DAEMON_REVISION=8
+LIBSYSTEMD_DAEMON_REVISION=9
 LIBSYSTEMD_DAEMON_AGE=0
 
 LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=19
+LIBSYSTEMD_ID128_REVISION=20
 LIBSYSTEMD_ID128_AGE=0
 
-LIBSYSTEMD_JOURNAL_CURRENT=8
-LIBSYSTEMD_JOURNAL_REVISION=2
-LIBSYSTEMD_JOURNAL_AGE=8
+LIBSYSTEMD_JOURNAL_CURRENT=9
+LIBSYSTEMD_JOURNAL_REVISION=0
+LIBSYSTEMD_JOURNAL_AGE=9
 
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@
@@ -427,6 +427,7 @@ nodist_systemunit_DATA = \
        units/systemd-kexec.service \
        units/systemd-fsck@.service \
        units/systemd-fsck-root.service \
+       units/systemd-static-nodes.service \
        units/systemd-udevd.service \
        units/systemd-udev-trigger.service \
        units/systemd-udev-settle.service \
@@ -468,6 +469,7 @@ EXTRA_DIST += \
        units/systemd-fsck@.service.in \
        units/systemd-fsck-root.service.in \
        units/user@.service.in \
+       units/systemd-static-nodes.service \
        units/systemd-udevd.service \
        units/systemd-udev-trigger.service \
        units/systemd-udev-settle.service \
@@ -1700,6 +1702,8 @@ libsystemd_bus_la_SOURCES = \
        src/libsystemd-bus/bus-internal.h \
        src/libsystemd-bus/bus-socket.c \
        src/libsystemd-bus/bus-socket.h \
+       src/libsystemd-bus/bus-kernel.c \
+       src/libsystemd-bus/bus-kernel.h \
        src/libsystemd-bus/bus-message.c \
        src/libsystemd-bus/bus-message.h \
        src/libsystemd-bus/bus-signature.c \
@@ -1722,7 +1726,8 @@ noinst_tests += \
        test-bus-signature \
        test-bus-chat \
        test-bus-server \
-       test-bus-match
+       test-bus-match \
+       test-bus-kernel
 
 noinst_PROGRAMS += \
        busctl
@@ -1783,6 +1788,17 @@ test_bus_match_LDADD = \
        libsystemd-bus.la \
        libsystemd-id128-internal.la
 
+test_bus_kernel_SOURCES = \
+       src/libsystemd-bus/test-bus-kernel.c
+
+test_bus_kernel_CFLAGS = \
+       $(AM_CFLAGS)
+
+test_bus_kernel_LDADD = \
+       libsystemd-shared.la \
+       libsystemd-bus.la \
+       libsystemd-id128-internal.la
+
 busctl_SOURCES = \
        src/libsystemd-bus/busctl.c
 
@@ -1925,11 +1941,13 @@ CLEANFILES += \
        src/udev/udev.pc
 
 EXTRA_DIST += \
+       units/systemd-static-nodes.service.in \
        units/systemd-udevd.service.in \
        units/systemd-udev-trigger.service.in \
        units/systemd-udev-settle.service.in
 
 CLEANFILES += \
+       units/systemd-static-nodes.service \
        units/systemd-udevd.service \
        units/systemd-udev-trigger.service \
        units/systemd-udev-settle.service
@@ -1938,6 +1956,7 @@ SOCKETS_TARGET_WANTS += \
        systemd-udevd-control.socket \
        systemd-udevd-kernel.socket
 SYSINIT_TARGET_WANTS += \
+       systemd-static-nodes.service \
        systemd-udevd.service \
        systemd-udev-trigger.service
 
@@ -2398,6 +2417,7 @@ dist_udevkeymap_DATA = \
        keymaps/hewlett-packard-tablet \
        keymaps/hewlett-packard-tx2 \
        keymaps/hewlett-packard_elitebook-8440p \
+       keymaps/hewlett-packard_elitebook-8460p \
        keymaps/hewlett-packard-hdx9494nr \
        keymaps/ibm-thinkpad-usb-keyboard-trackpoint \
        keymaps/inventec-symphony_6.0_7.0 \
@@ -4104,6 +4124,10 @@ hwdb-update:
                http://standards.ieee.org/develop/regauth/iab/iab.txt && \
        ./ids-update.pl )
 
+kdbus-update:
+       ( cd $(top_srcdir)/src/libsystemd-bus/ && \
+       wget -N https://d-bus.googlecode.com/git/kdbus.h )
+
 upload: all distcheck
        cp -v systemd-$(VERSION).tar.xz /home/lennart/git.fedora/systemd/
        scp systemd-$(VERSION).tar.xz fdo:/srv/www.freedesktop.org/www/software/systemd/