From bff7fe2541c525c46d5df9f6281bacc6ab5d8624 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Mon, 25 Sep 2023 10:45:08 -0400 Subject: flutter-cluster-dashboard: update SRCREV Update flutter-clutter-dashboard SRCREV to pick up KUKSA.val databroker gRPC API changes, update its YAML configuration files to match, and add the JWT authorization token the configuration requires. Bug-AGL: SPEC-4762 Change-Id: I294b1b26e596fe650d194dca78adde7394d30d75 Signed-off-by: Scott Murray Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl-demo/+/29244 Reviewed-by: Jan-Simon Moeller Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account --- .../files/cluster-dashboard.token | 1 + .../files/cluster-dashboard.yaml | 2 ++ .../files/cluster-dashboard.yaml.demo | 3 ++ .../flutter-cluster-dashboard_git.bb | 41 ++++++++++------------ 4 files changed, 25 insertions(+), 22 deletions(-) create mode 100644 recipes-demo/flutter-cluster-dashboard/files/cluster-dashboard.token create mode 100644 recipes-demo/flutter-cluster-dashboard/files/cluster-dashboard.yaml create mode 100644 recipes-demo/flutter-cluster-dashboard/files/cluster-dashboard.yaml.demo diff --git a/recipes-demo/flutter-cluster-dashboard/files/cluster-dashboard.token b/recipes-demo/flutter-cluster-dashboard/files/cluster-dashboard.token new file mode 100644 index 000000000..10fafb537 --- /dev/null +++ b/recipes-demo/flutter-cluster-dashboard/files/cluster-dashboard.token @@ -0,0 +1 @@ +eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJzdWIiOiJsb2NhbCBkZXYiLCJpc3MiOiJjcmVhdGVUb2tlbi5weSIsImF1ZCI6WyJrdWtzYS52YWwiXSwiaWF0IjoxNTE2MjM5MDIyLCJleHAiOjE3NjcyMjU1OTksInNjb3BlIjoicmVhZCJ9.P6tJPRSJWB51UOFDFs8qQ-lGqb1NoWgCekHUKyMiYcs8sR3FGVKSRjSkcqv1tXOlILvqhUwyuTKui25_kFKkTPv47GI0xAqcXtaTmDwHAWZHFC6HWGWGXohu7XvURrim5kMRVHy_VGlzasGgVap0JFk3wmaY-nyFYL_PLDjvGjIQuOwFiUtKK1PfiKviZKyc5EzPUEAoHxFL_BSOsTdDDcaydFe9rSKJzpYrj7qXY0hMJCje2BUGlSUIttR95aSjOZflSxiGystWHME8fKMmDERAx749Jpt37M3taCxBsUzER5olPz65MGzFSikfC-jH_KGmJ4zNYS65_OM1a-CPfW7Ts__pyAXxFULNMHRMIfh8Wiig4UcooMy_ZJO_DN2rq95XdaBbzRua5mxvO2wM6iu5kv4lhNxhjVNGuWFRLLJ_icBUZlvAuC3eqp66B-Y3jJNI0cSnIvsVX8YFVS3ebW8tf40OdeVou8fWZPcQsFAAafBhIxNOW8FbLZ9sRvQ-FGwZy-GyF52IJ5ZKeGfAkeEh9ZLIcyJ2YlGp4q0EOKIdwIBsWfCFtZbAvi2ornO3XvJm94NBqprpvQYN_IB7yyRxDduLjNKqqcFqnrlWYI-ZhvghWH2rEblplgHZdyVD1G9Mbv0_zdNTKFs6J7IP96aV6-4hBOt3kROlS1G7ObA \ No newline at end of file diff --git a/recipes-demo/flutter-cluster-dashboard/files/cluster-dashboard.yaml b/recipes-demo/flutter-cluster-dashboard/files/cluster-dashboard.yaml new file mode 100644 index 000000000..0a1156455 --- /dev/null +++ b/recipes-demo/flutter-cluster-dashboard/files/cluster-dashboard.yaml @@ -0,0 +1,2 @@ +authorization : "/etc/xdg/AGL/cluster-dashboard/cluster-dashboard.token" +use-tls : true diff --git a/recipes-demo/flutter-cluster-dashboard/files/cluster-dashboard.yaml.demo b/recipes-demo/flutter-cluster-dashboard/files/cluster-dashboard.yaml.demo new file mode 100644 index 000000000..bab0a6bb7 --- /dev/null +++ b/recipes-demo/flutter-cluster-dashboard/files/cluster-dashboard.yaml.demo @@ -0,0 +1,3 @@ +hostname: 192.168.10.2 +authorization : "/etc/xdg/AGL/cluster-dashboard/cluster-dashboard.token" +use-tls : true diff --git a/recipes-demo/flutter-cluster-dashboard/flutter-cluster-dashboard_git.bb b/recipes-demo/flutter-cluster-dashboard/flutter-cluster-dashboard_git.bb index b7d9c4b61..919ee51db 100644 --- a/recipes-demo/flutter-cluster-dashboard/flutter-cluster-dashboard_git.bb +++ b/recipes-demo/flutter-cluster-dashboard/flutter-cluster-dashboard_git.bb @@ -11,12 +11,13 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=0c52b0e4b5f0dbf57ea7d44bebb2e29d" SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/flutter-instrument-cluster;protocol=https;branch=${AGL_BRANCH} \ file://flutter-cluster-dashboard.service \ file://flutter_cluster_dashboard_on_bg.json \ - file://flutter-cluster-dashboard.yaml \ - file://flutter-cluster-dashboard.yaml.demo \ + file://cluster-dashboard.yaml \ + file://cluster-dashboard.yaml.demo \ + file://cluster-dashboard.token \ " PV = "1.0+git${SRCPV}" -SRCREV = "9bc83e64c508ad8c69a3950d5421774f9b53a31f" +SRCREV = "80a4f8d75a66c22a23e825d4c0fb4065e2e58cb8" S = "${WORKDIR}/git" @@ -24,8 +25,6 @@ PUBSPEC_APPNAME = "flutter_cluster_dashboard" FLUTTER_APPLICATION_INSTALL_PREFIX = "/flutter" -OPENROUTE_API_KEY ??= "YOU_NEED_TO_SET_IT_IN_LOCAL_CONF" - inherit flutter-app update-alternatives systemd CLUSTER_DEMO_VISS_HOSTNAME ??= "192.168.10.2" @@ -39,33 +38,31 @@ do_install:append() { install -D -m 0644 ${WORKDIR}/${APP_CONFIG} ${D}${datadir}/flutter/${BPN}.json - install -d ${D}${sysconfdir}/xdg/AGL - install -m 0644 ${WORKDIR}/${BPN}.yaml ${D}${sysconfdir}/xdg/AGL/${BPN}.yaml.default - install -m 0644 ${WORKDIR}/${BPN}.yaml.demo ${D}${sysconfdir}/xdg/AGL/ - sed -i "s/^hostname: .*/hostname: ${CLUSTER_DEMO_VISS_HOSTNAME}/" ${D}${sysconfdir}/xdg/AGL/${BPN}.yaml.demo - - install -m 0755 -d ${D}${sysconfdir}/default/ - echo 'OPENROUTE_API_KEY:${OPENROUTE_API_KEY}' >> ${D}${sysconfdir}/default/openroutekey + install -d ${D}${sysconfdir}/xdg/AGL/cluster-dashboard + install -m 0644 ${WORKDIR}/cluster-dashboard.yaml ${D}${sysconfdir}/xdg/AGL/cluster-dashboard.yaml.default + install -m 0644 ${WORKDIR}/cluster-dashboard.yaml.demo ${D}${sysconfdir}/xdg/AGL/ + sed -i "s/^hostname: .*/hostname: ${CLUSTER_DEMO_VISS_HOSTNAME}/" ${D}${sysconfdir}/xdg/AGL/cluster-dashboard.yaml.demo + install -m 0644 ${WORKDIR}/cluster-dashboard.token ${D}${sysconfdir}/xdg/AGL/cluster-dashboard/ } -ALTERNATIVE_LINK_NAME[flutter-cluster-dashboard.yaml] = "${sysconfdir}/xdg/AGL/${BPN}.yaml" +ALTERNATIVE_LINK_NAME[cluster-dashboard.yaml] = "${sysconfdir}/xdg/AGL/cluster-dashboard.yaml" -FILES:${PN} += "${datadir} ${sysconfdir}/default/" +FILES:${PN} += "${datadir} ${sysconfdir}/xdg/AGL" RDEPENDS:${PN} += "flutter-auto agl-flutter-env liberation-fonts" PACKAGE_BEFORE_PN += "${PN}-conf ${PN}-conf-demo" -FILES:${PN}-conf += "${sysconfdir}/xdg/AGL/${BPN}.yaml.default" +FILES:${PN}-conf += "${sysconfdir}/xdg/AGL/cluster-dashboard.yaml.default" RDEPENDS:${PN}-conf = "${PN}" -RPROVIDES:${PN}-conf = "${BPN}.yaml" +RPROVIDES:${PN}-conf = "cluster-dashboard.yaml" RCONFLICTS:${PN}-conf = "${PN}-conf-demo" -ALTERNATIVE:${PN}-conf = "${BPN}.yaml" -ALTERNATIVE_TARGET_${PN}-conf = "${sysconfdir}/xdg/AGL/${BPN}.yaml.default" +ALTERNATIVE:${PN}-conf = "cluster-dashboard.yaml" +ALTERNATIVE_TARGET_${PN}-conf = "${sysconfdir}/xdg/AGL/cluster-dashboard.yaml.default" -FILES:${PN}-conf-demo += "${sysconfdir}/xdg/AGL/${BPN}.yaml.demo" +FILES:${PN}-conf-demo += "${sysconfdir}/xdg/AGL/cluster-dashboard.yaml.demo" RDEPENDS:${PN}-conf-demo = "${PN}" -RPROVIDES:${PN}-conf-demo = "${BPN}.yaml" +RPROVIDES:${PN}-conf-demo = "cluster-dashboard.yaml" RCONFLICTS:${PN}-conf-demo = "${PN}-conf" -ALTERNATIVE:${PN}-conf-demo = "${BPN}.yaml" -ALTERNATIVE_TARGET_${PN}-conf-demo = "${sysconfdir}/xdg/AGL/${BPN}.yaml.demo" +ALTERNATIVE:${PN}-conf-demo = "cluster-dashboard.yaml" +ALTERNATIVE_TARGET_${PN}-conf-demo = "${sysconfdir}/xdg/AGL/cluster-dashboard.yaml.demo" -- cgit 1.2.3-korg