3rd part of the layer/profile rework [2/2]

This is the last part of the layer rework series.

Notable changes are:
- move demo specific recipes to the demo (dlt, web-runtime mocca-usb)
- wayland-ivi-extension moved to the meta-agl-demo layer for now.
- web-runtime moved here (from appfw layer to allow console-only builds with appfw)
- adapted packagegroups and agl-features

v2: squashed with commit on sandbox to form single commit (tnx, Scott)
v3: inclusion of old packagegroup-agl-image-ivi (TODO: refactor and include in profile packagegroups. Tnx, Stephane)
v4: base packagegroup-agl-demo-platform on packagegroup-agl-profile-graphical-qt5
v5: fix MOST_DRIVERS_append (disable due to FTBS)
v6: re-add RDEPENDS for virtual/pulseaudio-config

Bug-AGL: SPEC-145
Bug-AGL: SPEC-1422

Change-Id: I20bd5b9a957ea54a7ecd08bd4f8b99a32266c9c8
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>

14 files changed, 144 insertions, 43 deletions

diff --git a/recipes-platform/images/agl-demo-platform-html5.bb b/recipes-platform/images/agl-demo-platform-html5.bb
deleted file mode 100644
index c9247a854..000000000
--- a/recipes-platform/images/agl-demo-platform-html5.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-DESCRIPTION = "AGL Demo Platform image currently contains a simple HMI and \
-demos."
-
-LICENSE = "MIT"
-
-require agl-demo-platform-html5.inc
-
-IMAGE_INSTALL_append = "\
-    packagegroup-agl-demo-platform-html5 \
-    "
diff --git a/recipes-platform/images/agl-demo-platform-html5.inc b/recipes-platform/images/agl-demo-platform-html5.inc
deleted file mode 100644
index 3005abeb0..000000000
--- a/recipes-platform/images/agl-demo-platform-html5.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-# Base image
-require recipes-ivi/images/agl-image-ivi.inc
diff --git a/recipes-platform/images/agl-demo-platform.inc b/recipes-platform/images/agl-demo-platform.inc
index 973291309..203fcc077 100644
--- a/recipes-platform/images/agl-demo-platform.inc
+++ b/recipes-platform/images/agl-demo-platform.inc
@@ -1,3 +1,3 @@
 # Base image
-require recipes-ivi/images/agl-image-ivi.inc
+require recipes-platform/images/agl-image-ivi.inc
 
