make: pre-process and install systemd service files when needed

diff --git a/Makefile.am b/Makefile.am
index 1916770a01fb05783ee05266b2393b5b46015637..198c06c86c5557da8d82e119b2b6a23cd626f3f0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -114,6 +114,13 @@ dist_udevconf_DATA = udev.conf
 sharepkgconfigdir = $(datadir)/pkgconfig
 sharepkgconfig_DATA = udev/udev.pc
 
 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
 sbin_PROGRAMS = \
        udev/udevd \
        udev/udevadm

diff --git a/configure.ac b/configure.ac
index 4bac653b5d1c9d14f7a6c155fddd4bbceb5dc235..255ee18b169783c705790a36fe8d096c0af37712 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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)]),
 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
 OLD_IFS=$IFS
 IFS=:
 for i in $with_firmware_path


@@ -64,6 +63,12 @@ done
 IFS=$OLD_IFS
 AC_SUBST([FIRMWARE_PATH], [$FIRMWARE_PATH])
 
 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])
 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
 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
        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
        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}
 
 
        include_prefix:         ${INCLUDE_PREFIX}
 

+       systemdsystemunitdir:   ${systemdsystemunitdir}
+

        logging:                ${enable_logging}
        debug:                  ${enable_debug}
        selinux:                ${with_selinux}
        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
+++ b/extras/mtd_probe/.gitignore
@@ -0,0 +1 @@
+mtd_probe

diff --git a/init/.gitignore b/init/.gitignore
new file mode 100644 (file)
index 0000000..904e445
--- /dev/null
+++ b/init/.gitignore
@@ -0,0 +1 @@
+udev*.service

diff --git a/init/udev-retry.service b/init/udev-retry.service.in
similarity index 81%
rename from init/udev-retry.service
rename to init/udev-retry.service.in
index 07928751a53d0881036924dd5ab0e05f4ed425ce..b7d5320777d19719fd8e30b7574d58c82a1bf027 100644 (file)
--- a/init/udev-retry.service
+++ b/init/udev-retry.service.in
@@ -5,7 +5,7 @@ After=local-fs.target
 [Service]
 Type=finish
 ValidNoProcess=yes
 [Service]
 Type=finish
 ValidNoProcess=yes

-ExecStart=/sbin/udevadm trigger --type=failed
+ExecStart=@sbindir@/udevadm trigger --type=failed

 
 [Install]
 WantedBy=sysinit.target
 
 [Install]
 WantedBy=sysinit.target

diff --git a/init/udev-settle.service b/init/udev-settle.service.in
similarity index 84%
rename from init/udev-settle.service
rename to init/udev-settle.service.in
index 3c73a96d9f1ec9521a47d93d985252a89e4bdb32..d13beae6c2479ef822fc7619616bc33d2ffaa24d 100644 (file)
--- a/init/udev-settle.service
+++ b/init/udev-settle.service.in
@@ -5,7 +5,7 @@ After=udev.service
 [Service]
 Type=finish
 ValidNoProcess=yes
 [Service]
 Type=finish
 ValidNoProcess=yes

-ExecStart=/sbin/udevadm settle
+ExecStart=@sbindir@/udevadm settle

 
 [Install]
 WantedBy=sysinit.target
 
 [Install]
 WantedBy=sysinit.target

diff --git a/init/udev.service b/init/udev.service.in
similarity index 52%
rename from init/udev.service
rename to init/udev.service.in
index f6824a200220c957b8dcc345e9648a0e2ee90365..a54626df50cf7802159a0f666c1df7ee8a2dd3d8 100644 (file)
--- a/init/udev.service
+++ b/init/udev.service.in
@@ -4,9 +4,9 @@ Before=sysinit.target
 
 [Service]
 Type=notify
 
 [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
 
 [Install]
 WantedBy=sysinit.target