Add dependency to images

 * [SPEC-424]
 * yocto image should use dependency to facilitate maintenance
 * yocto image should have its own LICENSE defined

Change-Id: I47a6c35f5b80947c5ef8b4761dd98b4bc82a5507
Signed-off-by: Ronan <ronan.lemartret@iot.bzh>

diff --git a/README.md b/README.md
index 0193e07..fc6a069 100644 (file)
--- a/README.md
+++ b/README.md
@@ -81,10 +81,9 @@ Packagegroups
 
 AGL package group design:
 
-* packagegroup-agl-core*
+* packagegroup-agl-image-minimal
 
         packagegroup-agl-core-automotive.bb
-        packagegroup-agl-core.bb
         packagegroup-agl-core-connectivity.bb
         packagegroup-agl-core-graphics.bb
         packagegroup-agl-core-kernel.bb
@@ -100,10 +99,9 @@ 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*
+* packagegroup-agl-image-ivi
 
         packagegroup-agl-ivi-automotive.bb
-        packagegroup-agl-ivi.bb
         packagegroup-agl-ivi-connectivity.bb
         packagegroup-agl-ivi-graphics.bb
         packagegroup-agl-ivi-kernel.bb

diff --git a/meta-agl/recipes-core/images/agl-image-minimal-qa.bb b/meta-agl/recipes-core/images/agl-image-minimal-qa.bb
index c5832f2..b162f29 100644 (file)
--- a/meta-agl/recipes-core/images/agl-image-minimal-qa.bb
+++ b/meta-agl/recipes-core/images/agl-image-minimal-qa.bb
@@ -5,6 +5,8 @@ packages (e.g. commandline tools) for Quality Assurance(QA)."
 
 require agl-image-minimal.bb
 
+LICENSE = "MIT"
+
 IMAGE_INSTALL_append = " \
     packagegroup-ivi-common-test \
     "

diff --git a/meta-agl/recipes-core/images/agl-image-minimal.bb b/meta-agl/recipes-core/images/agl-image-minimal.bb
index 9648c64..1fd213d 100644 (file)
--- a/meta-agl/recipes-core/images/agl-image-minimal.bb
+++ b/meta-agl/recipes-core/images/agl-image-minimal.bb
@@ -1,15 +1,9 @@
 SUMMARY = "An AGL small image just capable of allowing a device to boot."
 
-IMAGE_INSTALL = "packagegroup-core-boot-agl ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${CORE_IMAGE_EXTRA_INSTALL}"
-
-IMAGE_LINGUAS = " "
+require agl-image-minimal.inc
 
 LICENSE = "MIT"
 
-inherit core-image
-
-IMAGE_ROOTFS_SIZE ?= "8192"
-
 IMAGE_INSTALL_append = "\
-    packagegroup-agl-core \
+    packagegroup-agl-image-minimal \
     "

diff --git a/meta-agl/recipes-core/images/agl-image-minimal.inc b/meta-agl/recipes-core/images/agl-image-minimal.inc
new file mode 100644 (file)
index 0000000..2f127b3
--- /dev/null
+++ b/meta-agl/recipes-core/images/agl-image-minimal.inc
@@ -0,0 +1,7 @@
+IMAGE_LINGUAS = " "
+
+inherit core-image
+
+IMAGE_INSTALL = "${ROOTFS_PKGMANAGE_BOOTSTRAP} ${CORE_IMAGE_EXTRA_INSTALL}"
+
+IMAGE_ROOTFS_SIZE ?= "8192"

diff --git a/meta-agl/recipes-core/packagegroups/packagegroup-agl-core.bb b/meta-agl/recipes-core/packagegroups/packagegroup-agl-image-minimal.bb
similarity index 84%
rename from meta-agl/recipes-core/packagegroups/packagegroup-agl-core.bb
rename to meta-agl/recipes-core/packagegroups/packagegroup-agl-image-minimal.bb
index 0dcc764..630c11d 100644 (file)
--- a/meta-agl/recipes-core/packagegroups/packagegroup-agl-core.bb
+++ b/meta-agl/recipes-core/packagegroups/packagegroup-agl-image-minimal.bb
@@ -4,11 +4,16 @@ LICENSE = "MIT"
 inherit packagegroup
 
 PACKAGES = "\
-    packagegroup-agl-core \
+    packagegroup-agl-image-minimal \
     "
 
 ALLOW_EMPTY_${PN} = "1"
 