diff --git a/recipes-platform/images/agl-image-ivi-crosssdk.bb b/recipes-platform/images/agl-image-ivi-crosssdk.bb
new file mode 100644
index 000000000..0303d051d
--- /dev/null
+++ b/recipes-platform/images/agl-image-ivi-crosssdk.bb
@@ -0,0 +1,19 @@
+SUMMARY = "Cross SDK of AGL Distribution for IVI profile"
+
+DESCRIPTION = "Basic image for baseline of AGL Distribution for IVI profile. \
+It includes the full meta-toolchain, plus developement headers and libraries \
+to form a standalone cross SDK."
+
+require agl-image-ivi.bb
+
+LICENSE = "MIT"
+
+IMAGE_FEATURES += "dev-pkgs"
+IMAGE_INSTALL += "kernel-dev"
+
+inherit populate_sdk
+
+# Task do_populate_sdk and do_rootfs can't be exec simultaneously.
+# Both exec "createrepo" on the same directory, and so one of them
+# can failed (randomly).
+addtask do_populate_sdk after do_rootfs
diff --git a/recipes-platform/images/agl-image-ivi-qa.bb b/recipes-platform/images/agl-image-ivi-qa.bb
new file mode 100644
index 000000000..017439454
--- /dev/null
+++ b/recipes-platform/images/agl-image-ivi-qa.bb
@@ -0,0 +1,14 @@
+SUMMARY = "A basic system of AGL distribution of IVI profile for Quality Assurance(QA)"
+
+DESCRIPTION = "A basic set of AGL Distribution. This image also has additional \
+packages (e.g. commandline tools) for Quality Assurance(QA)."
+
+require agl-image-ivi.bb
+
+LICENSE = "MIT"
+
+IMAGE_INSTALL_append = " \
+    packagegroup-agl-test \
+    packagegroup-ivi-common-test \
+    "
+
diff --git a/recipes-platform/images/agl-image-ivi.bb b/recipes-platform/images/agl-image-ivi.bb
new file mode 100644
index 000000000..dd4f89b15
--- /dev/null
+++ b/recipes-platform/images/agl-image-ivi.bb
@@ -0,0 +1,17 @@
+SUMMARY = "A basic system of AGL distribution of IVI profile"
+
+DESCRIPTION = "Basic image for baseline of AGL Distribution for IVI profile."
+
+require agl-image-ivi.inc
+
+LICENSE = "MIT"
+
+IMAGE_INSTALL_append = "\
+    packagegroup-agl-image-ivi \
+    "
+
+DISTRO_FEATURES_append = " agl-core-image-profile"
+
+IMAGE_INSTALL += "\
+    agl-desktop-config \
+    "
diff --git a/recipes-platform/images/agl-image-ivi.inc b/recipes-platform/images/agl-image-ivi.inc
new file mode 100644
index 000000000..610d4e464
--- /dev/null
+++ b/recipes-platform/images/agl-image-ivi.inc
@@ -0,0 +1,3 @@
+require recipes-platform/images/agl-image-minimal.inc
+
+IMAGE_FEATURES += "splash package-management ssh-server-dropbear"
diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo-platform-html5.bb b/recipes-platform/packagegroups/packagegroup-agl-demo-platform-html5.bb
deleted file mode 100644
index 9092b1872..000000000
--- a/recipes-platform/packagegroups/packagegroup-agl-demo-platform-html5.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-SUMMARY = "The software for DEMO platform of AGL IVI profile"
-DESCRIPTION = "A set of packages belong to AGL Demo Platform"
-
-LICENSE = "MIT"
-
-inherit packagegroup
-
-PACKAGES = "\
-    packagegroup-agl-demo-platform-html5 \
-    "
-
-ALLOW_EMPTY_${PN} = "1"
-
-RDEPENDS_${PN} += "\
-    packagegroup-agl-image-ivi \
-    "
-
-# add packages for demo platform (include demo apps) here
-RDEPENDS_${PN} += " \
-    packagegroup-agl-demo \
-    "
-
-# add packages for OpenIVI-HTML5 demo
-RDEPENDS_${PN} += " \
-    openivi-html5 \
-    "
diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb b/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb
index f1ba6cd20..4ab64d0bb 100755
--- a/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb
+++ b/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb
@@ -16,13 +16,12 @@ RDEPENDS_${PN} += "\
     "
 
 RDEPENDS_${PN} += "\
-    packagegroup-agl-image-weston \
+    packagegroup-agl-profile-graphical-qt5 \
     packagegroup-agl-demo \
     "
 
 MOST_DRIVERS = " "
-# temporarily disabled on rocko to fix the build
-MOST_DRIVERS_append_fixbrokenrocko = " \
+MOST_DRIVERS_append_BROKENonIntelQemuRpi3 = " \
     mocca-usb \
     most \
     "
diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo.bb b/recipes-platform/packagegroups/packagegroup-agl-demo.bb
index 0b37113fe..5cf826bdb 100644
--- a/recipes-platform/packagegroups/packagegroup-agl-demo.bb
+++ b/recipes-platform/packagegroups/packagegroup-agl-demo.bb
@@ -25,13 +25,14 @@ AUDIO-OLD = "audiomanager"
 AUDIO-NEW = "packagegroup-agl-audio"
 
 RDEPENDS_${PN} += "\
-    packagegroup-agl-appfw \
     libqtappfw \
     ${@bb.utils.contains('DISTRO_FEATURES', 'agl-hmi-framework', '${HOMESCREEN-NEW}', '${HOMESCREEN-OLD}', d)} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'agl-audio-4a-framework', '${AUDIO-NEW}', '${AUDIO-OLD}', d)} \
     udisks \
     ${SMARTDEVICELINK} \
     "
