diff options
author | Scott Murray <scott.murray@konsulko.com> | 2024-02-20 15:17:17 -0500 |
---|---|---|
committer | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2024-03-08 18:27:03 +0000 |
commit | 49a85681e52d1f568a5bb6086d7e14af701ac6dc (patch) | |
tree | 70bfa3c2bc1b77ded7d48d84dde1c3b64024696a /recipes-demo/navigation/ondemandnavi_git.bb | |
parent | 3a72cfd21cdd03401ea3208afd721d83c220d3e8 (diff) |
Enable running audio services on host for KVM demo
Changes:
- Add agl-kvm-host-audio feature for configuring other changes.
- Make installation of packagegroup-agl-ivi-service-platform in the
KVM host versus IVI images dependent on the agl-kvm-host-audio
feature. Some recipe dependencies are tweaked by the feature
being specified to avoid accidentally pulling things into the
IVI guest images.
- Add KVM demo specific configuration for applications affected by
running the databroker on the host versus in the IVI guest, and
use it if the agl-kvm-host-kuksa feature is enabled.
Bug-AGL: SPEC-5082
Change-Id: I3a6e6216a90e4d260c20f0b048e6332466aef4ff
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl-demo/+/29702
ci-image-boot-test: Jenkins Job builder account
ci-image-build: Jenkins Job builder account
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Tested-by: Jenkins Job builder account
Diffstat (limited to 'recipes-demo/navigation/ondemandnavi_git.bb')
-rw-r--r-- | recipes-demo/navigation/ondemandnavi_git.bb | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/recipes-demo/navigation/ondemandnavi_git.bb b/recipes-demo/navigation/ondemandnavi_git.bb index 5fa27aa5f..7bfa00078 100644 --- a/recipes-demo/navigation/ondemandnavi_git.bb +++ b/recipes-demo/navigation/ondemandnavi_git.bb @@ -12,13 +12,14 @@ PV = "2.0+git${SRCPV}" SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/ondemandnavi;protocol=https;branch=${AGL_BRANCH} \ file://navigation.conf \ + file://navigation.conf.kvm-demo \ file://navigation.token \ " SRCREV = "d6b883ef6bdb63fb501b03d64c9a32bc29b7b2c7" S = "${WORKDIR}/git" -inherit qmake5 pkgconfig agl-app +inherit qmake5 pkgconfig agl-app update-alternatives AGL_APP_ID = "navigation" AGL_APP_NAME = "Navigation" @@ -32,10 +33,29 @@ do_install:append() { # until a packaging/sandboxing/MAC scheme is (re)implemented or # something like OAuth is plumbed in as an alternative. install -d ${D}${sysconfdir}/xdg/AGL/navigation - install -m 0644 ${WORKDIR}/navigation.conf ${D}${sysconfdir}/xdg/AGL/ + install -m 0644 ${WORKDIR}/navigation.conf ${D}${sysconfdir}/xdg/AGL/navigation.conf.default + install -m 0644 ${WORKDIR}/navigation.conf.kvm-demo ${D}${sysconfdir}/xdg/AGL/ install -m 0644 ${WORKDIR}/navigation.token ${D}${sysconfdir}/xdg/AGL/navigation/ } +ALTERNATIVE_LINK_NAME[navigation.conf] = "${sysconfdir}/xdg/AGL/navigation.conf" + +PACKAGE_BEFORE_PN += "${PN}-conf ${PN}-conf-kvm-demo" + +FILES:${PN}-conf += "${sysconfdir}/xdg/AGL/navigation.conf.default" +RDEPENDS:${PN}-conf = "${PN}" +RPROVIDES:${PN}-conf = "navigation.conf" +RCONFLICTS:${PN}-conf = "${PN}-conf-kvm-demo" +ALTERNATIVE:${PN}-conf = "navigation.conf" +ALTERNATIVE_TARGET_${PN}-conf = "${sysconfdir}/xdg/AGL/navigation.conf.default" + +FILES:${PN}-conf-kvm-demo += "${sysconfdir}/xdg/AGL/navigation.conf.kvm-demo" +RDEPENDS:${PN}-conf-kvm-demo = "${PN}" +RPROVIDES:${PN}-conf-kvm-demo = "navigation.conf" +RCONFLICTS:${PN}-conf-kvm-demo = "${PN}-conf" +ALTERNATIVE:${PN}-conf-kvm-demo = "navigation.conf" +ALTERNATIVE_TARGET_${PN}-conf-kvm-demo = "${sysconfdir}/xdg/AGL/navigation.conf.kvm-demo" + RDEPENDS:${PN} += " \ qtwayland \ qtbase-qmlplugins \ |