From 0b9ee96eac781f044fef295ea34c7630068c3d45 Mon Sep 17 00:00:00 2001 From: Hritik Chouhan Date: Wed, 5 Oct 2022 21:18:43 +0200 Subject: Change SRC_URI and SRCREV for ivi-demo-flutter-apps - Change SRC_URI to use the app repository on gerrit. - Renamed recipes file name. Bug-AGL: SPEC-4560 Change-Id: I2887e568e6a466836d68866ace0766c7ed7949d9 Signed-off-by: Hritik Chouhan --- .../flutter-dashboard/flutter-app-dashboard_git.bb | 47 ------------------- .../flutter-dashboard/flutter-dashboard_git.bb | 47 +++++++++++++++++++ recipes-demo/flutter-hvac/files/HVAC_config.yaml | 3 ++ recipes-demo/flutter-hvac/files/hvac_config.yaml | 3 -- recipes-demo/flutter-hvac/flutter-app-hvac_git.bb | 40 ----------------- recipes-demo/flutter-hvac/flutter-hvac_git.bb | 40 +++++++++++++++++ .../flutter-app-mediaplayer_git.bb | 30 ------------- .../flutter-mediaplayer/flutter-mediaplayer_git.bb | 30 +++++++++++++ recipes-demo/flutter-nav/flutter-app-nav_git.bb | 52 ---------------------- recipes-demo/flutter-nav/flutter-nav_git.bb | 52 ++++++++++++++++++++++ .../packagegroup-agl-demo-platform-flutter.bb | 8 ++-- 11 files changed, 176 insertions(+), 176 deletions(-) delete mode 100644 recipes-demo/flutter-dashboard/flutter-app-dashboard_git.bb create mode 100644 recipes-demo/flutter-dashboard/flutter-dashboard_git.bb create mode 100644 recipes-demo/flutter-hvac/files/HVAC_config.yaml delete mode 100644 recipes-demo/flutter-hvac/files/hvac_config.yaml delete mode 100644 recipes-demo/flutter-hvac/flutter-app-hvac_git.bb create mode 100644 recipes-demo/flutter-hvac/flutter-hvac_git.bb delete mode 100644 recipes-demo/flutter-mediaplayer/flutter-app-mediaplayer_git.bb create mode 100644 recipes-demo/flutter-mediaplayer/flutter-mediaplayer_git.bb delete mode 100644 recipes-demo/flutter-nav/flutter-app-nav_git.bb create mode 100644 recipes-demo/flutter-nav/flutter-nav_git.bb diff --git a/recipes-demo/flutter-dashboard/flutter-app-dashboard_git.bb b/recipes-demo/flutter-dashboard/flutter-app-dashboard_git.bb deleted file mode 100644 index 71d988dbb..000000000 --- a/recipes-demo/flutter-dashboard/flutter-app-dashboard_git.bb +++ /dev/null @@ -1,47 +0,0 @@ -SUMMARY = "Flutter Dashboard" -DESCRIPTION = "A Flutter based IVI Dashboard Application for automotive grade Linux." - -HOMEPAGE = "https://github.com/hritik-chouhan/dashboard_for_recipe" - -BUGTRACKER = "https://github.com/hritik-chouhan/dashboard_for_recipe/issues" - -SECTION = "graphics" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://License.md;md5=f712ede8d4f845976061925d1416fc40" - - -SRC_URI = "git://github.com/hritik-chouhan/dashboard_for_recipe.git;protocol=https;branch=main \ - file://dashboard_config.yaml \ - " - -SRCREV = "5b0e5cdc3ba8b00a7e53b46e8b3e656cd09822bb" -S = "${WORKDIR}/git" - - -inherit agl-app flutter-app - -# flutter-app -############# -PUBSPEC_APPNAME = "dashboard_app" -FLUTTER_APPLICATION_INSTALL_PREFIX = "/flutter" -FLUTTER_BUILD_ARGS = "bundle -v" - -# agl-app -######### -AGL_APP_TEMPLATE = "agl-app-flutter" -AGL_APP_ID = "dashboard_app" -AGL_APP_NAME = "Flutter Dashboard" - - - -do_install:append() { - install -d ${D}${sysconfdir}/xdg/AGL - install -m 0644 ${WORKDIR}/dashboard_config.yaml ${D}${sysconfdir}/xdg/AGL/ - - - -} - -FILES:${PN} += "${sysconfdir}/xdg/AGL" - diff --git a/recipes-demo/flutter-dashboard/flutter-dashboard_git.bb b/recipes-demo/flutter-dashboard/flutter-dashboard_git.bb new file mode 100644 index 000000000..d44b30c97 --- /dev/null +++ b/recipes-demo/flutter-dashboard/flutter-dashboard_git.bb @@ -0,0 +1,47 @@ +SUMMARY = "Flutter Dashboard" +DESCRIPTION = "A Flutter based IVI Dashboard Application for automotive grade Linux." + +HOMEPAGE = "https://gerrit.automotivelinux.org/gerrit/apps/flutter-dashboard" + +BUGTRACKER = "https://github.com/hritik-chouhan/dashboard_for_recipe/issues" + +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_config.yaml \ + " + +SRCREV = "10945b8056eb2b228c156918a3505882a49a79b8" +S = "${WORKDIR}/git" + + +inherit agl-app flutter-app + +# flutter-app +############# +PUBSPEC_APPNAME = "dashboard_app" +FLUTTER_APPLICATION_INSTALL_PREFIX = "/flutter" +FLUTTER_BUILD_ARGS = "bundle -v" + +# agl-app +######### +AGL_APP_TEMPLATE = "agl-app-flutter" +AGL_APP_ID = "dashboard_app" +AGL_APP_NAME = "Flutter Dashboard" + + + +do_install:append() { + install -d ${D}${sysconfdir}/xdg/AGL + install -m 0644 ${WORKDIR}/dashboard_config.yaml ${D}${sysconfdir}/xdg/AGL/ + + + +} + +FILES:${PN} += "${sysconfdir}/xdg/AGL" + diff --git a/recipes-demo/flutter-hvac/files/HVAC_config.yaml b/recipes-demo/flutter-hvac/files/HVAC_config.yaml new file mode 100644 index 000000000..6824c6b74 --- /dev/null +++ b/recipes-demo/flutter-hvac/files/HVAC_config.yaml @@ -0,0 +1,3 @@ +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_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/flutter-app-hvac_git.bb b/recipes-demo/flutter-hvac/flutter-app-hvac_git.bb deleted file mode 100644 index a4038f13d..000000000 --- a/recipes-demo/flutter-hvac/flutter-app-hvac_git.bb +++ /dev/null @@ -1,40 +0,0 @@ -SUMMARY = "Flutter HVAC" -DESCRIPTION = "A Flutter based IVI Dashboard Application for automotive grade Linux." - -HOMEPAGE = "https://github.com/hritik-chouhan/HVAC_dashboard" - -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://github.com/hritik-chouhan/HVAC_dashboard.git;protocol=https;branch=main \ - file://hvac_config.yaml \ - " - -SRCREV = "892f09a82dd852b66416598c9ec47b3230c5d56c" -S = "${WORKDIR}/git" - -inherit agl-app flutter-app - -# flutter-app -############# -PUBSPEC_APPNAME = "flutter_hvac" -FLUTTER_APPLICATION_INSTALL_PREFIX = "/flutter" -FLUTTER_BUILD_ARGS = "bundle -v" - -# agl-app -######### -AGL_APP_TEMPLATE = "agl-app-flutter" -AGL_APP_ID = "flutter_hvac" -AGL_APP_NAME = "Flutter Hvac" - -do_install:append() { - install -d ${D}${sysconfdir}/xdg/AGL - install -m 0644 ${WORKDIR}/hvac_config.yaml ${D}${sysconfdir}/xdg/AGL/ -} - -FILES:${PN} += "${sysconfdir}/xdg/AGL" diff --git a/recipes-demo/flutter-hvac/flutter-hvac_git.bb b/recipes-demo/flutter-hvac/flutter-hvac_git.bb new file mode 100644 index 000000000..a2062411c --- /dev/null +++ b/recipes-demo/flutter-hvac/flutter-hvac_git.bb @@ -0,0 +1,40 @@ +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_config.yaml \ + " + +SRCREV = "5559cdb261cfd3e69daa2349906f071dc2491c0d" +S = "${WORKDIR}/git" + +inherit agl-app flutter-app + +# flutter-app +############# +PUBSPEC_APPNAME = "flutter_hvac" +FLUTTER_APPLICATION_INSTALL_PREFIX = "/flutter" +FLUTTER_BUILD_ARGS = "bundle -v" + +# agl-app +######### +AGL_APP_TEMPLATE = "agl-app-flutter" +AGL_APP_ID = "flutter_hvac" +AGL_APP_NAME = "Flutter Hvac" + +do_install:append() { + install -d ${D}${sysconfdir}/xdg/AGL + install -m 0644 ${WORKDIR}/HVAC_config.yaml ${D}${sysconfdir}/xdg/AGL/ +} + +FILES:${PN} += "${sysconfdir}/xdg/AGL" diff --git a/recipes-demo/flutter-mediaplayer/flutter-app-mediaplayer_git.bb b/recipes-demo/flutter-mediaplayer/flutter-app-mediaplayer_git.bb deleted file mode 100644 index ee0168259..000000000 --- a/recipes-demo/flutter-mediaplayer/flutter-app-mediaplayer_git.bb +++ /dev/null @@ -1,30 +0,0 @@ -SUMMARY = "Flutter MediaPlayer app for IVI" -DESCRIPTION = "A Flutter based IVI Dashboard Application for automotive grade Linux" - -HOMEPAGE = "https://github.com/hritik-chouhan/musicplayer" - -BUGTRACKER = "https://github.com/hritik-chouhan/musicplayer/issues" - -SECTION = "graphics" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://License.md;md5=f712ede8d4f845976061925d1416fc40" - - -SRC_URI = "git://github.com/hritik-chouhan/musicplayer.git;protocol=https;branch=main" -SRCREV = "45f9425552ec08a8706953c41aa25b0fc1a6fb57" -S = "${WORKDIR}/git" - -inherit agl-app flutter-app - -# flutter-app -############# -PUBSPEC_APPNAME = "musicplayer" -FLUTTER_APPLICATION_INSTALL_PREFIX = "/flutter" -FLUTTER_BUILD_ARGS = "bundle -v" - -# agl-app -######### -AGL_APP_TEMPLATE = "agl-app-flutter" -AGL_APP_ID = "musicplayer" -AGL_APP_NAME = "Flutter MediaPlayer" diff --git a/recipes-demo/flutter-mediaplayer/flutter-mediaplayer_git.bb b/recipes-demo/flutter-mediaplayer/flutter-mediaplayer_git.bb new file mode 100644 index 000000000..cfcfa2650 --- /dev/null +++ b/recipes-demo/flutter-mediaplayer/flutter-mediaplayer_git.bb @@ -0,0 +1,30 @@ +SUMMARY = "Flutter MediaPlayer app for IVI" +DESCRIPTION = "A Flutter based IVI Dashboard Application for automotive grade Linux" + +HOMEPAGE = "https://gerrit.automotivelinux.org/gerrit/apps/flutter-mediaplayer" + +BUGTRACKER = "https://github.com/hritik-chouhan/musicplayer/issues" + +SECTION = "graphics" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://License.md;md5=f712ede8d4f845976061925d1416fc40" + + +SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/flutter-mediaplayer;protocol=https;branch=${AGL_BRANCH}" +SRCREV = "735de5a38ea937ee13157f6ac594053ddb8b027b" +S = "${WORKDIR}/git" + +inherit agl-app flutter-app + +# flutter-app +############# +PUBSPEC_APPNAME = "musicplayer" +FLUTTER_APPLICATION_INSTALL_PREFIX = "/flutter" +FLUTTER_BUILD_ARGS = "bundle -v" + +# agl-app +######### +AGL_APP_TEMPLATE = "agl-app-flutter" +AGL_APP_ID = "musicplayer" +AGL_APP_NAME = "Flutter MediaPlayer" diff --git a/recipes-demo/flutter-nav/flutter-app-nav_git.bb b/recipes-demo/flutter-nav/flutter-app-nav_git.bb deleted file mode 100644 index 3bc2f4275..000000000 --- a/recipes-demo/flutter-nav/flutter-app-nav_git.bb +++ /dev/null @@ -1,52 +0,0 @@ -SUMMARY = "Flutter Navigation app" -DESCRIPTION = "A Flutter based IVI Dashboard Application for automotive grade Linux." - -HOMEPAGE = "https://github.com/hritik-chouhan/nav-app" - -BUGTRACKER = "https://github.com/hritik-chouhan/nav-app/issues" - -SECTION = "graphics" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://License.md;md5=f712ede8d4f845976061925d1416fc40" - - -SRC_URI = "git://github.com/hritik-chouhan/nav-app.git;protocol=https;branch=main \ - file://nav_config.yaml \ - " -SRCREV = "a6619ac0439f6dec728b9a3a094f1371ee00ce76" -S = "${WORKDIR}/git" - -MAPBOX_API_KEY ??= "YOU_NEED_TO_SET_IT_IN_LOCAL_CONF" - -inherit agl-app flutter-app - -# flutter-app -############# -PUBSPEC_APPNAME = "flutter_navigation" -FLUTTER_APPLICATION_INSTALL_PREFIX = "/flutter" -FLUTTER_BUILD_ARGS = "bundle -v" - -# agl-app -######### -AGL_APP_TEMPLATE = "agl-app-flutter" -AGL_APP_ID = "flutter_navigation" -AGL_APP_NAME = "Flutter Navigation" - -do_configure:prepend() { - if [ "${MAPBOX_API_KEY}" = "YOU_NEED_TO_SET_IT_IN_LOCAL_CONF" ]; then - bbwarn "WARNING: You should set mapbox API key to mapbox_API_KEY variable in local.conf." - fi -} - -do_install:append() { - install -d ${D}${sysconfdir}/xdg/AGL - install -m 0644 ${WORKDIR}/nav_config.yaml ${D}${sysconfdir}/xdg/AGL/ - - install -m 0755 -d ${D}${sysconfdir}/default/ - - echo 'MAPBOX_API_KEY:${MAPBOX_API_KEY}' >> ${D}${sysconfdir}/default/mapboxkey -} - -FILES:${PN} += "${sysconfdir}/xdg/AGL ${sysconfdir}/default/" - diff --git a/recipes-demo/flutter-nav/flutter-nav_git.bb b/recipes-demo/flutter-nav/flutter-nav_git.bb new file mode 100644 index 000000000..0e8b8ac77 --- /dev/null +++ b/recipes-demo/flutter-nav/flutter-nav_git.bb @@ -0,0 +1,52 @@ +SUMMARY = "Flutter Navigation app" +DESCRIPTION = "A Flutter based IVI Dashboard Application for automotive grade Linux." + +HOMEPAGE = "https://gerrit.automotivelinux.org/gerrit/apps/flutter-navigation" + +BUGTRACKER = "https://github.com/hritik-chouhan/nav-app/issues" + +SECTION = "graphics" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://License.md;md5=f712ede8d4f845976061925d1416fc40" + + +SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/flutter-navigation;protocol=https;branch=${AGL_BRANCH} \ + file://nav_config.yaml \ + " +SRCREV = "53164c0441db946b4293f483a28b524ecdc91e30" +S = "${WORKDIR}/git" + +MAPBOX_API_KEY ??= "YOU_NEED_TO_SET_IT_IN_LOCAL_CONF" + +inherit agl-app flutter-app + +# flutter-app +############# +PUBSPEC_APPNAME = "flutter_navigation" +FLUTTER_APPLICATION_INSTALL_PREFIX = "/flutter" +FLUTTER_BUILD_ARGS = "bundle -v" + +# agl-app +######### +AGL_APP_TEMPLATE = "agl-app-flutter" +AGL_APP_ID = "flutter_navigation" +AGL_APP_NAME = "Flutter Navigation" + +do_configure:prepend() { + if [ "${MAPBOX_API_KEY}" = "YOU_NEED_TO_SET_IT_IN_LOCAL_CONF" ]; then + bbwarn "WARNING: You should set mapbox API key to mapbox_API_KEY variable in local.conf." + fi +} + +do_install:append() { + install -d ${D}${sysconfdir}/xdg/AGL + install -m 0644 ${WORKDIR}/nav_config.yaml ${D}${sysconfdir}/xdg/AGL/ + + install -m 0755 -d ${D}${sysconfdir}/default/ + + echo 'MAPBOX_API_KEY:${MAPBOX_API_KEY}' >> ${D}${sysconfdir}/default/mapboxkey +} + +FILES:${PN} += "${sysconfdir}/xdg/AGL ${sysconfdir}/default/" + diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo-platform-flutter.bb b/recipes-platform/packagegroups/packagegroup-agl-demo-platform-flutter.bb index c40d0f69d..2ab688236 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-demo-platform-flutter.bb +++ b/recipes-platform/packagegroups/packagegroup-agl-demo-platform-flutter.bb @@ -20,10 +20,10 @@ RDEPENDS:${PN} += "\ AGL_APPS = " \ hvac \ dashboard \ - flutter-app-dashboard \ - flutter-app-hvac \ - flutter-app-nav \ - flutter-app-mediaplayer \ + flutter-dashboard \ + flutter-hvac \ + flutter-nav \ + flutter-mediaplayer \ " RDEPENDS:${PN}:append = " \ -- cgit 1.2.3-korg