From 4cf21252db38cfb073850778a62d967f62b908b2 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Tue, 28 May 2024 10:41:49 -0400 Subject: [PATCH] Remove agl-ivi-demo-flutter-simple image Remove agl-ivi-demo-flutter-simple image and the recipes for its flutter-homescreen, flutter-dashboard, and flutter-hvac applications. They have been replaced with the new integrated Flutter homescreen used in the default agl-ivi-demo-flutter image. Bug-AGL: SPEC-5153 Change-Id: Ib63bf7d4359b43509593226673da06a2fb9ea44c Signed-off-by: Scott Murray Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl-demo/+/29951 Tested-by: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account ci-image-build: Jenkins Job builder account Reviewed-by: Jan-Simon Moeller --- .../flutter-dashboard/files/dashboard.token | 1 - .../flutter-dashboard/files/dashboard.yaml | 2 - .../flutter-dashboard/flutter-dashboard_git.bb | 42 --------------------- .../files/flutter-homescreen.json | 10 ----- .../files/flutter-homescreen.service | 14 ------- .../flutter-homescreen/files/homescreen.token | 1 - .../flutter-homescreen/files/homescreen.yaml | 2 - .../flutter-homescreen/flutter-homescreen_git.bb | 43 ---------------------- recipes-demo/flutter-hvac/files/hvac.json | 10 ----- recipes-demo/flutter-hvac/files/hvac.token | 1 - recipes-demo/flutter-hvac/files/hvac.yaml | 2 - recipes-demo/flutter-hvac/flutter-hvac_git.bb | 41 --------------------- .../images/agl-ivi-demo-flutter-simple.bb | 20 ---------- 13 files changed, 189 deletions(-) delete mode 100644 recipes-demo/flutter-dashboard/files/dashboard.token delete mode 100644 recipes-demo/flutter-dashboard/files/dashboard.yaml delete mode 100644 recipes-demo/flutter-dashboard/flutter-dashboard_git.bb delete mode 100644 recipes-demo/flutter-homescreen/files/flutter-homescreen.json delete mode 100644 recipes-demo/flutter-homescreen/files/flutter-homescreen.service delete mode 100644 recipes-demo/flutter-homescreen/files/homescreen.token delete mode 100644 recipes-demo/flutter-homescreen/files/homescreen.yaml delete mode 100644 recipes-demo/flutter-homescreen/flutter-homescreen_git.bb delete mode 100644 recipes-demo/flutter-hvac/files/hvac.json delete mode 100644 recipes-demo/flutter-hvac/files/hvac.token delete mode 100644 recipes-demo/flutter-hvac/files/hvac.yaml delete mode 100644 recipes-demo/flutter-hvac/flutter-hvac_git.bb delete mode 100644 recipes-platform/images/agl-ivi-demo-flutter-simple.bb diff --git a/recipes-demo/flutter-dashboard/files/dashboard.token b/recipes-demo/flutter-dashboard/files/dashboard.token deleted file mode 100644 index 10fafb537..000000000 --- a/recipes-demo/flutter-dashboard/files/dashboard.token +++ /dev/null @@ -1 +0,0 @@ -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-dashboard/files/dashboard.yaml b/recipes-demo/flutter-dashboard/files/dashboard.yaml deleted file mode 100644 index e54c469e8..000000000 --- a/recipes-demo/flutter-dashboard/files/dashboard.yaml +++ /dev/null @@ -1,2 +0,0 @@ -authorization : "/etc/xdg/AGL/dashboard/dashboard.token" -use-tls : true diff --git a/recipes-demo/flutter-dashboard/flutter-dashboard_git.bb b/recipes-demo/flutter-dashboard/flutter-dashboard_git.bb deleted file mode 100644 index d378df9a9..000000000 --- a/recipes-demo/flutter-dashboard/flutter-dashboard_git.bb +++ /dev/null @@ -1,42 +0,0 @@ -SUMMARY = "Flutter Dashboard" -DESCRIPTION = "A Flutter based IVI Dashboard Application for automotive grade Linux." -HOMEPAGE = "https://gerrit.automotivelinux.org/gerrit/apps/flutter-dashboard" -SECTION = "graphics" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://License.md;md5=f712ede8d4f845976061925d1416fc40" - -SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/flutter-dashboard;protocol=https;branch=${AGL_BRANCH} \ - file://dashboard.yaml \ - file://dashboard.token \ -" -SRCREV = "2fbe5f8c19863eb4ac013dce5546900592149a26" - -S = "${WORKDIR}/git" - -inherit agl-app flutter-app - -# flutter-app -############# -PUBSPEC_APPNAME = "dashboard_app" -FLUTTER_BUILD_ARGS = "bundle -v" - -# agl-app -######### -AGL_APP_TEMPLATE = "agl-app-flutter" -AGL_APP_ID = "dashboard_app" -AGL_APP_NAME = "Dashboard" - -do_install:append() { - # VIS authorization token file for KUKSA.val should ideally not - # be readable by other users, but currently that's not doable - # 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/dashboard - install -m 0644 ${WORKDIR}/dashboard.yaml ${D}${sysconfdir}/xdg/AGL/ - install -m 0644 ${WORKDIR}/dashboard.token ${D}${sysconfdir}/xdg/AGL/dashboard/ -} - -FILES:${PN} += "${sysconfdir}/xdg/AGL" -RDEPENDS:${PN} += "flutter-auto" - diff --git a/recipes-demo/flutter-homescreen/files/flutter-homescreen.json b/recipes-demo/flutter-homescreen/files/flutter-homescreen.json deleted file mode 100644 index 83aa09a8e..000000000 --- a/recipes-demo/flutter-homescreen/files/flutter-homescreen.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "view" : [ { - "window_type" : "BG", - "width" : 1920, - "height": 1080, - "fullscreen": true, - "window_activation_area" : { "x" : 0, "y" : 160, "width" : 1080, "height" : 1600 } - } - ] -} diff --git a/recipes-demo/flutter-homescreen/files/flutter-homescreen.service b/recipes-demo/flutter-homescreen/files/flutter-homescreen.service deleted file mode 100644 index 3024fced8..000000000 --- a/recipes-demo/flutter-homescreen/files/flutter-homescreen.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Requires=agl-compositor.service applaunchd.service -After=agl-compositor.service applaunchd.service - -[Service] -User=agl-driver -EnvironmentFile=/etc/default/flutter -EnvironmentFile=-/etc/default/flutter-homescreen -Environment=XDG_RUNTIME_DIR=/run/user/1001/ -ExecStart=/usr/bin/flutter-auto --b=/usr/share/flutter/flutter_homescreen/${FLUTTER_VERSION}/${FLUTTER_RUNTIME} --j=/usr/share/flutter/flutter-homescreen.json --xdg-shell-app-id=homescreen -Restart=on-failure - -[Install] -WantedBy=graphical.target diff --git a/recipes-demo/flutter-homescreen/files/homescreen.token b/recipes-demo/flutter-homescreen/files/homescreen.token deleted file mode 100644 index 110d3c413..000000000 --- a/recipes-demo/flutter-homescreen/files/homescreen.token +++ /dev/null @@ -1 +0,0 @@ -eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJzdWIiOiJsb2NhbCBkZXYiLCJpc3MiOiJjcmVhdGVUb2tlbi5weSIsImF1ZCI6WyJrdWtzYS52YWwiXSwiaWF0IjoxNTE2MjM5MDIyLCJleHAiOjE3NjcyMjU1OTksInNjb3BlIjoiYWN0dWF0ZSBwcm92aWRlIn0.x-bUZwDCC663wGYrWCYjQZwQWhN1CMuKgxuIN5dUF_izwMutiqF6Xc-tnXgZa93BbT3I74WOMk4awKHBUSTWekGs3-qF6gajorbat6n5180TOqvNu4CXuIPZN5zpngf4id3smMkKOT699tPnSEbmlkj4vk-mIjeOAU-FcYA-VbkKBTsjvfFgKa2OdB5h9uZARBg5Rx7uBN3JsH1I6j9zoLid184Ewa6bhU2qniFt5iPsGJniNsKsRrrndN1KzthO13My44s56yvwSHIOrgDGbXdja_eLuOVOq9pHCjCtorPScgEuUUE4aldIuML-_j397taNP9Y3VZYVvofEK7AuiePTbzwxrZ1RAjK74h1-4ued3A2gUTjr5BsRlc9b7eLZzxLJkrqdfGAzBh_rtrB7p32TbvpjeFP30NW6bB9JS43XACUUm_S_RcyI7BLuUdnFyQDQr6l6sRz9XayYXceilHdCxbAVN0HVnBeui5Bb0mUZYIRZeY8k6zcssmokANTD8ZviDMpKlOU3t5AlXJ0nLkgyMhV9IUTwPUv6F8BTPc-CquJCUNbTyo4ywTSoODWbm3PmQ3Y46gWF06xqnB4wehLscBdVk3iAihQp3tckGhMnx5PI_Oy7utIncr4pRCMos63TnBkfrl7d43cHQTuK0kO76EWtv4ODEHgLvEAv4HA \ No newline at end of file diff --git a/recipes-demo/flutter-homescreen/files/homescreen.yaml b/recipes-demo/flutter-homescreen/files/homescreen.yaml deleted file mode 100644 index b5849a3d1..000000000 --- a/recipes-demo/flutter-homescreen/files/homescreen.yaml +++ /dev/null @@ -1,2 +0,0 @@ -authorization : "/etc/xdg/AGL/homescreen/homescreen.token" -use-tls : true diff --git a/recipes-demo/flutter-homescreen/flutter-homescreen_git.bb b/recipes-demo/flutter-homescreen/flutter-homescreen_git.bb deleted file mode 100644 index 0448bdd03..000000000 --- a/recipes-demo/flutter-homescreen/flutter-homescreen_git.bb +++ /dev/null @@ -1,43 +0,0 @@ -SUMMARY = "AGL Flutter Homescreen" -DESCRIPTION = "Demo Flutter homescreen for Automotive Grade Linux." -HOMEPAGE = "https://gerrit.automotivelinux.org/gerrit/apps/flutter-homescreen" -SECTION = "graphics" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" - -SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/flutter-homescreen;protocol=https;branch=${AGL_BRANCH} \ - file://flutter-homescreen.json \ - file://flutter-homescreen.service \ - file://homescreen.yaml \ - file://homescreen.token \ -" -SRCREV = "6c016a39fb993165d0c103691ecf5333e09ef438" - -S = "${WORKDIR}/git" - -PUBSPEC_APPNAME = "flutter_homescreen" -FLUTTER_BUILD_ARGS = "bundle -v" - -inherit flutter-app systemd - -APP_CONFIG = "${BPN}.json" - -SYSTEMD_SERVICE:${PN} = "flutter-homescreen.service" - -do_install:append() { - install -D -m 0644 ${WORKDIR}/${BPN}.service ${D}${systemd_system_unitdir}/${BPN}.service - - install -D -m 0644 ${WORKDIR}/${APP_CONFIG} ${D}${datadir}/flutter/${BPN}.json - - # VIS authorization token file for KUKSA.val should ideally not - # be readable by other users, but currently that's not doable - # 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/homescreen - install -m 0644 ${WORKDIR}/homescreen.yaml ${D}${sysconfdir}/xdg/AGL/ - install -m 0644 ${WORKDIR}/homescreen.token ${D}${sysconfdir}/xdg/AGL/homescreen/ -} - -FILES:${PN} += "${datadir} ${sysconfdir}/xdg/AGL" -RDEPENDS:${PN} += "flutter-auto agl-flutter-env" diff --git a/recipes-demo/flutter-hvac/files/hvac.json b/recipes-demo/flutter-hvac/files/hvac.json deleted file mode 100644 index 20d842a60..000000000 --- a/recipes-demo/flutter-hvac/files/hvac.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "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 deleted file mode 100644 index 76a554f8a..000000000 --- a/recipes-demo/flutter-hvac/files/hvac.token +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index 3684d3d3f..000000000 --- a/recipes-demo/flutter-hvac/files/hvac.yaml +++ /dev/null @@ -1,2 +0,0 @@ -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 deleted file mode 100644 index 365cc57af..000000000 --- a/recipes-demo/flutter-hvac/flutter-hvac_git.bb +++ /dev/null @@ -1,41 +0,0 @@ -SUMMARY = "Flutter HVAC" -DESCRIPTION = "A Flutter based IVI Dashboard Application for automotive grade Linux." - -HOMEPAGE = "https://gerrit.automotivelinux.org/gerrit/apps/flutter-hvac" - -BUGTRACKER = "https://github.com/hritik-chouhan/HVAC_dashboard/issues" - -SECTION = "graphics" - -LICENSE = "Apache-2.0" -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.yaml \ - file://hvac.token \ - " - -SRCREV = "802b3f1fefae4b1c05484d2eb6656afcd7fceedf" -S = "${WORKDIR}/git" - -inherit agl-app flutter-app - -# flutter-app -############# -PUBSPEC_APPNAME = "flutter_hvac" -FLUTTER_BUILD_ARGS = "bundle -v" - -# agl-app -######### -AGL_APP_TEMPLATE = "agl-app-flutter" -AGL_APP_ID = "flutter_hvac" -AGL_APP_NAME = "HVAC" - -do_install:append() { - 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" diff --git a/recipes-platform/images/agl-ivi-demo-flutter-simple.bb b/recipes-platform/images/agl-ivi-demo-flutter-simple.bb deleted file mode 100644 index 2e33f47b1..000000000 --- a/recipes-platform/images/agl-ivi-demo-flutter-simple.bb +++ /dev/null @@ -1,20 +0,0 @@ -require agl-ivi-image-flutter.bb - -SUMMARY = "AGL IVI demo simple Flutter image" - -AGL_APPS_INSTALL += " \ - flutter-homescreen \ - flutter-dashboard \ - flutter-hvac \ - ondemandnavi \ - settings \ - mediaplayer \ - messaging \ - phone \ - radio \ -" - -IMAGE_INSTALL += " \ - qtquickcontrols2-agl \ - qtquickcontrols2-agl-style \ -" -- 2.16.6