diff options
Diffstat (limited to 'meta/recipes-sato/images')
-rw-r--r-- | meta/recipes-sato/images/core-image-sato-dev.bb | 1 | ||||
-rw-r--r-- | meta/recipes-sato/images/core-image-sato-ptest-fast.bb | 16 | ||||
-rw-r--r-- | meta/recipes-sato/images/core-image-sato-sdk-ptest.bb | 21 | ||||
-rw-r--r-- | meta/recipes-sato/images/core-image-sato-sdk.bb | 4 | ||||
-rw-r--r-- | meta/recipes-sato/images/core-image-sato.bb | 9 |
5 files changed, 11 insertions, 40 deletions
diff --git a/meta/recipes-sato/images/core-image-sato-dev.bb b/meta/recipes-sato/images/core-image-sato-dev.bb index 7fa69d0997..f45a83273c 100644 --- a/meta/recipes-sato/images/core-image-sato-dev.bb +++ b/meta/recipes-sato/images/core-image-sato-dev.bb @@ -3,5 +3,6 @@ require core-image-sato.bb DESCRIPTION = "Image with Sato for development work. It includes everything \ within core-image-sato plus a native toolchain, application development and \ testing libraries, profiling and debug symbols." +HOMEPAGE = "https://www.yoctoproject.org/" IMAGE_FEATURES += "dev-pkgs" diff --git a/meta/recipes-sato/images/core-image-sato-ptest-fast.bb b/meta/recipes-sato/images/core-image-sato-ptest-fast.bb deleted file mode 100644 index b794a7dc9e..0000000000 --- a/meta/recipes-sato/images/core-image-sato-ptest-fast.bb +++ /dev/null @@ -1,16 +0,0 @@ -require core-image-sato-sdk.bb -require conf/distro/include/ptest-packagelists.inc - -IMAGE_INSTALL += "${PTESTS_FAST}" - -DESCRIPTION += "Also includes ptest packages with fast execution times to allow for more automated QA." - -# This image is sufficiently large (~1.8GB) that it can't actually fit in a live -# image (which has a 4GB limit), so nullify the overhead factor (1.3x out of the -# box) and explicitly add just 1500MB. -# strace-ptest in particular needs more than 500MB -IMAGE_OVERHEAD_FACTOR = "1.0" -IMAGE_ROOTFS_EXTRA_SPACE = "1524288" - -# ptests need more memory than standard to avoid the OOM killer -QB_MEM = "-m 1024" diff --git a/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb b/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb deleted file mode 100644 index ff297fe324..0000000000 --- a/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb +++ /dev/null @@ -1,21 +0,0 @@ -require core-image-sato-sdk.bb -require conf/distro/include/ptest-packagelists.inc - -DESCRIPTION += "Also includes ptest packages." - -IMAGE_FEATURES += "ptest-pkgs" - -PROVIDES += "core-image-sato-ptest" - -# Also include ptests which may not otherwise be included in a sato image -IMAGE_INSTALL += "${PTESTS_FAST} ${PTESTS_SLOW}" - -# This image is sufficiently large (~1.8GB) that we need to be careful that it fits in a live -# image (which has a 4GB limit), so nullify the overhead factor (1.3x out of the -# box) and explicitly add just 1100MB. -# strace-ptest in particular needs more than 500MB -IMAGE_OVERHEAD_FACTOR = "1.0" -IMAGE_ROOTFS_EXTRA_SPACE = "1124288" - -# ptests need more memory than standard to avoid the OOM killer -QB_MEM = "-m 1024" diff --git a/meta/recipes-sato/images/core-image-sato-sdk.bb b/meta/recipes-sato/images/core-image-sato-sdk.bb index d7cc52b52b..afab473b52 100644 --- a/meta/recipes-sato/images/core-image-sato-sdk.bb +++ b/meta/recipes-sato/images/core-image-sato-sdk.bb @@ -3,9 +3,13 @@ require core-image-sato.bb DESCRIPTION = "Image with Sato support that includes everything within \ core-image-sato plus meta-toolchain, development headers and libraries to \ form a standalone SDK." +HOMEPAGE = "https://www.yoctoproject.org/" IMAGE_FEATURES += "dev-pkgs tools-sdk \ tools-debug eclipse-debug tools-profile tools-testapps debug-tweaks ssh-server-openssh" IMAGE_INSTALL += "kernel-devsrc" +# Compiling stuff, specifically SystemTap probes, can require lots of memory +# See https://bugzilla.yoctoproject.org/show_bug.cgi?id=14673 +QB_MEM = "-m 768" diff --git a/meta/recipes-sato/images/core-image-sato.bb b/meta/recipes-sato/images/core-image-sato.bb index 673106eb6d..9200ae5440 100644 --- a/meta/recipes-sato/images/core-image-sato.bb +++ b/meta/recipes-sato/images/core-image-sato.bb @@ -1,6 +1,8 @@ +SUMMARY = "Image with Sato, a mobile environment and visual style for mobile devices." DESCRIPTION = "Image with Sato, a mobile environment and visual style for \ mobile devices. The image supports X11 with a Sato theme, Pimlico \ applications, and contains terminal, editor, and file manager." +HOMEPAGE = "https://www.yoctoproject.org/" IMAGE_FEATURES += "splash package-management x11-base x11-sato ssh-server-dropbear hwcodecs" @@ -8,8 +10,9 @@ LICENSE = "MIT" inherit core-image -TOOLCHAIN_HOST_TASK_append = " nativesdk-intltool nativesdk-glib-2.0" -TOOLCHAIN_HOST_TASK_remove_task-populate-sdk-ext = " nativesdk-intltool nativesdk-glib-2.0" +TOOLCHAIN_HOST_TASK:append = " nativesdk-intltool nativesdk-glib-2.0" +TOOLCHAIN_HOST_TASK:remove:task-populate-sdk-ext = " nativesdk-intltool nativesdk-glib-2.0" QB_MEM = '${@bb.utils.contains("DISTRO_FEATURES", "opengl", "-m 512", "-m 256", d)}' -QB_MEM_qemumips = "-m 256" +QB_MEM:qemuarmv5 = "-m 256" +QB_MEM:qemumips = "-m 256" |