From c4cc627f4d65da8c3b0860c791d9b9687ba8f5d6 Mon Sep 17 00:00:00 2001 From: Jose Dapena Paz Date: Tue, 21 Jun 2022 09:48:36 +0200 Subject: meta-agl-core: add connman-conf dependency After kirkstone, connman has an independent package for its configuration. This package is not added as a dependency. As a consequence, we do not ship /etc/connman/main.conf, that, in AGL builds, is expected to provide a fallback for NTP. This means Raspberry PI4 does not synchronize the clock on boot if connection is available. As a side effect, all SSL connections fail. Bug-AGL: SPEC-4447 Change-Id: Iaa34c0a41cd161b0a0edea7602c39f724831412a Signed-off-by: Jose Dapena Paz Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/27683 Reviewed-by: Marius Vlad Reviewed-by: Jan-Simon Moeller Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account --- .../recipes-connectivity/connman/connman-conf_aglcore.inc | 7 +++++++ .../packagegroups/packagegroup-agl-core-connectivity.bb | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/meta-agl-core/recipes-connectivity/connman/connman-conf_aglcore.inc b/meta-agl-core/recipes-connectivity/connman/connman-conf_aglcore.inc index 4505ab779..30a250e1e 100644 --- a/meta-agl-core/recipes-connectivity/connman/connman-conf_aglcore.inc +++ b/meta-agl-core/recipes-connectivity/connman/connman-conf_aglcore.inc @@ -1,2 +1,9 @@ # Pick up our version of main.conf FILESEXTRAPATHS:prepend := "${THISDIR}/connman-conf:" + +# Upstream connman-conf only installs configuration for qemu targets +# but we need it in all our BSP +do_install:append() { + mkdir -p ${D}${sysconfdir}/connman + cp ${S}/main.conf ${D}${sysconfdir}/connman/main.conf +} diff --git a/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-connectivity.bb b/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-connectivity.bb index 5dd274026..a794d1aae 100644 --- a/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-connectivity.bb +++ b/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-connectivity.bb @@ -12,7 +12,7 @@ ALLOW_EMPTY:${PN} = "1" PKGGROUP_ZEROCONF = "${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'packagegroup-base-zeroconf', '', d)}" RDEPENDS:${PN} += "\ - ${@bb.utils.contains('VIRTUAL-RUNTIME_net_manager','connman','connman connman-client connman-tests \ - connman-tools connman-ncurses' ,'',d)} \ + ${@bb.utils.contains('VIRTUAL-RUNTIME_net_manager','connman','connman connman-client connman-conf \ + connman-tests connman-tools connman-ncurses' ,'',d)} \ ${@bb.utils.contains('AGL_FEATURES', 'agl-devel', '${PKGGROUP_ZEROCONF}', '', d)} \ " -- cgit 1.2.3-korg