From: Scott Murray Date: Thu, 21 Sep 2023 18:32:53 +0000 (-0400) Subject: flutter-hvac: update SRCREV X-Git-Tag: 16.91.1~21 X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?p=AGL%2Fmeta-agl-demo.git;a=commitdiff_plain;h=0953c9e92ac9557b33712f91caf07780241bf3e3 flutter-hvac: update SRCREV Update flutter-hvac SRCREV to pick up KUKSA.val databroker gRPC API changes, update its YAML configuration file to match, and add the JWT authorization token the configuration requires. Bug-AGL: SPEC-4762 Change-Id: If272680063afb3d286f1f709dcc59c40c58f858a Signed-off-by: Scott Murray Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl-demo/+/29238 Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account --- diff --git a/recipes-demo/flutter-hvac/files/HVAC_config.yaml b/recipes-demo/flutter-hvac/files/HVAC_config.yaml deleted file mode 100644 index 6824c6b74..000000000 --- a/recipes-demo/flutter-hvac/files/HVAC_config.yaml +++ /dev/null @@ -1,3 +0,0 @@ -hostname : localhost -port : 8090 -kuskaAuthToken : eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJzdWIiOiJrdWtzYS52YWwiLCJpc3MiOiJFY2xpcHNlIEtVS1NBIERldiIsImFkbWluIjp0cnVlLCJtb2RpZnlUcmVlIjp0cnVlLCJpYXQiOjE1MTYyMzkwMjIsImV4cCI6MTc2NzIyNTU5OSwia3Vrc2EtdnNzIjp7IioiOiJydyJ9fQ.p2cnFGH16QoQ14l6ljPVKggFXZKmD-vrw8G6Vs6DvAokjsUG8FHh-F53cMsE-GDjyZH_1_CrlDCnbGlqjsFbgAylqA7IAJWp9_N6dL5p8DHZTwlZ4IV8L1CtCALs7XVqvcQKHCCzB63Y8PgVDCAqpQSRb79JPVD4pZwkBKpOknfEY5y9wfbswZiRKdgz7o61_oFnd-yywpse-23HD6v0htThVF1SuGL1PuvGJ8p334nt9bpkZO3gaTh1xVD_uJMwHzbuBCF33_f-I5QMZO6bVooXqGfe1zvl3nDrPEjq1aPulvtP8RgREYEqE6b2hB8jouTiC_WpE3qrdMw9sfWGFbm04qC-2Zjoa1yYSXoxmYd0SnliSYHAad9aXoEmFENezQV-of7sc-NX1-2nAXRAEhaqh0IRuJwB4_sG7SvQmnanwkz-sBYxKqkoFpOsZ6hblgPDOPYY2NAsZlYkjvAL2mpiInrsmY_GzGsfwPeAx31iozImX75rao8rm-XucAmCIkRlpBz6MYKCjQgyRz3UtZCJ2DYF4lKqTjphEAgclbYZ7KiCuTn9HualwtEmVzHHFneHMKl7KnRQk-9wjgiyQ5nlsVpCCblg6JKr9of4utuPO3cBvbjhB4_ueQ40cpWVOICcOLS7_w0i3pCq1ZKDEMrYDJfz87r2sU9kw1zeFQk diff --git a/recipes-demo/flutter-hvac/files/hvac.json b/recipes-demo/flutter-hvac/files/hvac.json new file mode 100644 index 000000000..20d842a60 --- /dev/null +++ b/recipes-demo/flutter-hvac/files/hvac.json @@ -0,0 +1,10 @@ +{ + "sub": "local dev", + "iss": "createToken.py", + "aud": [ + "kuksa.val" + ], + "iat": 1516239022, + "exp": 1767225599, + "scope": "actuate:Vehicle.Cabin.HVAC" +} diff --git a/recipes-demo/flutter-hvac/files/hvac.token b/recipes-demo/flutter-hvac/files/hvac.token new file mode 100644 index 000000000..76a554f8a --- /dev/null +++ b/recipes-demo/flutter-hvac/files/hvac.token @@ -0,0 +1 @@ +eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJsb2NhbCBkZXYiLCJpc3MiOiJjcmVhdGVUb2tlbi5weSIsImF1ZCI6WyJrdWtzYS52YWwiXSwiaWF0IjoxNTE2MjM5MDIyLCJleHAiOjE3NjcyMjU1OTksInNjb3BlIjoiYWN0dWF0ZTpWZWhpY2xlLkNhYmluLkhWQUMifQ.mDJd7Xn2C6xH9BRTURC2LtN_wlUgq3hJxBWNq8Dpelq43-4qDrNtfOEg2VV5wBcXimg64TwnopCHauqKyilgDt1q0VFIH9vcpp2m8QMV9Z06tR8A3zAJJ9DX4qU3WluY_STR5lnzRwvIW9fuZmyJ_msdnUB3vLp7bS47uekE6rX0OwoBzrw2Z38D5dnLilR4uknwMdWCVciBIg00xyj6hkufHyIyvgVI2Yfl8XMLgdklmgGIYRb3ljPxHsZ8MQkULbjOWsdRKJNqHP-lU17e9avzvBBXecakB0-Q-QSkuZr5H8gWLJG1a6jfcgbah1JfLJVkKWjX9knGT5csvXMGt7Mf9bGg43xb2bPkolKnmEXIlRxWyXGr_DSLmrVMukY2G_cmpj4E1v2cyyu6AtzhGyli3BD1O7ZTywZlLdGvrhxlQ1FU22OPLV8yyUoppGZLyAF_4tUaftcXXoE1HbqgzpvlPp7leB-pwmNTr9-wT8D5YAt5E5YrWGZOH6OYg-oV9Hl7JU-2zfFdm0stK_6P5D1xt0kHEjbML16SGJVO49aoeP8Fj_cNG5tc7GqHOkHBWlH7YUx2Ty4PLd91DGGHkhA-69vGs2Fg3ljpej-IHbsY269HTQd7v_wyQk_rEDMNqsOssjuFVHEd8vzdmQ-hG5BB5d_oWtCww6AAWqIlIOo \ No newline at end of file diff --git a/recipes-demo/flutter-hvac/files/hvac.yaml b/recipes-demo/flutter-hvac/files/hvac.yaml new file mode 100644 index 000000000..3684d3d3f --- /dev/null +++ b/recipes-demo/flutter-hvac/files/hvac.yaml @@ -0,0 +1,2 @@ +authorization : "/etc/xdg/AGL/hvac/hvac.token" +use-tls : true diff --git a/recipes-demo/flutter-hvac/flutter-hvac_git.bb b/recipes-demo/flutter-hvac/flutter-hvac_git.bb index d0305ce20..07f2cbbe4 100644 --- a/recipes-demo/flutter-hvac/flutter-hvac_git.bb +++ b/recipes-demo/flutter-hvac/flutter-hvac_git.bb @@ -12,10 +12,11 @@ LIC_FILES_CHKSUM = "file://License.md;md5=f712ede8d4f845976061925d1416fc40" SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/flutter-hvac;protocol=https;branch=${AGL_BRANCH} \ - file://HVAC_config.yaml \ + file://hvac.yaml \ + file://hvac.token \ " -SRCREV = "20d76f947ef9d4a9093df0e5ad04476963655173" +SRCREV = "6a853805d2479bf7b111511b1f94907e425c607a" S = "${WORKDIR}/git" inherit agl-app flutter-app @@ -33,8 +34,9 @@ AGL_APP_ID = "flutter_hvac" AGL_APP_NAME = "HVAC" do_install:append() { - install -d ${D}${sysconfdir}/xdg/AGL - install -m 0644 ${WORKDIR}/HVAC_config.yaml ${D}${sysconfdir}/xdg/AGL/ + install -d ${D}${sysconfdir}/xdg/AGL/hvac + install -m 0644 ${WORKDIR}/hvac.yaml ${D}${sysconfdir}/xdg/AGL/ + install -m 0644 ${WORKDIR}/hvac.token ${D}${sysconfdir}/xdg/AGL/hvac/ } FILES:${PN} += "${sysconfdir}/xdg/AGL"