diff options
| author |   Andreas Müller <schnitzeltony@googlemail.com> | 2012-07-11 13:47:00 +0200 |
|---|---|---|
| committer |   Koen Kooi <koen@dominion.thruhere.net> | 2012-07-16 09:39:06 +0200 |
| commit | 2dae284c9e4fc4be7dbe846f984ee7cf647c7faf (patch) | |
| tree | b5158fad04acb4c0663ef29f8fb5de8d34b759a6 /meta-oe/recipes-support/ntp | |
| parent | 326e027816d7af4d4896e9e6d74842aa327352e0 (diff) | |
| download | meta-openembedded-2dae284c9e4fc4be7dbe846f984ee7cf647c7faf.tar.gz | |
ntp: move systemd support to meta-systemd
Diffstat (limited to 'meta-oe/recipes-support/ntp')
| -rw-r--r-- | meta-oe/recipes-support/ntp/files/ntpd.service | 11 | ||||
| -rw-r--r-- | meta-oe/recipes-support/ntp/files/ntpdate.service | 11 | ||||
| -rw-r--r-- | meta-oe/recipes-support/ntp/ntp_4.2.6p3.bb | 18 |
3 files changed, 1 insertions, 39 deletions
diff --git a/meta-oe/recipes-support/ntp/files/ntpd.service b/meta-oe/recipes-support/ntp/files/ntpd.service deleted file mode 100644 index bd87b1ea24..0000000000 --- a/meta-oe/recipes-support/ntp/files/ntpd.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Network Time Service -After=network.target - -[Service] -Type=forking -PIDFile=/run/ntpd.pid -ExecStart=/usr/bin/ntpd -p /run/ntpd.pid - -[Install] -WantedBy=multi-user.target diff --git a/meta-oe/recipes-support/ntp/files/ntpdate.service b/meta-oe/recipes-support/ntp/files/ntpdate.service deleted file mode 100644 index b2bc632069..0000000000 --- a/meta-oe/recipes-support/ntp/files/ntpdate.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Network Time Service (one-shot ntpdate mode) -Before=ntpd.service - -[Service] -Type=oneshot -ExecStart=/usr/bin/ntpd -q -g -x -RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target diff --git a/meta-oe/recipes-support/ntp/ntp_4.2.6p3.bb b/meta-oe/recipes-support/ntp/ntp_4.2.6p3.bb index a3d719e30b..89a272a361 100644 --- a/meta-oe/recipes-support/ntp/ntp_4.2.6p3.bb +++ b/meta-oe/recipes-support/ntp/ntp_4.2.6p3.bb @@ -1,11 +1,6 @@ require ntp.inc -PR = "r5" - -inherit systemd - -SYSTEMD_PACKAGES = "${PN}-systemd" -SYSTEMD_SERVICE_${PN}-systemd = "ntpd.service" +PR = "r6" SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-${PV}.tar.gz \ file://tickadj.c.patch \ @@ -13,8 +8,6 @@ SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-${PV}.tar.g file://ntpd \ file://ntp.conf \ file://ntpdate \ - file://ntpdate.service \ - file://ntpd.service \ " SRC_URI[md5sum] = "59876a9009b098ff59767ee45a88ebd2" @@ -28,17 +21,8 @@ do_install_append() { install -m 755 ${WORKDIR}/ntpd ${D}/${sysconfdir}/init.d install -d ${D}/${sysconfdir}/network/if-up.d install -m 755 ${WORKDIR}/ntpdate ${D}/${sysconfdir}/network/if-up.d - - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/ntpdate.service ${D}${systemd_unitdir}/system/ - install -m 0644 ${WORKDIR}/ntpd.service ${D}${systemd_unitdir}/system/ } -PACKAGES =+ "${PN}-systemd" - -FILES_${PN}-systemd = "${systemd_unitdir}/system/" -RDEPENDS_${PN}-systemd = "${PN}" - FILES_${PN}-bin = "${bindir}/ntp-wait ${bindir}/ntpdc ${bindir}/ntpq ${bindir}/ntptime ${bindir}/ntptrace" FILES_${PN} = "${bindir}/ntpd ${sysconfdir}/ntp.conf ${sysconfdir}/init.d/ntpd" FILES_${PN}-tickadj = "${bindir}/tickadj" |