13 files changed, 58 insertions, 58 deletions
diff --git a/README.md b/README.md
index 66de8c254..3fc7b9893 100644
--- a/README.md
+++ b/README.md
@@ -52,7 +52,8 @@ Distribution and other platforms for In-Vehicle Infotainment system.
 `meta-agl` is a layer which contains AGL common and middleware packages.
 > meta-agl/meta-agl
 
-`meta-agl-bsp` is a layer which contains required packages to boot AGL distribution on an emulated machine(QEMU).
+`meta-agl-bsp` is a layer which contains required packages to boot AGL
+distribution on an emulated machine(QEMU).
 > meta-agl/meta-agl-bsp
 
 Packagegroups
@@ -60,29 +61,28 @@ Packagegroups
 
 AGL package group design:
 
-These are the top-level packagegroups for AGL Distribution.
-> packagegroup-agl-core  (minimal packages to boot system)
-> packagegroup-agl-ivi   (middlewares for AGL IVI)
-> packagegroup-ivi-common (common packages to AGL and others)
-
-Each package group can contain sub-package groups like these.
-> packagegroup-agl-core-multimedia
-> packagegroup-agl-core-connectivity
-> ...
-> packagegroup-agl-ivi-multimedia
-> packagegroup-agl-ivi-connectivity
-> ...
-> packagegroup-ivi-common-multimedia
-> packagegroup-ivi-common-connectivity
-
-The recipe for `packagegroup-ivi-common-*.bb` will contain common packages to
-AGL Distribution(meta-agl) and other In-Vehicle Infotainment system(e.g. meta-ivi and meta-tizen).
-> directory: meta-agl/meta-ivi-common/recipes-core/packagegroups
-> recipes  : packagegroup-ivi-common-[subsystem].bb
-
-The "packagegroups-agl-ivi-*" will contain AGL specific middleware packages.
-> directory: meta-agl/meta-agl/recipes-ivi/packagegroups
-> recipes  : packagegroup-agl-ivi-[subsystem].bb
+* packagegroup-agl-core*
+
+These are for making image ``agl-image-minimal`` which is small image just
+capable of allowing a device to boot.
+
+Subsystem should maintain packagegroup-agl-core-[subsystem].bb which should
+hold sufficient packages to build ``agl-image-minimal``.
+
+* packagegroup-agl-ivi*
+
+These are for making image ``agl-image-ivi`` which is baseline for IVI profile
+of AGL distro. 'Baseline' means Service Layer and Operating System Layer defined
+in AGL Spec v1.0. I think this is the same as GENIVI baseline.
+All packages which belong to AppHMI and Application Framework should be put
+into ``meta-agl-demo``.
+
+* packagegroup-ivi-common*
+
+These are for picking up some packages from GENIVI/Tizen/Others. The layer of
+``meta-ivi-common`` has no image to build, all packagegroups are aggregated
+to ``packagegrou-ivi-common-core' and it is included by images,
+``agl-image-ivi.bb`` and ``agl-demo-platform.bb``.
 
 Supported Machine
 -----------------
diff --git a/meta-agl/recipes-ivi/images/agl-image-ivi.bb b/meta-agl/recipes-ivi/images/agl-image-ivi.bb
index 950b27a4f..9754906b5 100644
--- a/meta-agl/recipes-ivi/images/agl-image-ivi.bb
+++ b/meta-agl/recipes-ivi/images/agl-image-ivi.bb
@@ -1,8 +1,8 @@
 SUMMARY = "A basic system of AGL distribution of IVI profile"
-require recipes-ivi/images/agl-image-ivi.inc
+require ${PN}.inc
 
 IMAGE_INSTALL_append = "\
     packagegroup-agl-core \
     packagegroup-agl-ivi \
-    packagegroup-ivi-common \
+    packagegroup-ivi-common-core \
     "
diff --git a/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-automotive.bb b/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-core-automotive.bb
index ef4766e34..a623abded 100644
--- a/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-automotive.bb
+++ b/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-core-automotive.bb
@@ -6,7 +6,7 @@ LICENSE = "MIT"
 inherit packagegroup
 
 PACKAGES = "\
-    packagegroup-ivi-common-automotive \
+    packagegroup-ivi-common-core-automotive \
     "
 
 ALLOW_EMPTY_${PN} = "1"
diff --git a/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-connectivity.bb b/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-core-connectivity.bb
index 4236a54d9..2453c3cb0 100644
--- a/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-connectivity.bb
+++ b/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-core-connectivity.bb
@@ -6,7 +6,7 @@ LICENSE = "MIT"
 inherit packagegroup
 
 PACKAGES = "\
-    packagegroup-ivi-common-connectivity \
+    packagegroup-ivi-common-core-connectivity \
     "
 
 ALLOW_EMPTY_${PN} = "1"
diff --git a/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-graphics.bb b/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-core-graphics.bb
index f50767236..e061d39d0 100644
--- a/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-graphics.bb
+++ b/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-core-graphics.bb
@@ -6,7 +6,7 @@ LICENSE = "MIT"
 inherit packagegroup
 
 PACKAGES = "\
-    packagegroup-ivi-common-graphics \
+    packagegroup-ivi-common-core-graphics \
     "
 
 ALLOW_EMPTY_${PN} = "1"