+RDEPENDS_${PN} += "\
+    packagegroup-core-boot-agl \
+    "
+
+
 RDEPENDS_${PN} += "\
     packagegroup-agl-core-automotive \
     packagegroup-agl-core-connectivity \

diff --git a/meta-agl/recipes-graphics/images/agl-image-weston.bb b/meta-agl/recipes-graphics/images/agl-image-weston.bb
index a547522..bc44979 100644 (file)
--- a/meta-agl/recipes-graphics/images/agl-image-weston.bb
+++ b/meta-agl/recipes-graphics/images/agl-image-weston.bb
@@ -1,11 +1,9 @@
 SUMMARY = "A very basic Wayland image with a terminal"
 
-IMAGE_FEATURES += "splash package-management ssh-server-dropbear"
+require agl-image-weston.inc
 
 LICENSE = "MIT"
 
-inherit core-image distro_features_check
-
-REQUIRED_DISTRO_FEATURES = "wayland"
-
-CORE_IMAGE_BASE_INSTALL += "weston weston-examples"
+IMAGE_INSTALL_append = "\
+    packagegroup-agl-image-weston \
+    "

diff --git a/meta-agl/recipes-graphics/images/agl-image-weston.inc b/meta-agl/recipes-graphics/images/agl-image-weston.inc
new file mode 100644 (file)
index 0000000..947d22b
--- /dev/null
+++ b/meta-agl/recipes-graphics/images/agl-image-weston.inc
@@ -0,0 +1,7 @@
+require recipes-core/images/agl-image-minimal.inc
+
+IMAGE_FEATURES += "splash package-management ssh-server-dropbear"
+
+inherit distro_features_check
+
+REQUIRED_DISTRO_FEATURES = "wayland"

diff --git a/meta-agl/recipes-graphics/packagegroups/packagegroup-agl-image-weston.bb b/meta-agl/recipes-graphics/packagegroups/packagegroup-agl-image-weston.bb
new file mode 100644 (file)
index 0000000..c92c60f
--- /dev/null
+++ b/meta-agl/recipes-graphics/packagegroups/packagegroup-agl-image-weston.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "The minimal set of packages required for basic Wayland image"
+LICENSE = "MIT"
+
+inherit packagegroup
+
+PACKAGES = "\
+    packagegroup-agl-image-weston \
+    "
+
+ALLOW_EMPTY_${PN} = "1"
+
+RDEPENDS_${PN} += "weston weston-examples"
+
+RDEPENDS_${PN} += "\
+    packagegroup-agl-image-minimal \
+    "

diff --git a/meta-agl/recipes-ivi/images/agl-image-ivi-crosssdk.bb b/meta-agl/recipes-ivi/images/agl-image-ivi-crosssdk.bb
index 9a1695b..0303d05 100644 (file)
--- a/meta-agl/recipes-ivi/images/agl-image-ivi-crosssdk.bb
+++ b/meta-agl/recipes-ivi/images/agl-image-ivi-crosssdk.bb
@@ -6,6 +6,8 @@ to form a standalone cross SDK."
 
 require agl-image-ivi.bb
 
+LICENSE = "MIT"
+
 IMAGE_FEATURES += "dev-pkgs"
 IMAGE_INSTALL += "kernel-dev"
 

diff --git a/meta-agl/recipes-ivi/images/agl-image-ivi-qa.bb b/meta-agl/recipes-ivi/images/agl-image-ivi-qa.bb
index bd06266..0174394 100644 (file)
--- a/meta-agl/recipes-ivi/images/agl-image-ivi-qa.bb
+++ b/meta-agl/recipes-ivi/images/agl-image-ivi-qa.bb
@@ -1,9 +1,12 @@
 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/meta-agl/recipes-ivi/images/agl-image-ivi.bb b/meta-agl/recipes-ivi/images/agl-image-ivi.bb
