Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2025-02-16 15:20:42 +01:00
Code Releases Activity

build: Add support for installing systemd service unit

Browse Source
This commit is contained in:
Marcel Holtmann 2018-02-10 18:42:43 +01:00
parent 90aafba6d4
commit c31244ddec
4 changed files with 50 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -19,6 +19,7 @@ build-aux
autom4te.cache autom4te.cache
ell ell
src/iwd src/iwd
src/iwd.service
client/iwctl client/iwctl
monitor/iwmon monitor/iwmon
tools/hwsim tools/hwsim

25
Makefile.am
View File

@ -64,7 +64,9 @@ ell_sources = ell/ell.h ell/private.h ell/missing.h \
ell_libell_internal_la_SOURCES = $(ell_sources) ell_libell_internal_la_SOURCES = $(ell_sources)
bin_PROGRAMS = src/iwd bin_PROGRAMS =
libexec_PROGRAMS = src/iwd
src_iwd_SOURCES = src/main.c linux/nl80211.h \ src_iwd_SOURCES = src/main.c linux/nl80211.h \
src/netdev.h src/netdev.c \ src/netdev.h src/netdev.c \
@ -104,6 +106,13 @@ src_iwd_SOURCES = src/main.c linux/nl80211.h \
src_iwd_LDADD = ell/libell-internal.la -ldl src_iwd_LDADD = ell/libell-internal.la -ldl
if SYSTEMD_SERVICE
src_iwd_DEPENDENCIES = src/iwd.service
systemd_unitdir = @SYSTEMD_UNITDIR@
systemd_unit_DATA = src/iwd.service
endif
if CLIENT if CLIENT
bin_PROGRAMS += client/iwctl bin_PROGRAMS += client/iwctl
@ -275,11 +284,14 @@ if BUILD_DOCS
dist_man_MANS = $(manual_pages) dist_man_MANS = $(manual_pages)
endif endif
EXTRA_DIST = src/genbuiltin doc/main.conf $(manual_pages:.1=.txt) EXTRA_DIST = src/genbuiltin src/iwd.service.in \
doc/main.conf $(manual_pages:.1=.txt)
AM_CFLAGS = -fvisibility=hidden AM_CFLAGS = -fvisibility=hidden
DISTCHECK_CONFIGURE_FLAGS = --disable-dbus-policy CLEANFILES = src/iwd.service
DISTCHECK_CONFIGURE_FLAGS = --disable-dbus-policy --disable-systemd-service
DISTCLEANFILES = $(BUILT_SOURCES) $(unit_tests) $(manual_pages) DISTCLEANFILES = $(BUILT_SOURCES) $(unit_tests) $(manual_pages)
@ -309,6 +321,13 @@ ell/unit/test_data: Makefile
fi \ fi \
done > $@ done > $@
SED_PROCESS = $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
$(SED) -e 's,@libexecdir\@,$(libexecdir),g' \
< $< > $@
%.service: %.service.in Makefile
$(SED_PROCESS)
%.1: %.txt %.1: %.txt
$(AM_V_GEN)$(A2X) --doctype manpage --format manpage $(srcdir)/$< $(AM_V_GEN)$(A2X) --doctype manpage --format manpage $(srcdir)/$<

18
configure.ac
View File

@ -122,6 +122,24 @@ if (test "${enable_dbus_policy}" != "no" && test -z "${path_dbus_datadir}"); the
fi fi
AC_SUBST(DBUS_DATADIR, [${path_dbus_datadir}]) AC_SUBST(DBUS_DATADIR, [${path_dbus_datadir}])
AC_ARG_ENABLE([systemd-service], AC_HELP_STRING([--disable-systemd-service],
[don't install systemd service file]),
[enable_systemd_service=${enableval}])
AM_CONDITIONAL(SYSTEMD_SERVICE, test "${enable_systemd_service}" != "no")
AC_ARG_WITH([systemd-unitdir], AC_HELP_STRING([--with-systemd-unitdir=DIR],
[path to systemd unit directory]),
[path_systemd_unitdir=${withval}])
if (test "${enable_systemd_service}" != "no" && test -z "${path_systemd_unitdir}"); then
AC_MSG_CHECKING([systemd unit directory])
path_systemd_unitdir="`$PKG_CONFIG --variable=systemdsystemunitdir systemd`"
if (test -z "${path_systemd_unitdir}"); then
AC_MSG_ERROR([systemd unit directory is required])
fi
AC_MSG_RESULT([${path_systemd_unitdir}])
fi
AC_SUBST(SYSTEMD_UNITDIR, [${path_systemd_unitdir}])
AC_ARG_ENABLE([docs], AC_HELP_STRING([--enable-docs], AC_ARG_ENABLE([docs], AC_HELP_STRING([--enable-docs],
[build documentation and manual pages]), [build documentation and manual pages]),
[enable_docs=${enableval}]) [enable_docs=${enableval}])

9
src/iwd.service.in Normal file
View File

@ -0,0 +1,9 @@
[Unit]
Description=Wireless service
[Service]
ExecStart=@libexecdir@/iwd
LimitNPROC=1
[Install]
WantedBy=network-pre.target