diff --git a/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-kernel.bb b/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-core-kernel.bb
index 9d6cbc83e..14e5f4347 100644
--- a/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-kernel.bb
+++ b/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-core-kernel.bb
@@ -6,7 +6,7 @@ LICENSE = "MIT"
 inherit packagegroup
 
 PACKAGES = "\
-    packagegroup-ivi-common-kernel \
+    packagegroup-ivi-common-core-kernel \
     "
 
 ALLOW_EMPTY_${PN} = "1"
diff --git a/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-multimedia.bb b/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-core-multimedia.bb
index bd6ad26c5..87ff66a26 100644
--- a/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-multimedia.bb
+++ b/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-core-multimedia.bb
@@ -6,7 +6,7 @@ LICENSE = "MIT"
 inherit packagegroup
 
 PACKAGES = "\
-    packagegroup-ivi-common-multimedia \
+    packagegroup-ivi-common-core-multimedia \
     "
 
 ALLOW_EMPTY_${PN} = "1"
diff --git a/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-navi-lbs.bb b/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-core-navi-lbs.bb
index 45d3179e2..63c27348c 100644
--- a/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-navi-lbs.bb
+++ b/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-core-navi-lbs.bb
@@ -6,7 +6,7 @@ LICENSE = "MIT"
 inherit packagegroup
 
 PACKAGES = "\
-    packagegroup-ivi-common-navi-lbs \
+    packagegroup-ivi-common-core-navi-lbs \
     "
 
 ALLOW_EMPTY_${PN} = "1"
diff --git a/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-os-commonlibs.bb b/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-core-os-commonlibs.bb
index de077db4c..eb7df8de2 100644
--- a/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-os-commonlibs.bb
+++ b/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-core-os-commonlibs.bb
@@ -6,7 +6,7 @@ LICENSE = "MIT"
 inherit packagegroup
 
 PACKAGES = "\
-    packagegroup-ivi-common-os-commonlibs \
+    packagegroup-ivi-common-core-os-commonlibs \
     "
 
 ALLOW_EMPTY_${PN} = "1"
diff --git a/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-security.bb b/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-core-security.bb
index 61fe22ebb..b7c15399b 100644
--- a/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-security.bb
+++ b/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-core-security.bb
@@ -6,7 +6,7 @@ LICENSE = "MIT"
 inherit packagegroup
 
 PACKAGES = "\
-    packagegroup-ivi-common-security \
+    packagegroup-ivi-common-core-security \
     "
 
 ALLOW_EMPTY_${PN} = "1"
diff --git a/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-speech-services.bb b/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-core-speech-services.bb
index f934e840c..72105ee3a 100644
--- a/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-speech-services.bb
+++ b/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-core-speech-services.bb
@@ -6,7 +6,7 @@ LICENSE = "MIT"
 inherit packagegroup
 
 PACKAGES = "\
-    packagegroup-ivi-common-speech-services \
+    packagegroup-ivi-common-core-speech-services \
     "
 
 ALLOW_EMPTY_${PN} = "1"
diff --git a/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-core.bb b/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-core.bb
new file mode 100644
index 000000000..b3cff10a6
--- /dev/null
+++ b/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-core.bb
@@ -0,0 +1,23 @@
+SUMMARY = "The middlewares for AGL IVI profile"
+DESCRIPTION = "A set of packagegroups which contain common packages required by AGL Distribution"
+LICENSE = "MIT"
+
+inherit packagegroup
+
+PACKAGES = "\
+    packagegroup-ivi-common-core \
+    "
+
+ALLOW_EMPTY_${PN} = "1"
+
+RDEPENDS_${PN} += "\
+    packagegroup-ivi-common-core-automotive \
+    packagegroup-ivi-common-core-connectivity \
+    packagegroup-ivi-common-core-graphics \
+    packagegroup-ivi-common-core-multimedia \
+    packagegroup-ivi-common-core-navi-lbs \
+    packagegroup-ivi-common-core-os-commonlibs \
+    packagegroup-ivi-common-core-speech-services \
+    packagegroup-ivi-common-core-security \
+    packagegroup-ivi-common-core-kernel \
+    "
diff --git a/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common.bb b/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common.bb
deleted file mode 100644
index 70d0facf6..000000000
--- a/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-SUMMARY = "The middlewares for AGL IVI profile"
-DESCRIPTION = "A set of packagegroups which contain common packages required by AGL Distribution"
-LICENSE = "MIT"
-
-inherit packagegroup
-
-PACKAGES = "\
-    packagegroup-ivi-common \
-    "
-
-ALLOW_EMPTY_${PN} = "1"
-
-RDEPENDS_${PN} += "\
-    packagegroup-ivi-common-automotive \
-    packagegroup-ivi-common-connectivity \
-    packagegroup-ivi-common-graphics \
-    packagegroup-ivi-common-multimedia \
-    packagegroup-ivi-common-navi-lbs \
-    packagegroup-ivi-common-os-commonlibs \
-    packagegroup-ivi-common-speech-services \
-    packagegroup-ivi-common-security \
-    packagegroup-ivi-common-kernel \
-    "