diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-core/images/core-image-core.bb | 2 | ||||
-rw-r--r-- | meta/recipes-core/images/core-image-minimal-dev.bb | 3 | ||||
-rw-r--r-- | meta/recipes-core/images/core-image-minimal-initramfs.bb | 6 | ||||
-rw-r--r-- | meta/recipes-core/images/core-image-minimal-mtdutils.bb | 6 | ||||
-rw-r--r-- | meta/recipes-core/images/self-hosted-image.bb | 1 | ||||
-rw-r--r-- | meta/recipes-extended/images/core-image-lsb-dev.bb | 6 | ||||
-rw-r--r-- | meta/recipes-extended/images/core-image-lsb-sdk.bb | 6 | ||||
-rw-r--r-- | meta/recipes-extended/images/core-image-lsb.bb | 3 | ||||
-rw-r--r-- | meta/recipes-qt/images/qt4e-demo-image.bb | 1 | ||||
-rw-r--r-- | meta/recipes-rt/images/core-image-rt-sdk.bb | 4 | ||||
-rw-r--r-- | meta/recipes-rt/images/core-image-rt.bb | 3 | ||||
-rw-r--r-- | meta/recipes-sato/images/core-image-sato-dev.bb | 6 | ||||
-rw-r--r-- | meta/recipes-sato/images/core-image-sato-sdk.bb | 6 | ||||
-rw-r--r-- | meta/recipes-sato/images/core-image-sato.bb | 5 |
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 2d768e0b78..ae32be8b48 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 | # |
4 | DESCRIPTION = "An X11 image with simple applications such as terminal, editor \ | 4 | DESCRIPTION = "An X11 image with simple applications such as terminal, editor, \ |
5 | and file manager." | 5 | and file manager." |
6 | 6 | ||
7 | IMAGE_FEATURES += "apps-console-core ${X11_IMAGE_FEATURES}" | 7 | IMAGE_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 3a0a1879ec..67c7790f00 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 | # |
4 | DESCRIPTION = "A core-image-minimal image suitable for development work." | 4 | DESCRIPTION = "A small image just capable of allowing a device to boot and \ |
5 | is suitable for development work." | ||
5 | 6 | ||
6 | IMAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE}" | 7 | IMAGE_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 85b9ff9b3f..4aeb6188f7 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. |
2 | DESCRIPTION = "A core-image-minimal image that has the Minimal RAM-based \ | 2 | DESCRIPTION = "Small image capable of booting a device. The kernel includes \ |
3 | Initial Root Filesystem (initramfs) as part of the kernel, which allows the \ | 3 | the Minimal RAM-based Initial Root Filesystem (initramfs), which finds the \ |
4 | system to find the first 'init' program more efficiently." | 4 | first “init” program more efficiently." |
5 | 5 | ||
6 | IMAGE_INSTALL = "initramfs-live-boot initramfs-live-install busybox udev base-passwd" | 6 | IMAGE_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 df2fab1f2c..331f16ca97 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 | # |
4 | require core-image-minimal.bb | 4 | require core-image-minimal.bb |
5 | 5 | ||
6 | DESCRIPTION = "A core-image-minimal image that supports the Minimal MTD \ | 6 | DESCRIPTION = "Small image capable of booting a device with support for the \ |
7 | Utilities, which let the user interact with the MTD subsystem in the kernel \ | 7 | Minimal MTD Utilities, which let the user interact with the MTD subsystem in \ |
8 | to perform operations on flash devices." | 8 | the kernel to perform operations on flash devices." |
9 | 9 | ||
10 | IMAGE_INSTALL += "mtd-utils" | 10 | IMAGE_INSTALL += "mtd-utils" |
diff --git a/meta/recipes-core/images/self-hosted-image.bb b/meta/recipes-core/images/self-hosted-image.bb index 1db6a7a3b2..cf3ef5fd24 100644 --- a/meta/recipes-core/images/self-hosted-image.bb +++ b/meta/recipes-core/images/self-hosted-image.bb | |||
@@ -1,3 +1,4 @@ | |||
1 | DESCRIPTION = "Version 1.0-r6 of the self-hosted image." | ||
1 | IMAGE_INSTALL = "task-core-boot task-core-apps-console task-core-ssh-openssh task-self-hosted" | 2 | IMAGE_INSTALL = "task-core-boot task-core-apps-console task-core-ssh-openssh task-self-hosted" |
2 | 3 | ||
3 | LICENSE = "MIT" | 4 | LICENSE = "MIT" |
diff --git a/meta/recipes-extended/images/core-image-lsb-dev.bb b/meta/recipes-extended/images/core-image-lsb-dev.bb index e6d7bc9d47..3bb78003af 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 @@ | |||
1 | DESCRIPTION = "A core-image-lsb that includes everything in meta-toolchain \ | 1 | DESCRIPTION = "Basic image without X support suitable for development work. It \ |
2 | but also includes development headers and libraries to form a complete \ | 2 | can be used for customization and implementations that conform to Linux \ |
3 | standalone SDK." | 3 | Standard Base (LSB)." |
4 | 4 | ||
5 | IMAGE_FEATURES += "apps-console-core dev-pkgs ssh-server-openssh" | 5 | IMAGE_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 08928913f0..32a5077e38 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 @@ | |||
1 | DESCRIPTION = "A core-image-lsb that includes everything in meta-toolchain \ | 1 | DESCRIPTION = "Basic image without X support suitable for Linux Standard Base \ |
2 | but also includes development headers and libraries to form a complete \ | 2 | (LSB) implementations. It includes the full meta-toolchain, plus development \ |
3 | standalone SDK." | 3 | headers and libraries to form a standalone SDK." |
4 | 4 | ||
5 | IMAGE_FEATURES += "apps-console-core tools-sdk dev-pkgs ssh-server-openssh" | 5 | IMAGE_FEATURES += "apps-console-core tools-sdk dev-pkgs ssh-server-openssh" |
6 | EXTRA_IMAGE_FEATURES = "tools-debug tools-profile tools-testapps debug-tweaks" | 6 | EXTRA_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 b0a3a4dfa0..b370d49c58 100644 --- a/meta/recipes-extended/images/core-image-lsb.bb +++ b/meta/recipes-extended/images/core-image-lsb.bb | |||
@@ -1,4 +1,5 @@ | |||
1 | DESCRIPTION = "A core-image-basic image suitable for implementations that \ | 1 | DESCRIPTION = "A foundational basic image without support for X that can be \ |
2 | reasonably used for customization and is suitable for implementations that \ | ||
2 | conform to Linux Standard Base (LSB)." | 3 | conform to Linux Standard Base (LSB)." |
3 | 4 | ||
4 | IMAGE_FEATURES += "apps-console-core ssh-server-openssh" | 5 | IMAGE_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 2e50bf6029..6c0dc70853 100644 --- a/meta/recipes-qt/images/qt4e-demo-image.bb +++ b/meta/recipes-qt/images/qt4e-demo-image.bb | |||
@@ -1,3 +1,4 @@ | |||
1 | DESCRIPTION = "Version 1.0-r1 of the qtr3-demo-image." | ||
1 | LICENSE = "MIT" | 2 | LICENSE = "MIT" |
2 | PR="r1" | 3 | PR="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 6e983433aa..5a67eebbce 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 | ||
5 | DESCRIPTION = "Real-Time Linux Image with SDK support" | 5 | DESCRIPTION = "Small image capable of booting a device with a test suite and \ |
6 | tools for real-time use. It includes the full meta-toolchain, development \ | ||
7 | headers and libraries to form a standalone SDK." | ||
6 | DEPENDS = "linux-yocto-rt" | 8 | DEPENDS = "linux-yocto-rt" |
7 | 9 | ||
8 | require recipes-core/images/core-image-minimal.bb | 10 | require 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 e11f159f7a..ef547a64af 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 | ||
5 | DESCRIPTION = "Real-Time Linux Image" | 5 | DESCRIPTION = "A small image just capable of allowing a device to boot plus a \ |
6 | real-time test suite and tools appropriate for real-time use." | ||
6 | DEPENDS = "linux-yocto-rt" | 7 | DEPENDS = "linux-yocto-rt" |
7 | 8 | ||
8 | require recipes-core/images/core-image-minimal.bb | 9 | require 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 b30447c583..bd3172782e 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 | # |
4 | DESCRIPTION = "A core-image-sato image suitable for development that also \ | 4 | DESCRIPTION = "Image with Sato for development work. It includes everything \ |
5 | includes a native toolchain and libraries needed to build applications on the \ | 5 | within core-image-sato plus a native toolchain, application development and \ |
6 | device itself." | 6 | testing libraries, profiling and debug symbols." |
7 | 7 | ||
8 | IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES} dev-pkgs" | 8 | IMAGE_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 2cf8cadea7..6dfd470f66 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 | # |
4 | DESCRIPTION = "A core-image-sato image that includes everything in \ | 4 | DESCRIPTION = "Image with Sato support that includes everything within \ |
5 | meta-toolchain. The image also includes development headers and libraries \ | 5 | core-image-sato plus meta-toolchain, development headers and libraries to \ |
6 | to form a complete standalone SDK." | 6 | form a standalone SD." |
7 | 7 | ||
8 | IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES} dev-pkgs tools-sdk qt4-pkgs" | 8 | IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES} dev-pkgs tools-sdk qt4-pkgs" |
9 | EXTRA_IMAGE_FEATURES += "tools-debug tools-profile tools-testapps debug-tweaks" | 9 | EXTRA_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 11c3318001..b6c51fb405 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 | # |
4 | DESCRIPTION = "An image with Sato support, a mobile environment and visual \ | 4 | DESCRIPTION = "Image with Sato, a mobile environment and visual style for \ |
5 | style that works well with mobile devices." | 5 | mobile devices. The image supports X11 with a Sato theme, Pimlico \ |
6 | applications, and contains terminal, editor, and file manager." | ||
6 | 7 | ||
7 | IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES}" | 8 | IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES}" |
8 | 9 | ||