From 870a3169d62e3b72d4baf3923b94b56c3deb71ae Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Wed, 23 Apr 2014 17:40:52 +0800 Subject: ppp: add systemd support Add systemd support for ppp. The unit file mostly comes from ArchLinux. (From OE-Core rev: e84f7ea24b08e3127b70731908b819fbdc1cbfd5) Signed-off-by: Chen Qi Signed-off-by: Richard Purdie --- meta/recipes-connectivity/ppp/ppp/ppp@.service | 9 +++++++++ meta/recipes-connectivity/ppp/ppp_2.4.6.bb | 9 +++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-connectivity/ppp/ppp/ppp@.service (limited to 'meta/recipes-connectivity/ppp') diff --git a/meta/recipes-connectivity/ppp/ppp/ppp@.service b/meta/recipes-connectivity/ppp/ppp/ppp@.service new file mode 100644 index 0000000000..2bf0b5e347 --- /dev/null +++ b/meta/recipes-connectivity/ppp/ppp/ppp@.service @@ -0,0 +1,9 @@ +[Unit] +Description=PPP link to %I +Before=network.target + +[Service] +ExecStart=@SBINDIR@/pppd call %I nodetach nolog + +[Install] +WantedBy=multi-user.target diff --git a/meta/recipes-connectivity/ppp/ppp_2.4.6.bb b/meta/recipes-connectivity/ppp/ppp_2.4.6.bb index b98abecd3a..8bc3672600 100644 --- a/meta/recipes-connectivity/ppp/ppp_2.4.6.bb +++ b/meta/recipes-connectivity/ppp/ppp_2.4.6.bb @@ -28,12 +28,13 @@ SRC_URI = "http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \ file://ppp_on_boot \ file://provider \ file://0001-ppp-Fix-compilation-errors-in-Makefile.patch \ + file://ppp@.service \ " SRC_URI[md5sum] = "3434d2cc9327167a0723aaaa8670083b" SRC_URI[sha256sum] = "1b33181a03962c8a092c055fb9980e9722728a8d98a4bb7ec7acda17c1b1b49d" -inherit autotools-brokensep +inherit autotools-brokensep systemd TARGET_CC_ARCH += " ${LDFLAGS}" EXTRA_OEMAKE = "STRIPPROG=${STRIP} MANDIR=${D}${datadir}/man/man8 INCDIR=${D}${includedir} LIBDIR=${D}${libdir}/pppd/${PV} BINDIR=${D}${sbindir}" @@ -61,13 +62,17 @@ do_install_append () { install -m 0755 ${WORKDIR}/pap ${D}${sysconfdir}/chatscripts install -m 0755 ${WORKDIR}/ppp_on_boot ${D}${sysconfdir}/ppp/ppp_on_boot install -m 0755 ${WORKDIR}/provider ${D}${sysconfdir}/ppp/peers/provider + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/ppp@.service ${D}${systemd_unitdir}/system + sed -i -e 's,@SBINDIR@,${sbindir},g' \ + ${D}${systemd_unitdir}/system/ppp@.service rm -rf ${D}/${mandir}/man8/man8 chmod u+s ${D}${sbindir}/pppd } CONFFILES_${PN} = "${sysconfdir}/ppp/pap-secrets ${sysconfdir}/ppp/chap-secrets ${sysconfdir}/ppp/options" PACKAGES =+ "${PN}-oa ${PN}-oe ${PN}-radius ${PN}-winbind ${PN}-minconn ${PN}-password ${PN}-l2tp ${PN}-tools" -FILES_${PN} = "${sysconfdir} ${bindir} ${sbindir}/chat ${sbindir}/pppd" +FILES_${PN} = "${sysconfdir} ${bindir} ${sbindir}/chat ${sbindir}/pppd ${systemd_unitdir}/system/ppp@.service" FILES_${PN}-dbg += "${libdir}/pppd/${PV}/.debug" FILES_${PN}-oa = "${libdir}/pppd/${PV}/pppoatm.so" FILES_${PN}-oe = "${sbindir}/pppoe-discovery ${libdir}/pppd/${PV}/rp-pppoe.so" -- cgit v1.2.3-54-g00ecf