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

7 files changed, 54 insertions, 13 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"