diff options
14 files changed, 71 insertions, 38 deletions
@@ -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 c5832f257..b162f2904 100644 --- 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 9648c6466..1fd213d0f 100644 --- 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 index 000000000..2f127b36f --- /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 index 0dcc76464..630c11d43 100644 --- a/meta-agl/recipes-core/packagegroups/packagegroup-agl-core.bb +++ b/meta-agl/recipes-core/packagegroups/packagegroup-agl-image-minimal.bb @@ -4,12 +4,17 @@ 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 \ packagegroup-agl-core-graphics \ diff --git a/meta-agl/recipes-graphics/images/agl-image-weston.bb b/meta-agl/recipes-graphics/images/agl-image-weston.bb index a5475222d..bc449795d 100644 --- 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 index 000000000..947d22b50 --- /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 index 000000000..c92c60f90 --- /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 9a1695b3d..0303d051d 100644 --- 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 bd062660a..017439454 100644 --- 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 9754906b5..c3e021476 100644 --- 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 287e9fb26..0b564840b 100644 --- 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 index bafb8e024..6b6ce7075 100644 --- a/meta-agl/recipes-ivi/packagegroups/packagegroup-agl-ivi.bb +++ b/meta-agl/recipes-ivi/packagegroups/packagegroup-agl-image-ivi.bb @@ -5,12 +5,17 @@ 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 \ packagegroup-agl-ivi-graphics \ diff --git a/templates/base/conf-notes.txt b/templates/base/conf-notes.txt index 2c7f52eb7..1279e2979 100644 --- 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 |