index 9754906..c3e0214 100644 (file)
--- a/meta-agl/recipes-ivi/images/agl-image-ivi.bb
+++ b/meta-agl/recipes-ivi/images/agl-image-ivi.bb
@@ -1,8 +1,11 @@
 SUMMARY = "A basic system of AGL distribution of IVI profile"
-require ${PN}.inc
+
+DESCRIPTION = "Basic image for baseline of AGL Distribution for IVI profile."
+
+require agl-image-ivi.inc
+
+LICENSE = "MIT"
 
 IMAGE_INSTALL_append = "\
-    packagegroup-agl-core \
-    packagegroup-agl-ivi \
-    packagegroup-ivi-common-core \
+    packagegroup-agl-image-ivi \
     "

diff --git a/meta-agl/recipes-ivi/images/agl-image-ivi.inc b/meta-agl/recipes-ivi/images/agl-image-ivi.inc
index 287e9fb..0b56484 100644 (file)
--- a/meta-agl/recipes-ivi/images/agl-image-ivi.inc
+++ b/meta-agl/recipes-ivi/images/agl-image-ivi.inc
@@ -1,13 +1,3 @@
-IMAGE_INSTALL = "packagegroup-core-boot-agl ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${CORE_IMAGE_EXTRA_INSTALL}"
-
-IMAGE_LINGUAS = " "
-
-LICENSE = "MIT"
-
-inherit core-image buildhistory
-
-IMAGE_ROOTFS_SIZE ?= "8192"
+require recipes-core/images/agl-image-minimal.inc
 
 IMAGE_FEATURES += "splash package-management ssh-server-dropbear"
-
-BUILDHISTORY_COMMIT = "1"

diff --git a/meta-agl/recipes-ivi/packagegroups/packagegroup-agl-ivi.bb b/meta-agl/recipes-ivi/packagegroups/packagegroup-agl-image-ivi.bb
similarity index 81%
rename from meta-agl/recipes-ivi/packagegroups/packagegroup-agl-ivi.bb
rename to meta-agl/recipes-ivi/packagegroups/packagegroup-agl-image-ivi.bb
index bafb8e0..6b6ce70 100644 (file)
--- a/meta-agl/recipes-ivi/packagegroups/packagegroup-agl-ivi.bb
+++ b/meta-agl/recipes-ivi/packagegroups/packagegroup-agl-image-ivi.bb
@@ -5,11 +5,16 @@ LICENSE = "MIT"
 inherit packagegroup
 
 PACKAGES = "\
-    packagegroup-agl-ivi \
+    packagegroup-agl-image-ivi \
     "
 
 ALLOW_EMPTY_${PN} = "1"
 
+RDEPENDS_${PN} += "\
+    packagegroup-agl-image-minimal \
+    packagegroup-ivi-common-core \
+"
+
 RDEPENDS_${PN} += "\
     packagegroup-agl-ivi-automotive \
     packagegroup-agl-ivi-connectivity \

diff --git a/templates/base/conf-notes.txt b/templates/base/conf-notes.txt
index 2c7f52e..1279e29 100644 (file)
--- a/templates/base/conf-notes.txt
+++ b/templates/base/conf-notes.txt
@@ -1,14 +1,17 @@
 Common targets are:
   - meta-agl:          (core system)
-    agl-image-ivi
-    agl-image-ivi-crosssdk
-    agl-image-ivi-qa
     agl-image-minimal
     agl-image-minimal-qa
+    
+    agl-image-ivi
+    agl-image-ivi-qa
+    agl-image-ivi-crosssdk
+    
     agl-image-weston
 
   - meta-agl-demo:     (demo with UI)
     agl-demo-platform  (* default demo target)
     agl-demo-platform-qa
     agl-demo-platform-crosssdk
+    
     agl-demo-platform-html5