chiark / gitweb /
make: pre-process and install systemd service files when needed
authorKay Sievers <kay.sievers@vrfy.org>
Fri, 25 Jun 2010 08:30:55 +0000 (10:30 +0200)
committerKay Sievers <kay.sievers@vrfy.org>
Fri, 25 Jun 2010 08:30:55 +0000 (10:30 +0200)
Makefile.am
configure.ac
extras/mtd_probe/.gitignore [new file with mode: 0644]
init/.gitignore [new file with mode: 0644]
init/udev-retry.service.in [moved from init/udev-retry.service with 81% similarity]
init/udev-settle.service.in [moved from init/udev-settle.service with 84% similarity]
init/udev.service.in [moved from init/udev.service with 52% similarity]

index 1916770..198c06c 100644 (file)
@@ -114,6 +114,13 @@ dist_udevconf_DATA = udev.conf
 sharepkgconfigdir = $(datadir)/pkgconfig
 sharepkgconfig_DATA = udev/udev.pc
 
+if WITH_SYSTEMD
+systemdsystemunit_DATA = \
+       init/udev.service \
+       init/udev-settle.service \
+       init/udev-retry.service
+endif
+
 sbin_PROGRAMS = \
        udev/udevd \
        udev/udevadm
index 4bac653..255ee18 100644 (file)
@@ -49,8 +49,7 @@ fi
 AC_ARG_WITH(firmware-path,
        AS_HELP_STRING([--with-firmware-path=DIR[[[:DIR[...]]]]],
           [Firmware search path (default=/lib/firmware/updates:/lib/firmware)]),
-       [], [with_firmware_path="/lib/firmware/updates:/lib/firmware"]
-       )
+       [], [with_firmware_path="/lib/firmware/updates:/lib/firmware"])
 OLD_IFS=$IFS
 IFS=:
 for i in $with_firmware_path
@@ -64,6 +63,12 @@ done
 IFS=$OLD_IFS
 AC_SUBST([FIRMWARE_PATH], [$FIRMWARE_PATH])
 
+AC_ARG_WITH([systemdsystemunitdir],
+       AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
+       [], [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)])
+AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
+AM_CONDITIONAL(WITH_SYSTEMD, [test -n "$with_systemdsystemunitdir"])
+
 AC_ARG_ENABLE([extras],
        AS_HELP_STRING([--disable-extras], [disable extras with external dependencies]),
        [], [enable_extras=yes])
@@ -126,10 +131,13 @@ AM_CONDITIONAL([ENABLE_INTROSPECTION], [test "x$enable_introspection" = xyes])
 AC_CONFIG_HEADERS(config.h)
 AC_CONFIG_FILES([
        Makefile
+       udev/udev.pc
+       init/udev.service
+       init/udev-settle.service
+       init/udev-retry.service
        libudev/libudev.pc
        libudev/docs/Makefile
        libudev/docs/version.xml
-       udev/udev.pc
        extras/gudev/gudev-1.0.pc
        extras/gudev/docs/Makefile
        extras/gudev/docs/version.xml
@@ -153,6 +161,8 @@ AC_MSG_RESULT([
 
        include_prefix:         ${INCLUDE_PREFIX}
 
+       systemdsystemunitdir:   ${systemdsystemunitdir}
+
        logging:                ${enable_logging}
        debug:                  ${enable_debug}
        selinux:                ${with_selinux}
diff --git a/extras/mtd_probe/.gitignore b/extras/mtd_probe/.gitignore
new file mode 100644 (file)
index 0000000..82b8ab5
--- /dev/null
@@ -0,0 +1 @@
+mtd_probe
diff --git a/init/.gitignore b/init/.gitignore
new file mode 100644 (file)
index 0000000..904e445
--- /dev/null
@@ -0,0 +1 @@
+udev*.service
similarity index 81%
rename from init/udev-retry.service
rename to init/udev-retry.service.in
index 0792875..b7d5320 100644 (file)
@@ -5,7 +5,7 @@ After=local-fs.target
 [Service]
 Type=finish
 ValidNoProcess=yes
-ExecStart=/sbin/udevadm trigger --type=failed
+ExecStart=@sbindir@/udevadm trigger --type=failed
 
 [Install]
 WantedBy=sysinit.target
similarity index 84%
rename from init/udev-settle.service
rename to init/udev-settle.service.in
index 3c73a96..d13beae 100644 (file)
@@ -5,7 +5,7 @@ After=udev.service
 [Service]
 Type=finish
 ValidNoProcess=yes
-ExecStart=/sbin/udevadm settle
+ExecStart=@sbindir@/udevadm settle
 
 [Install]
 WantedBy=sysinit.target
similarity index 52%
rename from init/udev.service
rename to init/udev.service.in
index f6824a2..a54626d 100644 (file)
@@ -4,9 +4,9 @@ Before=sysinit.target
 
 [Service]
 Type=notify
-ExecStart=/sbin/udevd
-ExecStartPost=/sbin/udevadm trigger --type=subsystems --action=add
-ExecStartPost=/sbin/udevadm trigger --type=devices --action=add
+ExecStart=@sbindir@/udevd
+ExecStartPost=@sbindir@/udevadm trigger --type=subsystems --action=add
+ExecStartPost=@sbindir@/udevadm trigger --type=devices --action=add
 
 [Install]
 WantedBy=sysinit.target