summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/core-image.bbclass4
-rw-r--r--meta/recipes-core/images/core-image-core.bb2
-rw-r--r--meta/recipes-graphics/images/core-image-clutter.bb2
-rw-r--r--meta/recipes-sato/images/core-image-sato-dev.bb8
-rw-r--r--meta/recipes-sato/images/core-image-sato-sdk.bb8
-rw-r--r--meta/recipes-sato/images/core-image-sato.bb2
6 files changed, 9 insertions, 17 deletions
diff --git a/meta/classes/core-image.bbclass b/meta/classes/core-image.bbclass
index f4013134d5..d6dd6460eb 100644
--- a/meta/classes/core-image.bbclass
+++ b/meta/classes/core-image.bbclass
@@ -62,10 +62,6 @@ CORE_IMAGE_EXTRA_INSTALL ?= ""
62 62
63IMAGE_INSTALL ?= "${CORE_IMAGE_BASE_INSTALL}" 63IMAGE_INSTALL ?= "${CORE_IMAGE_BASE_INSTALL}"
64 64
65X11_IMAGE_FEATURES = "x11-base apps-x11-core package-management"
66ENHANCED_IMAGE_FEATURES = "${X11_IMAGE_FEATURES} apps-x11-games package-management"
67SATO_IMAGE_FEATURES = "${ENHANCED_IMAGE_FEATURES} x11-sato ssh-server-dropbear"
68
69inherit image 65inherit image
70 66
71# Create /etc/timestamp during image construction to give a reasonably sane default time setting 67# Create /etc/timestamp during image construction to give a reasonably sane default time setting
diff --git a/meta/recipes-core/images/core-image-core.bb b/meta/recipes-core/images/core-image-core.bb
index ed33e12d46..ea6ba7ecad 100644
--- a/meta/recipes-core/images/core-image-core.bb
+++ b/meta/recipes-core/images/core-image-core.bb
@@ -1,7 +1,7 @@
1DESCRIPTION = "An X11 image with simple applications such as terminal, editor, \ 1DESCRIPTION = "An X11 image with simple applications such as terminal, editor, \
2and file manager." 2and file manager."
3 3
4IMAGE_FEATURES += "apps-console-core ${X11_IMAGE_FEATURES}" 4IMAGE_FEATURES += "apps-console-core package-management x11-base apps-x11-core"
5 5
6LICENSE = "MIT" 6LICENSE = "MIT"
7 7
diff --git a/meta/recipes-graphics/images/core-image-clutter.bb b/meta/recipes-graphics/images/core-image-clutter.bb
index 6c49a02625..aa6e2a2bdd 100644
--- a/meta/recipes-graphics/images/core-image-clutter.bb
+++ b/meta/recipes-graphics/images/core-image-clutter.bb
@@ -1,7 +1,7 @@
1DESCRIPTION = "An image with support for the Open GL-based toolkit Clutter, \ 1DESCRIPTION = "An image with support for the Open GL-based toolkit Clutter, \
2which enables development of rich and animated graphical user interfaces." 2which enables development of rich and animated graphical user interfaces."
3 3
4IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES}" 4IMAGE_FEATURES += "apps-console-core package-management x11-base apps-x11-core apps-x11-games x11-sato ssh-server-dropbear"
5 5
6LICENSE = "MIT" 6LICENSE = "MIT"
7 7
diff --git a/meta/recipes-sato/images/core-image-sato-dev.bb b/meta/recipes-sato/images/core-image-sato-dev.bb
index 5ee9a04f36..7fa69d0997 100644
--- a/meta/recipes-sato/images/core-image-sato-dev.bb
+++ b/meta/recipes-sato/images/core-image-sato-dev.bb
@@ -1,9 +1,7 @@
1require core-image-sato.bb
2
1DESCRIPTION = "Image with Sato for development work. It includes everything \ 3DESCRIPTION = "Image with Sato for development work. It includes everything \
2within core-image-sato plus a native toolchain, application development and \ 4within core-image-sato plus a native toolchain, application development and \
3testing libraries, profiling and debug symbols." 5testing libraries, profiling and debug symbols."
4 6
5IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES} dev-pkgs" 7IMAGE_FEATURES += "dev-pkgs"
6
7LICENSE = "MIT"
8
9inherit core-image
diff --git a/meta/recipes-sato/images/core-image-sato-sdk.bb b/meta/recipes-sato/images/core-image-sato-sdk.bb
index 18ed0cd192..1caca402f6 100644
--- a/meta/recipes-sato/images/core-image-sato-sdk.bb
+++ b/meta/recipes-sato/images/core-image-sato-sdk.bb
@@ -1,13 +1,11 @@
1require core-image-sato.bb
2
1DESCRIPTION = "Image with Sato support that includes everything within \ 3DESCRIPTION = "Image with Sato support that includes everything within \
2core-image-sato plus meta-toolchain, development headers and libraries to \ 4core-image-sato plus meta-toolchain, development headers and libraries to \
3form a standalone SDK." 5form a standalone SDK."
4 6
5IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES} dev-pkgs tools-sdk qt4-pkgs \ 7IMAGE_FEATURES += "dev-pkgs tools-sdk qt4-pkgs \
6 tools-debug tools-profile tools-testapps debug-tweaks ssh-server-openssh" 8 tools-debug tools-profile tools-testapps debug-tweaks ssh-server-openssh"
7 9
8LICENSE = "MIT"
9
10inherit core-image
11
12IMAGE_INSTALL += "kernel-dev" 10IMAGE_INSTALL += "kernel-dev"
13 11
diff --git a/meta/recipes-sato/images/core-image-sato.bb b/meta/recipes-sato/images/core-image-sato.bb
index c228a35eb0..4bbf099c43 100644
--- a/meta/recipes-sato/images/core-image-sato.bb
+++ b/meta/recipes-sato/images/core-image-sato.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Image with Sato, a mobile environment and visual style for \
2mobile devices. The image supports X11 with a Sato theme, Pimlico \ 2mobile devices. The image supports X11 with a Sato theme, Pimlico \
3applications, and contains terminal, editor, and file manager." 3applications, and contains terminal, editor, and file manager."
4 4
5IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES}" 5IMAGE_FEATURES += "apps-console-core package-management x11-base apps-x11-core apps-x11-games x11-sato ssh-server-dropbear"
6 6
7LICENSE = "MIT" 7LICENSE = "MIT"
8 8