+#    packagegroup-agl-appfw \
+#
 
 # fonts
 TTF_FONTS = " \
@@ -62,4 +63,7 @@ RDEPENDS_${PN} += " \
     dhcp-client \
     ${TTF_FONTS} \
     ${EXTRA_APPS} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webruntime', 'virtual/webruntime', '', d)} \
     "
+
+
diff --git a/recipes-platform/packagegroups/packagegroup-agl-image-ivi.bb b/recipes-platform/packagegroups/packagegroup-agl-image-ivi.bb
new file mode 100644
index 000000000..0edc600ca
--- /dev/null
+++ b/recipes-platform/packagegroups/packagegroup-agl-image-ivi.bb
@@ -0,0 +1,32 @@
+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-automotive \
+#    packagegroup-agl-ivi-speech-services \
+#    packagegroup-agl-ivi-navi-lbs \
+#    packagegroup-agl-ivi-security \
+#    packagegroup-agl-ivi-os-commonlibs \
+#    packagegroup-agl-ivi-kernel \
+#
+
+RDEPENDS_${PN} += "\
+    agl-login-manager \
+    "
diff --git a/recipes-platform/packagegroups/packagegroup-agl-ivi-connectivity.bb b/recipes-platform/packagegroups/packagegroup-agl-ivi-connectivity.bb
new file mode 100644
index 000000000..2d45986de
--- /dev/null
+++ b/recipes-platform/packagegroups/packagegroup-agl-ivi-connectivity.bb
@@ -0,0 +1,15 @@
+SUMMARY = "The middlewares for AGL IVI profile"
+DESCRIPTION = "The set of packages required by Connectivity Subsystem"
+LICENSE = "MIT"
+
+inherit packagegroup
+
+PACKAGES = "\
+    packagegroup-agl-ivi-connectivity \
+    "
+
+ALLOW_EMPTY_${PN} = "1"
+
+RDEPENDS_${PN} += "\
+    ofono \
+    "
diff --git a/recipes-platform/packagegroups/packagegroup-agl-ivi-graphics.bb b/recipes-platform/packagegroups/packagegroup-agl-ivi-graphics.bb
new file mode 100644
index 000000000..8831e10a1
--- /dev/null
+++ b/recipes-platform/packagegroups/packagegroup-agl-ivi-graphics.bb
@@ -0,0 +1,15 @@
+SUMMARY = "The middlewares for AGL IVI profile"
+DESCRIPTION = "The set of packages required by Graphics Subsystem"
+LICENSE = "MIT"
+
+inherit packagegroup
+
+PACKAGES = "\
+    packagegroup-agl-ivi-graphics \
+    "
+
+ALLOW_EMPTY_${PN} = "1"
+
+RDEPENDS_${PN} += "\
+    opencv \
+    "
diff --git a/recipes-platform/packagegroups/packagegroup-agl-ivi-multimedia.bb b/recipes-platform/packagegroups/packagegroup-agl-ivi-multimedia.bb
new file mode 100644
index 000000000..3b7cf78ac
--- /dev/null
+++ b/recipes-platform/packagegroups/packagegroup-agl-ivi-multimedia.bb
@@ -0,0 +1,21 @@
+SUMMARY = "The middlewares for AGL IVI profile"
+DESCRIPTION = "The set of packages required by Multimedia Subsystem"
+LICENSE = "MIT"
+
+inherit packagegroup
+
+PACKAGES = "\
+    packagegroup-agl-ivi-multimedia \
+    "
+
+ALLOW_EMPTY_${PN} = "1"
+
+RDEPENDS_${PN} += "\
+    gstreamer1.0-plugins-base-meta \
+    gstreamer1.0-plugins-good-meta \
+    lightmediascanner-meta \
+    "
+
+RDEPENDS_${PN} += "\
+    ${@bb.utils.contains('DISTRO_FEATURES', 'agl-audio-4a-framework', '' , 'virtual/pulseaudio-config', d)} \
+    "