Rework IVI image packagegroups

The all-in-one packagegroup-agl-image-ivi makes it difficult to
use the dependencies it pulls into images in a piecemeal fashion.
It has been removed and instead its dependencies are included in
the base IVI image defintion.  As well, the IVI services
packagegroup has been split to have packagegroups for applaunchd
versus platform-dependent services (audio, HVAC, etc.).
These will enable doing using conditional logic in the IVI image
defintion that will be more visible and not break binary packaging.

Bug-AGL: SPEC-5082

Change-Id: Ia4e95656e2fbc6d8ed6ba98c19b33f6fe6ca5971
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl-demo/+/29698
ci-image-boot-test: Jenkins Job builder account
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
ci-image-build: Jenkins Job builder account
Tested-by: Jenkins Job builder account

6 files changed, 21 insertions, 34 deletions

diff --git a/recipes-platform/images/agl-image-ivi.bb b/recipes-platform/images/agl-image-ivi.bb
index 4fa95061a..c0b6e4f7f 100644
--- a/recipes-platform/images/agl-image-ivi.bb
+++ b/recipes-platform/images/agl-image-ivi.bb
@@ -7,9 +7,15 @@ LICENSE = "MIT"
 require recipes-platform/images/agl-image-compositor.bb
 
 IMAGE_INSTALL += " \
-    packagegroup-agl-image-ivi \
-    packagegroup-agl-ivi-services \
     can-utils \
+    packagegroup-agl-ivi-connectivity \
+    packagegroup-agl-ivi-graphics \
+    packagegroup-agl-ivi-multimedia \
+    packagegroup-agl-ivi-multimedia-hardware \
+    packagegroup-agl-ivi-navigation \
+    packagegroup-agl-ivi-identity \
+    packagegroup-agl-ivi-services-applaunchd \
+    packagegroup-agl-ivi-services-platform \
     iproute2 \
     "
 
diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo-platform-flutter.bb b/recipes-platform/packagegroups/packagegroup-agl-demo-platform-flutter.bb
index e01c315d6..015cde970 100644
--- a/recipes-platform/packagegroups/packagegroup-agl-demo-platform-flutter.bb
+++ b/recipes-platform/packagegroups/packagegroup-agl-demo-platform-flutter.bb
@@ -11,7 +11,6 @@ PACKAGES = "\
     "
 
 RDEPENDS:${PN} += "\
-    packagegroup-agl-image-ivi \
     packagegroup-agl-kuksa-val-databroker \
     packagegroup-agl-demo \
     "
diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo-platform-html5.bb b/recipes-platform/packagegroups/packagegroup-agl-demo-platform-html5.bb
index 9c93b32c2..c5a9209b6 100644
--- a/recipes-platform/packagegroups/packagegroup-agl-demo-platform-html5.bb
+++ b/recipes-platform/packagegroups/packagegroup-agl-demo-platform-html5.bb
@@ -11,7 +11,6 @@ PACKAGES = "\
     "
 
 RDEPENDS:${PN} += "\
-    packagegroup-agl-image-ivi \
     packagegroup-agl-demo \
     "
 
diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb b/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb
index cf8268d44..f03229da6 100644
--- a/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb
+++ b/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb
@@ -11,7 +11,6 @@ PACKAGES = "\
     "
 
 RDEPENDS:${PN} += "\
-    packagegroup-agl-image-ivi \
     packagegroup-agl-kuksa-val-databroker \
     packagegroup-agl-demo \
     "
diff --git a/recipes-platform/packagegroups/packagegroup-agl-image-ivi.bb b/recipes-platform/packagegroups/packagegroup-agl-image-ivi.bb
deleted file mode 100644
index c3d6f57c6..000000000
--- a/recipes-platform/packagegroups/packagegroup-agl-image-ivi.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-SUMMARY = "The middlewares for AGL IVI profile"
-DESCRIPTION = "The set of packages required for AGL Distribution"
-LICENSE = "MIT"
-
-inherit packagegroup
-
-PACKAGES = "\
-    packagegroup-agl-image-ivi \
-    "
-
-ALLOW_EMPTY:${PN} = "1"
-
-RDEPENDS:${PN} += "\
-    packagegroup-agl-image-minimal \
-"
-
-RDEPENDS:${PN} += "\
-    packagegroup-agl-ivi-connectivity \
-    packagegroup-agl-ivi-graphics \
-    packagegroup-agl-ivi-multimedia \
-    packagegroup-agl-ivi-multimedia-hardware \
-    packagegroup-agl-ivi-navigation \
-    packagegroup-agl-ivi-identity \
-    packagegroup-agl-ivi-services \
-    "
-
diff --git a/recipes-platform/packagegroups/packagegroup-agl-ivi-services.bb b/recipes-platform/packagegroups/packagegroup-agl-ivi-services.bb
index e4a4a9d0f..c3a53d502 100644
--- a/recipes-platform/packagegroups/packagegroup-agl-ivi-services.bb
+++ b/recipes-platform/packagegroups/packagegroup-agl-ivi-services.bb
@@ -5,12 +5,22 @@ inherit packagegroup
 
 PACKAGES = "\
     packagegroup-agl-ivi-services \
-    "
+    packagegroup-agl-ivi-services-platform \
+    packagegroup-agl-ivi-services-applaunchd \
+"
 
-RDEPENDS:${PN} += "\
+RDEPENDS:${PN}-applaunchd += " \
     applaunchd \
     applaunchd-template-agl-app \
+"
+
+RDEPENDS:${PN}-platform += " \
     agl-service-hvac \
     agl-service-audiomixer \
     agl-service-radio \
-    "
+"
+
+RDEPENDS:${PN} += " \
+    packagegroup-agl-ivi-services-applaunchd \
+    packagegroup-agl-ivi-services-platform \
+"