From 1358fce0ca46b764e12c6bee79e8f5239baa60f9 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Thu, 4 Aug 2022 17:14:53 -0400 Subject: Handle meta-flutter update Changes: - Rename flutter-gallery bbappend to handle switch to BBCLASSEXTEND scheme in the upstream recipe. - Update the Flutter embedder package name in the Flutter demo image package group to handle upstream change. Bug-AGL: SPEC-4485 Signed-off-by: Scott Murray Change-Id: I3d5cf4e6f38b766c5dc65979cb53b6674af2b03a --- recipes-demo/flutter-gallery/flutter-gallery-release_agldemo.inc | 5 ----- recipes-demo/flutter-gallery/flutter-gallery-release_git.bbappend | 1 - recipes-demo/flutter-gallery/flutter-gallery_agldemo.inc | 5 +++++ recipes-demo/flutter-gallery/flutter-gallery_git.bbappend | 1 + .../packagegroups/packagegroup-agl-demo-platform-flutter.bb | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 recipes-demo/flutter-gallery/flutter-gallery-release_agldemo.inc delete mode 100644 recipes-demo/flutter-gallery/flutter-gallery-release_git.bbappend create mode 100644 recipes-demo/flutter-gallery/flutter-gallery_agldemo.inc create mode 100644 recipes-demo/flutter-gallery/flutter-gallery_git.bbappend diff --git a/recipes-demo/flutter-gallery/flutter-gallery-release_agldemo.inc b/recipes-demo/flutter-gallery/flutter-gallery-release_agldemo.inc deleted file mode 100644 index 4a7d3652a..000000000 --- a/recipes-demo/flutter-gallery/flutter-gallery-release_agldemo.inc +++ /dev/null @@ -1,5 +0,0 @@ -inherit agl-app - -AGL_APP_TEMPLATE = "agl-app-flutter" -AGL_APP_ID = "gallery" -AGL_APP_NAME = "Gallery" diff --git a/recipes-demo/flutter-gallery/flutter-gallery-release_git.bbappend b/recipes-demo/flutter-gallery/flutter-gallery-release_git.bbappend deleted file mode 100644 index 6a9edecd0..000000000 --- a/recipes-demo/flutter-gallery/flutter-gallery-release_git.bbappend +++ /dev/null @@ -1 +0,0 @@ -require ${@bb.utils.contains('AGL_FEATURES', 'agldemo', 'flutter-gallery-release_agldemo.inc', '', d)} diff --git a/recipes-demo/flutter-gallery/flutter-gallery_agldemo.inc b/recipes-demo/flutter-gallery/flutter-gallery_agldemo.inc new file mode 100644 index 000000000..4a7d3652a --- /dev/null +++ b/recipes-demo/flutter-gallery/flutter-gallery_agldemo.inc @@ -0,0 +1,5 @@ +inherit agl-app + +AGL_APP_TEMPLATE = "agl-app-flutter" +AGL_APP_ID = "gallery" +AGL_APP_NAME = "Gallery" diff --git a/recipes-demo/flutter-gallery/flutter-gallery_git.bbappend b/recipes-demo/flutter-gallery/flutter-gallery_git.bbappend new file mode 100644 index 000000000..5e55224e2 --- /dev/null +++ b/recipes-demo/flutter-gallery/flutter-gallery_git.bbappend @@ -0,0 +1 @@ +require ${@bb.utils.contains('AGL_FEATURES', 'agldemo', 'flutter-gallery_agldemo.inc', '', d)} diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo-platform-flutter.bb b/recipes-platform/packagegroups/packagegroup-agl-demo-platform-flutter.bb index 4eaeb062c..747fb6f8b 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-demo-platform-flutter.bb +++ b/recipes-platform/packagegroups/packagegroup-agl-demo-platform-flutter.bb @@ -20,11 +20,11 @@ RDEPENDS:${PN} += "\ AGL_APPS = " \ hvac \ dashboard \ - flutter-gallery-release \ + flutter-gallery-runtimerelease \ " RDEPENDS:${PN}:append = " \ - flutter-embedder-release \ + flutter-auto-runtimerelease \ launcher \ qtquickcontrols2-agl \ qtquickcontrols2-agl-style \ -- cgit 1.2.3-korg