shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-23 21:35:11 +03:00
Code

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

Browse Source
This commit is contained in:
Kay Sievers 2010-06-25 10:30:55 +02:00
parent 43fefbf6f1
commit 08b4c88353
7 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile.am
View 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

16
configure.ac
View 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}

1
extras/mtd_probe/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
mtd_probe

1
init/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
udev*.service

2
init/udev-retry.service → init/udev-retry.service.in
View 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

2
init/udev-settle.service → init/udev-settle.service.in
View 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

6
init/udev.service → init/udev.service.in
View 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