summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Winarske <joel.winarske@gmail.com>2024-03-21 09:00:52 -0700
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2024-03-26 21:47:05 +0000
commit3152f13c24c450482e3430a82d73be021e6cbbfa (patch)
treef2a28bd3fabf28bc2a6384c4c3812895ae53f609
parentbf8fc5765e1c4cff367447c4e7b67b98565f1da2 (diff)
Update meta-flutter
- change reference from meta-flutter to flutter-layer - add meta-flutter-apps to check - remove BBMASK for ivi-homescreen recipe - update the flutter apps (remove FLUTTER_APPLICATION_INSTALL_PREFIX) Change-Id: I4929dca34e380e7aacc1b0cc037a7a812fa7b313 Signed-off-by: Joel Winarske <joel.winarske@gmail.com> Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org> Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl-demo/+/29778
-rw-r--r--conf/layer.conf2
-rw-r--r--recipes-demo/flutter-cluster-dashboard/flutter-cluster-dashboard_git.bb2
-rw-r--r--recipes-demo/flutter-dashboard/flutter-dashboard_git.bb1
-rw-r--r--recipes-demo/flutter-homescreen/flutter-homescreen_git.bb2
-rw-r--r--recipes-demo/flutter-hvac/flutter-hvac_git.bb1
-rw-r--r--recipes-demo/flutter-ics-homescreen/flutter-ics-homescreen_git.bb2
-rw-r--r--recipes-demo/flutter-mediaplayer/flutter-mediaplayer_git.bb1
-rw-r--r--recipes-demo/flutter-nav/flutter-nav_git.bb1
-rwxr-xr-xscripts/run-yocto-check-layer.sh5
9 files changed, 2 insertions, 15 deletions
diff --git a/conf/layer.conf b/conf/layer.conf
index 8a937a830..8aff0f9a5 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -16,4 +16,4 @@ BBFILES_DYNAMIC += " \
LAYERSERIES_COMPAT_agldemo = "kirkstone"
-LAYERDEPENDS_agldemo = "aglcore qt5-layer openembedded-layer networking-layer multimedia-layer meta-flutter meta-app-framework"
+LAYERDEPENDS_agldemo = "aglcore qt5-layer openembedded-layer networking-layer multimedia-layer flutter-layer meta-app-framework"
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 5534c6917..beee7005f 100644
--- a/recipes-demo/flutter-cluster-dashboard/flutter-cluster-dashboard_git.bb
+++ b/recipes-demo/flutter-cluster-dashboard/flutter-cluster-dashboard_git.bb
@@ -24,8 +24,6 @@ S = "${WORKDIR}/git"
PUBSPEC_APPNAME = "flutter_cluster_dashboard"
-FLUTTER_APPLICATION_INSTALL_PREFIX = "/flutter"
-
inherit flutter-app update-alternatives systemd
CLUSTER_DEMO_VSS_HOSTNAME ??= "192.168.10.2"
diff --git a/recipes-demo/flutter-dashboard/flutter-dashboard_git.bb b/recipes-demo/flutter-dashboard/flutter-dashboard_git.bb
index 11d736563..d378df9a9 100644
--- a/recipes-demo/flutter-dashboard/flutter-dashboard_git.bb
+++ b/recipes-demo/flutter-dashboard/flutter-dashboard_git.bb
@@ -19,7 +19,6 @@ inherit agl-app flutter-app
# flutter-app
#############
PUBSPEC_APPNAME = "dashboard_app"
-FLUTTER_APPLICATION_INSTALL_PREFIX = "/flutter"
FLUTTER_BUILD_ARGS = "bundle -v"
# agl-app
diff --git a/recipes-demo/flutter-homescreen/flutter-homescreen_git.bb b/recipes-demo/flutter-homescreen/flutter-homescreen_git.bb
index ccc331966..0448bdd03 100644
--- a/recipes-demo/flutter-homescreen/flutter-homescreen_git.bb
+++ b/recipes-demo/flutter-homescreen/flutter-homescreen_git.bb
@@ -17,8 +17,6 @@ SRCREV = "6c016a39fb993165d0c103691ecf5333e09ef438"
S = "${WORKDIR}/git"
PUBSPEC_APPNAME = "flutter_homescreen"
-FLUTTER_APPLICATION_INSTALL_PREFIX = "/flutter"
-
FLUTTER_BUILD_ARGS = "bundle -v"
inherit flutter-app systemd
diff --git a/recipes-demo/flutter-hvac/flutter-hvac_git.bb b/recipes-demo/flutter-hvac/flutter-hvac_git.bb
index b83e1a14a..365cc57af 100644
--- a/recipes-demo/flutter-hvac/flutter-hvac_git.bb
+++ b/recipes-demo/flutter-hvac/flutter-hvac_git.bb
@@ -24,7 +24,6 @@ inherit agl-app flutter-app
# flutter-app
#############
PUBSPEC_APPNAME = "flutter_hvac"
-FLUTTER_APPLICATION_INSTALL_PREFIX = "/flutter"
FLUTTER_BUILD_ARGS = "bundle -v"
# agl-app
diff --git a/recipes-demo/flutter-ics-homescreen/flutter-ics-homescreen_git.bb b/recipes-demo/flutter-ics-homescreen/flutter-ics-homescreen_git.bb
index 6dacebb57..576e5a7d1 100644
--- a/recipes-demo/flutter-ics-homescreen/flutter-ics-homescreen_git.bb
+++ b/recipes-demo/flutter-ics-homescreen/flutter-ics-homescreen_git.bb
@@ -20,8 +20,6 @@ SRCREV = "5587c6ae79b482fbff26442bb239d7d7eb55a337"
S = "${WORKDIR}/git"
PUBSPEC_APPNAME = "flutter_ics_homescreen"
-FLUTTER_APPLICATION_INSTALL_PREFIX = "/flutter"
-
FLUTTER_BUILD_ARGS = "bundle -v"
inherit flutter-app systemd update-alternatives
diff --git a/recipes-demo/flutter-mediaplayer/flutter-mediaplayer_git.bb b/recipes-demo/flutter-mediaplayer/flutter-mediaplayer_git.bb
index cfcfa2650..8bf013e88 100644
--- a/recipes-demo/flutter-mediaplayer/flutter-mediaplayer_git.bb
+++ b/recipes-demo/flutter-mediaplayer/flutter-mediaplayer_git.bb
@@ -20,7 +20,6 @@ inherit agl-app flutter-app
# flutter-app
#############
PUBSPEC_APPNAME = "musicplayer"
-FLUTTER_APPLICATION_INSTALL_PREFIX = "/flutter"
FLUTTER_BUILD_ARGS = "bundle -v"
# agl-app
diff --git a/recipes-demo/flutter-nav/flutter-nav_git.bb b/recipes-demo/flutter-nav/flutter-nav_git.bb
index 0e8b8ac77..116680520 100644
--- a/recipes-demo/flutter-nav/flutter-nav_git.bb
+++ b/recipes-demo/flutter-nav/flutter-nav_git.bb
@@ -24,7 +24,6 @@ inherit agl-app flutter-app
# flutter-app
#############
PUBSPEC_APPNAME = "flutter_navigation"
-FLUTTER_APPLICATION_INSTALL_PREFIX = "/flutter"
FLUTTER_BUILD_ARGS = "bundle -v"
# agl-app
diff --git a/scripts/run-yocto-check-layer.sh b/scripts/run-yocto-check-layer.sh
index e7f324d97..0f8e8f973 100755
--- a/scripts/run-yocto-check-layer.sh
+++ b/scripts/run-yocto-check-layer.sh
@@ -28,10 +28,6 @@ DISTRO_FEATURES:append := " systemd wayland pam \${AGL_DEFAULT_DISTRO_FEATURES}"
DISTRO_FEATURES_BACKFILL_CONSIDERED:append = " sysvinit"
VIRTUAL-RUNTIME_init_manager = "systemd"
-# ignore due to issue upstream
-BBMASK += "meta-flutter/recipes-graphics/toyota/ivi-homescreen_git.bb "
-
-
# required by meta-flutter/recipes-graphics/toyota/flutter-auto_git.bb"
LICENSE_FLAGS_ACCEPTED += "commercial"
@@ -54,6 +50,7 @@ yocto-check-layer --no-auto-dependency \
$AGLROOT/external/meta-openembedded/meta-networking \
$AGLROOT/external/meta-openembedded/meta-multimedia \
$AGLROOT/external/meta-flutter \
+ $AGLROOT/external/meta-flutter/meta-flutter-apps \
$AGLROOT/external/meta-qt5 \
$AGLROOT/external/meta-clang \
-- \