From 2dae284c9e4fc4be7dbe846f984ee7cf647c7faf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Wed, 11 Jul 2012 13:47:00 +0200 Subject: [PATCH] ntp: move systemd support to meta-systemd --- meta-oe/recipes-support/ntp/ntp_4.2.6p3.bb | 18 +---------------- .../recipes-support/ntp/ntp}/ntpd.service | 0 .../recipes-support/ntp/ntp}/ntpdate.service | 0 .../recipes-support/ntp/ntp_4.2.6p3.bbappend | 20 +++++++++++++++++++ 4 files changed, 21 insertions(+), 17 deletions(-) rename {meta-oe/recipes-support/ntp/files => meta-systemd/meta-oe/recipes-support/ntp/ntp}/ntpd.service (100%) rename {meta-oe/recipes-support/ntp/files => meta-systemd/meta-oe/recipes-support/ntp/ntp}/ntpdate.service (100%) create mode 100644 meta-systemd/meta-oe/recipes-support/ntp/ntp_4.2.6p3.bbappend 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" diff --git a/meta-oe/recipes-support/ntp/files/ntpd.service b/meta-systemd/meta-oe/recipes-support/ntp/ntp/ntpd.service similarity index 100% rename from meta-oe/recipes-support/ntp/files/ntpd.service rename to meta-systemd/meta-oe/recipes-support/ntp/ntp/ntpd.service diff --git a/meta-oe/recipes-support/ntp/files/ntpdate.service b/meta-systemd/meta-oe/recipes-support/ntp/ntp/ntpdate.service similarity index 100% rename from meta-oe/recipes-support/ntp/files/ntpdate.service rename to meta-systemd/meta-oe/recipes-support/ntp/ntp/ntpdate.service 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 new file mode 100644 index 0000000000..c6cd03147f --- /dev/null +++ b/meta-systemd/meta-oe/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/ +}