diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-13 13:45:37 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-15 16:22:03 +0200 |
commit | 4188d725513fb660348df16c290618dd0e6198ba (patch) | |
tree | ec2b40788f77222c04eb1124afcccb6af74a5ee3 | |
parent | 9858cfdb4868ba7ed90d8e46784b7723c30e12c1 (diff) | |
download | meta-openembedded-4188d725513fb660348df16c290618dd0e6198ba.tar.gz |
ntp: move systemd support from meta-systemd back to meta-networking
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r-- | meta-networking/recipes-support/ntp/ntp.inc | 29 | ||||
-rw-r--r-- | meta-networking/recipes-support/ntp/ntp/ntpd.service (renamed from meta-systemd/meta-networking/recipes-support/ntp/ntp/ntpd.service) | 0 | ||||
-rw-r--r-- | meta-networking/recipes-support/ntp/ntp/ntpdate.service (renamed from meta-systemd/meta-networking/recipes-support/ntp/ntp/ntpdate.service) | 0 | ||||
-rw-r--r-- | meta-networking/recipes-support/ntp/ntp_4.2.6p5.bb | 1 | ||||
-rw-r--r-- | meta-systemd/meta-networking/recipes-support/ntp/ntp_4.2.6p5.bbappend | 28 |
5 files changed, 26 insertions, 32 deletions
diff --git a/meta-networking/recipes-support/ntp/ntp.inc b/meta-networking/recipes-support/ntp/ntp.inc index d93f22d473..3f53fffa3e 100644 --- a/meta-networking/recipes-support/ntp/ntp.inc +++ b/meta-networking/recipes-support/ntp/ntp.inc @@ -8,7 +8,7 @@ SECTION = "console/network" LICENSE = "NTP" LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=fea4b50c33b18c2194b4b1c9ca512670" -INC_PR = "r3" +INC_PR = "r6" SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-${PV}.tar.gz \ file://tickadj.c.patch \ @@ -18,9 +18,11 @@ SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-${PV}.tar.g file://ntp.conf \ file://ntpdate \ file://ntpdate.default \ + file://ntpdate.service \ + file://ntpd.service \ " -inherit autotools update-rc.d +inherit autotools update-rc.d systemd # The ac_cv_header_readline_history is to stop ntpdc depending on either # readline or curses @@ -52,6 +54,10 @@ do_install_append() { install -m 644 ${WORKDIR}/ntpdate.default ${D}${sysconfdir}/default/ntpdate install -d ${D}/${sysconfdir}/network/if-up.d ln -s ${bindir}/ntpdate-sync ${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 += "ntpdate ${PN}-tickadj ${PN}-utils" @@ -65,12 +71,29 @@ RPROVIDES_${PN}-utils = "${PN}-bin" RREPLACES_${PN}-utils = "${PN}-bin" RCONFLICTS_${PN}-utils = "${PN}-bin" +SYSTEMD_PACKAGES = "${PN} ntpdate" +SYSTEMD_SERVICE_${PN} = "ntpd.service" +SYSTEMD_SERVICE_ntpdate = "ntpdate.service" + +RPROVIDES_${PN} += "${PN}-systemd" +RREPLACES_${PN} += "${PN}-systemd" +RCONFLICTS_${PN} += "${PN}-systemd" + +RPROVIDES_ntpdate += "ntpdate-systemd" +RREPLACES_ntpdate += "ntpdate-systemd" +RCONFLICTS_ntpdate += "ntpdate-systemd" + RSUGGESTS_${PN} = "iana-etc" FILES_${PN} = "${bindir}/ntpd ${sysconfdir}/ntp.conf ${sysconfdir}/init.d/ntpd ${sbindir} ${libdir}" FILES_${PN}-tickadj = "${bindir}/tickadj" FILES_${PN}-utils = "${bindir}" -FILES_ntpdate = "${bindir}/ntpdate ${sysconfdir}/network/if-up.d/ntpdate-sync ${bindir}/ntpdate-sync ${sysconfdir}/default/ntpdate" +FILES_ntpdate = "${bindir}/ntpdate \ + ${sysconfdir}/network/if-up.d/ntpdate-sync \ + ${bindir}/ntpdate-sync \ + ${sysconfdir}/default/ntpdate \ + ${systemd_unitdir}/system/ntpdate.service \ +" CONFFILES_${PN} = "${sysconfdir}/ntp.conf" CONFFILES_ntpdate = "${sysconfdir}/default/ntpdate" diff --git a/meta-systemd/meta-networking/recipes-support/ntp/ntp/ntpd.service b/meta-networking/recipes-support/ntp/ntp/ntpd.service index bd87b1ea24..bd87b1ea24 100644 --- a/meta-systemd/meta-networking/recipes-support/ntp/ntp/ntpd.service +++ b/meta-networking/recipes-support/ntp/ntp/ntpd.service diff --git a/meta-systemd/meta-networking/recipes-support/ntp/ntp/ntpdate.service b/meta-networking/recipes-support/ntp/ntp/ntpdate.service index 10cbd70f99..10cbd70f99 100644 --- a/meta-systemd/meta-networking/recipes-support/ntp/ntp/ntpdate.service +++ b/meta-networking/recipes-support/ntp/ntp/ntpdate.service diff --git a/meta-networking/recipes-support/ntp/ntp_4.2.6p5.bb b/meta-networking/recipes-support/ntp/ntp_4.2.6p5.bb index f1e9ecd7a8..588a1b03c9 100644 --- a/meta-networking/recipes-support/ntp/ntp_4.2.6p5.bb +++ b/meta-networking/recipes-support/ntp/ntp_4.2.6p5.bb @@ -4,4 +4,3 @@ PR = "${INC_PR}.0" SRC_URI[md5sum] = "00df80a84ec9528fcfb09498075525bc" SRC_URI[sha256sum] = "d6ab8371f9d31e594eb6922823d5ccd03dcc4e9d84b0e23ea25ac1405432f91c" - diff --git a/meta-systemd/meta-networking/recipes-support/ntp/ntp_4.2.6p5.bbappend b/meta-systemd/meta-networking/recipes-support/ntp/ntp_4.2.6p5.bbappend deleted file mode 100644 index 7f2a796168..0000000000 --- a/meta-systemd/meta-networking/recipes-support/ntp/ntp_4.2.6p5.bbappend +++ /dev/null @@ -1,28 +0,0 @@ -inherit systemd - -PRINC := "${@int(PRINC) + 2}" - -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SYSTEMD_PACKAGES = "${PN} ntpdate" -SYSTEMD_SERVICE_${PN} = "ntpd.service" -SYSTEMD_SERVICE_ntpdate = "ntpdate.service" -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -RCONFLICTS_${PN} += "${PN}-systemd" -RPROVIDES_ntpdate += "ntpdate-systemd" -RREPLACES_ntpdate += "ntpdate-systemd" -RCONFLICTS_ntpdate += "ntpdate-systemd" - -FILES_ntpdate += "${systemd_unitdir}/system/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/ -} |