aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-demo
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2024-05-27 12:30:46 -0400
committerScott Murray <scott.murray@konsulko.com>2024-05-28 11:59:42 +0000
commit4b8b02313c32a5ca8d5ba6d514f45a64cd48d91d (patch)
tree34e2f81589dda7566f1019b15542ef96d36d53ca /recipes-demo
parent6a26854a201d79aed700b4c1647197a9cc7b4ca9 (diff)
Add preconfigured demo control panel images
Changes: - Add kuksa-dbc-feeder configuration package for the gateway flavor of the control panel image. - Split out the agl-demo-control-panel configuration into a separate package, and add alternative versions for running against the regular and gateway versions of the full demo. - Add -preconfigured and -preconfigured-gateway flavors of the agl-ivi-demo-control-panel image that add the appropriate tweaks to support the full demo setups. Bug-AGL: SPEC-5107, SPEC-5138 Change-Id: I290d08c0f7234f951b822b161bce8166fb62d346 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl-demo/+/29924 Tested-by: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account ci-image-build: Jenkins Job builder account
Diffstat (limited to 'recipes-demo')
-rw-r--r--recipes-demo/agl-demo-control-panel/agl-demo-control-panel_git.bb42
1 files changed, 34 insertions, 8 deletions
diff --git a/recipes-demo/agl-demo-control-panel/agl-demo-control-panel_git.bb b/recipes-demo/agl-demo-control-panel/agl-demo-control-panel_git.bb
index f75a37473..06eae1809 100644
--- a/recipes-demo/agl-demo-control-panel/agl-demo-control-panel_git.bb
+++ b/recipes-demo/agl-demo-control-panel/agl-demo-control-panel_git.bb
@@ -11,9 +11,7 @@ SRCREV = "31573c88e0ddefc3591bb7752b306601554ebbf2"
S = "${WORKDIR}/git"
-inherit systemd allarch
-
-require recipes-config/agl-users/agl-users.inc
+inherit systemd allarch update-alternatives
SYSTEMD_SERVICE:${PN} = "${BPN}.service"
@@ -33,10 +31,14 @@ do_install() {
install -D -m 0644 ${WORKDIR}/${BPN}.service ${D}${systemd_system_unitdir}/${BPN}.service
# Install conf file
- install -d ${D}/home/agl-driver/.local/share/agl-demo-control-panel
- sed 's/=user-session/=AGL-databroker/' ${S}/extras/config.ini > \
- ${D}/home/agl-driver/.local/share/agl-demo-control-panel/config.ini
- chown -R agl-driver:agl-driver ${D}/home/agl-driver
+ install -d ${D}${sysconfdir}/agl-demo-control-panel
+ install -m 0644 ${S}/extras/config.ini ${D}${sysconfdir}/agl-demo-control-panel/config.ini.default
+ sed 's/ip = localhost/ip = 192.168.10.2/' ${S}/extras/config.ini > \
+ ${D}${sysconfdir}/agl-demo-control-panel/config.ini.demo
+ sed -e 's/hvac-enabled = true/hvac-enabled = false/' \
+ -e 's/steering-wheel-enabled = true/steering-wheel-enabled = false/' \
+ ${S}/extras/config.ini > \
+ ${D}${sysconfdir}/agl-demo-control-panel/config.ini.gateway-demo
}
# For now generate resource wrapper on first boot, as it looks non-trivial
@@ -46,9 +48,10 @@ pkg_postinst_ontarget:${PN} () {
true
}
-FILES:${PN} += "/home/agl-driver"
+ALTERNATIVE_LINK_NAME[agl-demo-control-panel.ini] = "${sysconfdir}/agl-demo-control-panel/config.ini"
RDEPENDS:${PN} += " \
+ ${PN}-conf \
python3 \
python3-modules \
python3-packaging \
@@ -57,3 +60,26 @@ RDEPENDS:${PN} += " \
agl-users \
weston \
"
+
+PACKAGE_BEFORE_PN += "${PN}-conf"
+FILES:${PN}-conf += "${sysconfdir}/agl-demo-control-panel/config.ini.default"
+RDEPENDS:${PN}-conf = "${PN}"
+RPROVIDES:${PN}-conf = "agl-demo-control-panel.ini"
+ALTERNATIVE:${PN}-conf = "agl-demo-control-panel.ini"
+ALTERNATIVE_TARGET_${PN}-conf = "${sysconfdir}/agl-demo-control-panel/config.ini.default"
+
+PACKAGE_BEFORE_PN += "${PN}-conf-demo"
+FILES:${PN}-conf-demo += "${sysconfdir}/agl-demo-control-panel/config.ini.demo"
+RDEPENDS:${PN}-conf-demo = "${PN}"
+RPROVIDES:${PN}-conf-demo = "agl-demo-control-panel.ini"
+ALTERNATIVE:${PN}-conf-demo = "agl-demo-control-panel.ini"
+ALTERNATIVE_TARGET_${PN}-conf-demo = "${sysconfdir}/agl-demo-control-panel/config.ini.demo"
+ALTERNATIVE_PRIORITY_${PN}-conf-demo = "20"
+
+PACKAGE_BEFORE_PN += "${PN}-conf-gateway-demo"
+FILES:${PN}-conf-gateway-demo += "${sysconfdir}/agl-demo-control-panel/config.ini.gateway-demo"
+RDEPENDS:${PN}-conf-gateway-demo = "${PN}"
+RPROVIDES:${PN}-conf-gateway-demo = "agl-demo-control-panel.ini"
+ALTERNATIVE:${PN}-conf-gateway-demo = "agl-demo-control-panel.ini"
+ALTERNATIVE_TARGET_${PN}-conf-gateway-demo = "${sysconfdir}/agl-demo-control-panel/config.ini.gateway-demo"
+ALTERNATIVE_PRIORITY_${PN}-conf-gateway-demo = "30"