Enable systemd-timesyncd in case of using systemd-networkd

At SPEC-737, systemd-timesyncd was disabled every case.  It causes
NTP capability lost in case of using systemd-networkd.

This patch enable systemd-timesyncd in guest environment.

Bug-AGL: SPEC-5274

Change-Id: I2c4f48bd67aa800c87ec37e2f494538b9f5a23c4
Signed-off-by: Naoto Yamaguchi <naoto.yamaguchi@aisin.co.jp>

diff --git a/meta-agl-ic-container/recipes-core/systemd/systemd-timesyncd-guest/timesyncd-run-guest.conf b/meta-agl-ic-container/recipes-core/systemd/systemd-timesyncd-guest/timesyncd-run-guest.conf
new file mode 100644 (file)
index 0000000..9a5cd62
--- /dev/null
+++ b/meta-agl-ic-container/recipes-core/systemd/systemd-timesyncd-guest/timesyncd-run-guest.conf
@@ -0,0 +1,2 @@
+[Unit]
+ConditionVirtualization=

diff --git a/meta-agl-ic-container/recipes-core/systemd/systemd-timesyncd-guest_1.0.bb b/meta-agl-ic-container/recipes-core/systemd/systemd-timesyncd-guest_1.0.bb
new file mode 100644 (file)
index 0000000..e8ec650
--- /dev/null
+++ b/meta-agl-ic-container/recipes-core/systemd/systemd-timesyncd-guest_1.0.bb
@@ -0,0 +1,17 @@
+SUMMARY     = "Container guest configuration for systemd-timesyncd."
+DESCRIPTION = "Container guest configuration for systemd-timesyncd. \
+               It enables systemd-timesyncd in container guest."
+LICENSE = "MIT"
+SRC_URI = " \
+    file://timesyncd-run-guest.conf \
+    "
+
+do_install() {
+    install -D -m644 ${WORKDIR}/timesyncd-run-guest.conf ${D}/${systemd_system_unitdir}/systemd-timesyncd.service.d/timesyncd-run-guest.conf
+}
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+FILES:${PN} = "\
+    ${systemd_system_unitdir}/systemd-timesyncd.service.d/* \
+"

diff --git a/meta-agl-ic-container/recipes-platform/images/guest-image-ivi-demo.bb b/meta-agl-ic-container/recipes-platform/images/guest-image-ivi-demo.bb
index f9dbabd..c23748d 100644 (file)
--- a/meta-agl-ic-container/recipes-platform/images/guest-image-ivi-demo.bb
+++ b/meta-agl-ic-container/recipes-platform/images/guest-image-ivi-demo.bb
@@ -10,7 +10,6 @@ IMAGE_INSTALL += " \
     mominavi \
     momiplay \
     momiweather \
-    chrony \
     systemd-netif-config \
     ttf-dejavu-sans \
     ttf-dejavu-sans-mono \

diff --git a/meta-agl-ic-container/recipes-platform/images/guest-image-minimal.bb b/meta-agl-ic-container/recipes-platform/images/guest-image-minimal.bb
index 8dcdb3f..0a7eeb1 100644 (file)
--- a/meta-agl-ic-container/recipes-platform/images/guest-image-minimal.bb
+++ b/meta-agl-ic-container/recipes-platform/images/guest-image-minimal.bb
@@ -6,6 +6,7 @@ IMAGE_ROOTFS_EXTRA_SPACE:append = "${@bb.utils.contains("DISTRO_FEATURES", "syst
 
 IMAGE_INSTALL += " \
     packagegroup-agl-container-feature-logging-guest \
+    ${@bb.utils.contains('VIRTUAL-RUNTIME_net_manager', 'systemd', 'systemd-timesyncd-guest', '', d)} \
 "
 
 FEATURE_PACKAGES_selinux:remove = " \