From 6d6dae7d14c5f20a62298dea9159725e57177dd2 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Wed, 31 Oct 2012 09:08:24 -0200 Subject: meta-systemd: Move ntp recipes to 'meta-networking' sublayer MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Otavio Salvador Signed-off-by: Eric Bénard --- .../recipes-support/ntp/ntp/ntpd.service | 11 +++++++++++ .../recipes-support/ntp/ntp/ntpdate.service | 11 +++++++++++ .../recipes-support/ntp/ntp_4.2.6p3.bbappend | 20 ++++++++++++++++++++ .../meta-oe/recipes-support/ntp/ntp/ntpd.service | 11 ----------- .../meta-oe/recipes-support/ntp/ntp/ntpdate.service | 11 ----------- .../meta-oe/recipes-support/ntp/ntp_4.2.6p3.bbappend | 20 -------------------- 6 files changed, 42 insertions(+), 42 deletions(-) create mode 100644 meta-systemd/meta-networking/recipes-support/ntp/ntp/ntpd.service create mode 100644 meta-systemd/meta-networking/recipes-support/ntp/ntp/ntpdate.service create mode 100644 meta-systemd/meta-networking/recipes-support/ntp/ntp_4.2.6p3.bbappend delete mode 100644 meta-systemd/meta-oe/recipes-support/ntp/ntp/ntpd.service delete mode 100644 meta-systemd/meta-oe/recipes-support/ntp/ntp/ntpdate.service delete mode 100644 meta-systemd/meta-oe/recipes-support/ntp/ntp_4.2.6p3.bbappend diff --git a/meta-systemd/meta-networking/recipes-support/ntp/ntp/ntpd.service b/meta-systemd/meta-networking/recipes-support/ntp/ntp/ntpd.service new file mode 100644 index 0000000000..bd87b1ea24 --- /dev/null +++ b/meta-systemd/meta-networking/recipes-support/ntp/ntp/ntpd.service @@ -0,0 +1,11 @@ +[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-systemd/meta-networking/recipes-support/ntp/ntp/ntpdate.service b/meta-systemd/meta-networking/recipes-support/ntp/ntp/ntpdate.service new file mode 100644 index 0000000000..b2bc632069 --- /dev/null +++ b/meta-systemd/meta-networking/recipes-support/ntp/ntp/ntpdate.service @@ -0,0 +1,11 @@ +[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-systemd/meta-networking/recipes-support/ntp/ntp_4.2.6p3.bbappend b/meta-systemd/meta-networking/recipes-support/ntp/ntp_4.2.6p3.bbappend new file mode 100644 index 0000000000..c6cd03147f --- /dev/null +++ b/meta-systemd/meta-networking/recipes-support/ntp/ntp_4.2.6p3.bbappend @@ -0,0 +1,20 @@ +inherit systemd + +PRINC := "${@int(PRINC) + 1}" + +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SYSTEMD_PACKAGES = "${PN}-systemd ntpdate-systemd" +SYSTEMD_SERVICE_${PN}-systemd = "ntpd.service" +SYSTEMD_SERVICE_ntpdate-systemd = "ntpdate.service" + +SRC_URI += " \ + file://ntpdate.service \ + file://ntpd.service \ +" + +do_install_append() { + 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/ +} diff --git a/meta-systemd/meta-oe/recipes-support/ntp/ntp/ntpd.service b/meta-systemd/meta-oe/recipes-support/ntp/ntp/ntpd.service deleted file mode 100644 index bd87b1ea24..0000000000 --- a/meta-systemd/meta-oe/recipes-support/ntp/ntp/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-systemd/meta-oe/recipes-support/ntp/ntp/ntpdate.service b/meta-systemd/meta-oe/recipes-support/ntp/ntp/ntpdate.service deleted file mode 100644 index b2bc632069..0000000000 --- a/meta-systemd/meta-oe/recipes-support/ntp/ntp/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-systemd/meta-oe/recipes-support/ntp/ntp_4.2.6p3.bbappend b/meta-systemd/meta-oe/recipes-support/ntp/ntp_4.2.6p3.bbappend deleted file mode 100644 index c6cd03147f..0000000000 --- a/meta-systemd/meta-oe/recipes-support/ntp/ntp_4.2.6p3.bbappend +++ /dev/null @@ -1,20 +0,0 @@ -inherit systemd - -PRINC := "${@int(PRINC) + 1}" - -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SYSTEMD_PACKAGES = "${PN}-systemd ntpdate-systemd" -SYSTEMD_SERVICE_${PN}-systemd = "ntpd.service" -SYSTEMD_SERVICE_ntpdate-systemd = "ntpdate.service" - -SRC_URI += " \ - file://ntpdate.service \ - file://ntpd.service \ -" - -do_install_append() { - 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/ -} -- cgit v1.2.3-54-g00ecf