Additionaly ntpdate.service was moved to a new package ntpdate-systemd
Signed-off-by: Andreas Müller <[email protected]>
---
meta-oe/recipes-support/ntp/ntp_4.2.6p3.bb | 17 +---------------
.../meta-oe/recipes-support/ntp/ntp}/ntpd.service | 0
.../recipes-support/ntp/ntp}/ntpdate.service | 0
.../recipes-support/ntp/ntp_4.2.6p3.bbappend | 21 ++++++++++++++++++++
4 files changed, 22 insertions(+), 16 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 ece8720..7c26e94 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/${P}.tar.gz \
file://tickadj.c.patch \
@@ -13,8 +8,6 @@ SRC_URI =
"http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${P}.tar.gz \
file://ntpd \
file://ntp.conf \
file://ntpdate \
- file://ntpdate.service \
- file://ntpd.service \
"
SRC_URI[md5sum] = "59876a9009b098ff59767ee45a88ebd2"
@@ -29,16 +22,8 @@ do_install_append() {
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 0000000..a53d5bb
--- /dev/null
+++ b/meta-systemd/meta-oe/recipes-support/ntp/ntp_4.2.6p3.bbappend
@@ -0,0 +1,21 @@
+inherit systemd
+
+PRINC := "${@int(PRINC) + 1}"
+
+# look for files in the layer first
+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/
+}
--
1.7.4.4
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
