From 90e3ad0cb6638721e861ea7bcbfad504b94f9ab8 Mon Sep 17 00:00:00 2001 From: Naoto Yamaguchi Date: Wed, 19 May 2021 08:04:56 +0900 Subject: Remove connman-plugin-session-policy-local A packagegroup-agl-core-connectivity require to connman-plugin-session-policy-local in all case. On the other hand, connman-plugin-session-policy-local is enabled in case of AGL_FEATURES with aglcore. When the meta-agl use without aglcore, building for packagegroup-agl-core-connectivity will fail. This patch remove to connman-plugin-session-policy-local in all case. Because connman-plugin-session-policy-local is not using. Bug-AGL: SPEC-3924 Signed-off-by: Naoto Yamaguchi Change-Id: Icb9d3bca640a93348857e17a195ac6d1a20d30bb Signed-off-by: Naoto Yamaguchi Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/26356 Reviewed-by: Jan-Simon Moeller Tested-by: Jenkins Job builder account --- meta-agl-core/recipes-connectivity/connman/connman_aglcore.inc | 3 --- .../packagegroups/packagegroup-agl-core-connectivity.bb | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'meta-agl-core') diff --git a/meta-agl-core/recipes-connectivity/connman/connman_aglcore.inc b/meta-agl-core/recipes-connectivity/connman/connman_aglcore.inc index f054c10d7..e701630ee 100644 --- a/meta-agl-core/recipes-connectivity/connman/connman_aglcore.inc +++ b/meta-agl-core/recipes-connectivity/connman/connman_aglcore.inc @@ -6,9 +6,6 @@ SRC_URI += "file://0001-disable-when-booting-over-nfs.patch \ FILES_${PN} += "${sysconfdir}/connman/main.conf" -PACKAGECONFIG[session-policy-local] = "--enable-session-policy-local,--disable-session-policy-local," -PACKAGECONFIG_append = " session-policy-local" - do_install_append() { install -d ${D}${sysconfdir}/connman install -m 0644 ${WORKDIR}/main.conf ${D}${sysconfdir}/connman 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 91b52d795..b4fe577a0 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 @@ -13,6 +13,6 @@ PKGGROUP_ZEROCONF = "${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'packag RDEPENDS_${PN} += "\ ${@bb.utils.contains('VIRTUAL-RUNTIME_net_manager','connman','connman connman-client connman-tests \ - connman-tools connman-ncurses connman-plugin-session-policy-local','',d)} \ + connman-tools connman-ncurses' ,'',d)} \ ${@bb.utils.contains('AGL_FEATURES', 'agl-devel', '${PKGGROUP_ZEROCONF}', '', d)} \ " -- cgit 1.2.3-korg