summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-core/images/core-image-core.bb2
-rw-r--r--meta/recipes-core/images/core-image-minimal-dev.bb3
-rw-r--r--meta/recipes-core/images/core-image-minimal-initramfs.bb6
-rw-r--r--meta/recipes-core/images/core-image-minimal-mtdutils.bb6
-rw-r--r--meta/recipes-core/images/self-hosted-image.bb1
-rw-r--r--meta/recipes-extended/images/core-image-lsb-dev.bb6
-rw-r--r--meta/recipes-extended/images/core-image-lsb-sdk.bb6
-rw-r--r--meta/recipes-extended/images/core-image-lsb.bb3
-rw-r--r--meta/recipes-qt/images/qt4e-demo-image.bb1
-rw-r--r--meta/recipes-rt/images/core-image-rt-sdk.bb4
-rw-r--r--meta/recipes-rt/images/core-image-rt.bb3
-rw-r--r--meta/recipes-sato/images/core-image-sato-dev.bb6
-rw-r--r--meta/recipes-sato/images/core-image-sato-sdk.bb6
-rw-r--r--meta/recipes-sato/images/core-image-sato.bb5
14 files changed, 33 insertions, 25 deletions
diff --git a/meta/recipes-core/images/core-image-core.bb b/meta/recipes-core/images/core-image-core.bb
index 2d768e0..ae32be8 100644
--- a/meta/recipes-core/images/core-image-core.bb
+++ b/meta/recipes-core/images/core-image-core.bb
@@ -1,7 +1,7 @@
1# 1#
2# Copyright (C) 2007 OpenedHand Ltd. 2# Copyright (C) 2007 OpenedHand Ltd.
3# 3#
4DESCRIPTION = "An X11 image with simple applications such as terminal, editor \ 4DESCRIPTION = "An X11 image with simple applications such as terminal, editor, \
5and file manager." 5and file manager."
6 6
7IMAGE_FEATURES += "apps-console-core ${X11_IMAGE_FEATURES}" 7IMAGE_FEATURES += "apps-console-core ${X11_IMAGE_FEATURES}"
diff --git a/meta/recipes-core/images/core-image-minimal-dev.bb b/meta/recipes-core/images/core-image-minimal-dev.bb
index 3a0a187..67c7790 100644
--- a/meta/recipes-core/images/core-image-minimal-dev.bb
+++ b/meta/recipes-core/images/core-image-minimal-dev.bb
@@ -1,7 +1,8 @@
1# 1#
2# Copyright (C) 2007 OpenedHand Ltd. 2# Copyright (C) 2007 OpenedHand Ltd.
3# 3#
4DESCRIPTION = "A core-image-minimal image suitable for development work." 4DESCRIPTION = "A small image just capable of allowing a device to boot and \
5is suitable for development work."
5 6
6IMAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE}" 7IMAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE}"
7 8
diff --git a/meta/recipes-core/images/core-image-minimal-initramfs.bb b/meta/recipes-core/images/core-image-minimal-initramfs.bb
index 85b9ff9..4aeb618 100644
--- a/meta/recipes-core/images/core-image-minimal-initramfs.bb
+++ b/meta/recipes-core/images/core-image-minimal-initramfs.bb
@@ -1,7 +1,7 @@
1# Simple initramfs image. Mostly used for live images. 1# Simple initramfs image. Mostly used for live images.
2DESCRIPTION = "A core-image-minimal image that has the Minimal RAM-based \ 2DESCRIPTION = "Small image capable of booting a device. The kernel includes \
3Initial Root Filesystem (initramfs) as part of the kernel, which allows the \ 3the Minimal RAM-based Initial Root Filesystem (initramfs), which finds the \
4system to find the first 'init' program more efficiently." 4first init program more efficiently."
5 5
6IMAGE_INSTALL = "initramfs-live-boot initramfs-live-install busybox udev base-passwd" 6IMAGE_INSTALL = "initramfs-live-boot initramfs-live-install busybox udev base-passwd"
7 7
diff --git a/meta/recipes-core/images/core-image-minimal-mtdutils.bb b/meta/recipes-core/images/core-image-minimal-mtdutils.bb
index df2fab1..331f16c 100644
--- a/meta/recipes-core/images/core-image-minimal-mtdutils.bb
+++ b/meta/recipes-core/images/core-image-minimal-mtdutils.bb
@@ -3,8 +3,8 @@
3# 3#
4require core-image-minimal.bb 4require core-image-minimal.bb
5 5
6DESCRIPTION = "A core-image-minimal image that supports the Minimal MTD \ 6DESCRIPTION = "Small image capable of booting a device with support for the \
7Utilities, which let the user interact with the MTD subsystem in the kernel \ 7Minimal MTD Utilities, which let the user interact with the MTD subsystem in \
8to perform operations on flash devices." 8the kernel to perform operations on flash devices."
9 9
10IMAGE_INSTALL += "mtd-utils" 10IMAGE_INSTALL += "mtd-utils"
diff --git a/meta/recipes-core/images/self-hosted-image.bb b/meta/recipes-core/images/self-hosted-image.bb
index 1db6a7a..cf3ef5f 100644
--- a/meta/recipes-core/images/self-hosted-image.bb
+++ b/meta/recipes-core/images/self-hosted-image.bb
@@ -1,3 +1,4 @@
1DESCRIPTION = "Version 1.0-r6 of the self-hosted image."
1IMAGE_INSTALL = "task-core-boot task-core-apps-console task-core-ssh-openssh task-self-hosted" 2IMAGE_INSTALL = "task-core-boot task-core-apps-console task-core-ssh-openssh task-self-hosted"
2 3
3LICENSE = "MIT" 4LICENSE = "MIT"
diff --git a/meta/recipes-extended/images/core-image-lsb-dev.bb b/meta/recipes-extended/images/core-image-lsb-dev.bb
index e6d7bc9..3bb7800 100644
--- a/meta/recipes-extended/images/core-image-lsb-dev.bb
+++ b/meta/recipes-extended/images/core-image-lsb-dev.bb
@@ -1,6 +1,6 @@
1DESCRIPTION = "A core-image-lsb that includes everything in meta-toolchain \ 1DESCRIPTION = "Basic image without X support suitable for development work. It \
2but also includes development headers and libraries to form a complete \ 2can be used for customization and implementations that conform to Linux \
3standalone SDK." 3Standard Base (LSB)."
4 4
5IMAGE_FEATURES += "apps-console-core dev-pkgs ssh-server-openssh" 5IMAGE_FEATURES += "apps-console-core dev-pkgs ssh-server-openssh"
6 6
diff --git a/meta/recipes-extended/images/core-image-lsb-sdk.bb b/meta/recipes-extended/images/core-image-lsb-sdk.bb
index 0892891..32a5077 100644
--- a/meta/recipes-extended/images/core-image-lsb-sdk.bb
+++ b/meta/recipes-extended/images/core-image-lsb-sdk.bb
@@ -1,6 +1,6 @@
1DESCRIPTION = "A core-image-lsb that includes everything in meta-toolchain \ 1DESCRIPTION = "Basic image without X support suitable for Linux Standard Base \
2but also includes development headers and libraries to form a complete \ 2(LSB) implementations. It includes the full meta-toolchain, plus development \
3standalone SDK." 3headers and libraries to form a standalone SDK."
4 4
5IMAGE_FEATURES += "apps-console-core tools-sdk dev-pkgs ssh-server-openssh" 5IMAGE_FEATURES += "apps-console-core tools-sdk dev-pkgs ssh-server-openssh"
6EXTRA_IMAGE_FEATURES = "tools-debug tools-profile tools-testapps debug-tweaks" 6EXTRA_IMAGE_FEATURES = "tools-debug tools-profile tools-testapps debug-tweaks"
diff --git a/meta/recipes-extended/images/core-image-lsb.bb b/meta/recipes-extended/images/core-image-lsb.bb
index b0a3a4d..b370d49 100644
--- a/meta/recipes-extended/images/core-image-lsb.bb
+++ b/meta/recipes-extended/images/core-image-lsb.bb
@@ -1,4 +1,5 @@
1DESCRIPTION = "A core-image-basic image suitable for implementations that \ 1DESCRIPTION = "A foundational basic image without support for X that can be \
2reasonably used for customization and is suitable for implementations that \
2conform to Linux Standard Base (LSB)." 3conform to Linux Standard Base (LSB)."
3 4
4IMAGE_FEATURES += "apps-console-core ssh-server-openssh" 5IMAGE_FEATURES += "apps-console-core ssh-server-openssh"
diff --git a/meta/recipes-qt/images/qt4e-demo-image.bb b/meta/recipes-qt/images/qt4e-demo-image.bb
index 2e50bf6..6c0dc70 100644
--- a/meta/recipes-qt/images/qt4e-demo-image.bb
+++ b/meta/recipes-qt/images/qt4e-demo-image.bb
@@ -1,3 +1,4 @@
1DESCRIPTION = "Version 1.0-r1 of the qtr3-demo-image."
1LICENSE = "MIT" 2LICENSE = "MIT"
2PR="r1" 3PR="r1"
3 4
diff --git a/meta/recipes-rt/images/core-image-rt-sdk.bb b/meta/recipes-rt/images/core-image-rt-sdk.bb
index 6e98343..5a67eebb 100644
--- a/meta/recipes-rt/images/core-image-rt-sdk.bb
+++ b/meta/recipes-rt/images/core-image-rt-sdk.bb
@@ -2,7 +2,9 @@
2# Copyright (C) 2011 Intel Corporation. 2# Copyright (C) 2011 Intel Corporation.
3# 3#
4 4
5DESCRIPTION = "Real-Time Linux Image with SDK support" 5DESCRIPTION = "Small image capable of booting a device with a test suite and \
6tools for real-time use. It includes the full meta-toolchain, development \
7headers and libraries to form a standalone SDK."
6DEPENDS = "linux-yocto-rt" 8DEPENDS = "linux-yocto-rt"
7 9
8require recipes-core/images/core-image-minimal.bb 10require recipes-core/images/core-image-minimal.bb
diff --git a/meta/recipes-rt/images/core-image-rt.bb b/meta/recipes-rt/images/core-image-rt.bb
index e11f159..ef547a6 100644
--- a/meta/recipes-rt/images/core-image-rt.bb
+++ b/meta/recipes-rt/images/core-image-rt.bb
@@ -2,7 +2,8 @@
2# Copyright (C) 2010 Intel Corporation. 2# Copyright (C) 2010 Intel Corporation.
3# 3#
4 4
5DESCRIPTION = "Real-Time Linux Image" 5DESCRIPTION = "A small image just capable of allowing a device to boot plus a \
6real-time test suite and tools appropriate for real-time use."
6DEPENDS = "linux-yocto-rt" 7DEPENDS = "linux-yocto-rt"
7 8
8require recipes-core/images/core-image-minimal.bb 9require recipes-core/images/core-image-minimal.bb
diff --git a/meta/recipes-sato/images/core-image-sato-dev.bb b/meta/recipes-sato/images/core-image-sato-dev.bb
index b30447c..bd31727 100644
--- a/meta/recipes-sato/images/core-image-sato-dev.bb
+++ b/meta/recipes-sato/images/core-image-sato-dev.bb
@@ -1,9 +1,9 @@
1# 1#
2# Copyright (C) 2007 OpenedHand Ltd. 2# Copyright (C) 2007 OpenedHand Ltd.
3# 3#
4DESCRIPTION = "A core-image-sato image suitable for development that also \ 4DESCRIPTION = "Image with Sato for development work. It includes everything \
5includes a native toolchain and libraries needed to build applications on the \ 5within core-image-sato plus a native toolchain, application development and \
6device itself." 6testing libraries, profiling and debug symbols."
7 7
8IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES} dev-pkgs" 8IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES} dev-pkgs"
9 9
diff --git a/meta/recipes-sato/images/core-image-sato-sdk.bb b/meta/recipes-sato/images/core-image-sato-sdk.bb
index 2cf8cad..6dfd470 100644
--- a/meta/recipes-sato/images/core-image-sato-sdk.bb
+++ b/meta/recipes-sato/images/core-image-sato-sdk.bb
@@ -1,9 +1,9 @@
1# 1#
2# Copyright (C) 2007 OpenedHand Ltd. 2# Copyright (C) 2007 OpenedHand Ltd.
3# 3#
4DESCRIPTION = "A core-image-sato image that includes everything in \ 4DESCRIPTION = "Image with Sato support that includes everything within \
5meta-toolchain. The image also includes development headers and libraries \ 5core-image-sato plus meta-toolchain, development headers and libraries to \
6to form a complete standalone SDK." 6form a standalone SD."
7 7
8IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES} dev-pkgs tools-sdk qt4-pkgs" 8IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES} dev-pkgs tools-sdk qt4-pkgs"
9EXTRA_IMAGE_FEATURES += "tools-debug tools-profile tools-testapps debug-tweaks" 9EXTRA_IMAGE_FEATURES += "tools-debug tools-profile tools-testapps debug-tweaks"
diff --git a/meta/recipes-sato/images/core-image-sato.bb b/meta/recipes-sato/images/core-image-sato.bb
index 11c3318..b6c51fb 100644
--- a/meta/recipes-sato/images/core-image-sato.bb
+++ b/meta/recipes-sato/images/core-image-sato.bb
@@ -1,8 +1,9 @@
1# 1#
2# Copyright (C) 2007 OpenedHand Ltd. 2# Copyright (C) 2007 OpenedHand Ltd.
3# 3#
4DESCRIPTION = "An image with Sato support, a mobile environment and visual \ 4DESCRIPTION = "Image with Sato, a mobile environment and visual style for \
5style that works well with mobile devices." 5mobile devices. The image supports X11 with a Sato theme, Pimlico \
6applications, and contains terminal, editor, and file manager."
6 7
7IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES}" 8IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES}"
8 9