diff options
4 files changed, 55 insertions, 0 deletions
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 4eb1dcb0d5..0766205d2f 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc | |||
@@ -117,6 +117,9 @@ RECIPE_MAINTAINER_pn-core-image-testmaster-initramfs = "Richard Purdie <richard. | |||
117 | RECIPE_MAINTAINER_pn-core-image-testmaster = "Richard Purdie <richard.purdie@linuxfoundation.org>" | 117 | RECIPE_MAINTAINER_pn-core-image-testmaster = "Richard Purdie <richard.purdie@linuxfoundation.org>" |
118 | RECIPE_MAINTAINER_pn-core-image-clutter = "Richard Purdie <richard.purdie@linuxfoundation.org>" | 118 | RECIPE_MAINTAINER_pn-core-image-clutter = "Richard Purdie <richard.purdie@linuxfoundation.org>" |
119 | RECIPE_MAINTAINER_pn-core-image-weston = "Richard Purdie <richard.purdie@linuxfoundation.org>" | 119 | RECIPE_MAINTAINER_pn-core-image-weston = "Richard Purdie <richard.purdie@linuxfoundation.org>" |
120 | RECIPE_MAINTAINER_pn-core-image-weston-ptest-all = "Richard Purdie <richard.purdie@linuxfoundation.org>" | ||
121 | RECIPE_MAINTAINER_pn-core-image-weston-ptest-fast = "Richard Purdie <richard.purdie@linuxfoundation.org>" | ||
122 | RECIPE_MAINTAINER_pn-core-image-weston-sdk = "Richard Purdie <richard.purdie@linuxfoundation.org>" | ||
120 | RECIPE_MAINTAINER_pn-core-image-x11 = "Richard Purdie <richard.purdie@linuxfoundation.org>" | 123 | RECIPE_MAINTAINER_pn-core-image-x11 = "Richard Purdie <richard.purdie@linuxfoundation.org>" |
121 | RECIPE_MAINTAINER_pn-core-image-sato-dev = "Richard Purdie <richard.purdie@linuxfoundation.org>" | 124 | RECIPE_MAINTAINER_pn-core-image-sato-dev = "Richard Purdie <richard.purdie@linuxfoundation.org>" |
122 | RECIPE_MAINTAINER_pn-core-image-sato-ptest-fast = "Richard Purdie <richard.purdie@linuxfoundation.org>" | 125 | RECIPE_MAINTAINER_pn-core-image-sato-ptest-fast = "Richard Purdie <richard.purdie@linuxfoundation.org>" |
diff --git a/meta/recipes-graphics/images/core-image-weston-ptest-all.bb b/meta/recipes-graphics/images/core-image-weston-ptest-all.bb new file mode 100644 index 0000000000..a622779e6a --- /dev/null +++ b/meta/recipes-graphics/images/core-image-weston-ptest-all.bb | |||
@@ -0,0 +1,21 @@ | |||
1 | require core-image-weston-sdk.bb | ||
2 | require conf/distro/include/ptest-packagelists.inc | ||
3 | |||
4 | DESCRIPTION += "Also includes ptest packages." | ||
5 | |||
6 | # Include the full set of ptests | ||
7 | IMAGE_INSTALL += "${PTESTS_FAST} ${PTESTS_SLOW}" | ||
8 | |||
9 | # This image is sufficiently large (~1.8GB) that we need to be careful that it fits in a live | ||
10 | # image (which has a 4GB limit), so nullify the overhead factor (1.3x out of the | ||
11 | # box) and explicitly add just 1100MB. | ||
12 | # strace-ptest in particular needs more than 500MB | ||
13 | IMAGE_OVERHEAD_FACTOR = "1.0" | ||
14 | IMAGE_ROOTFS_EXTRA_SPACE = "1124288" | ||
15 | |||
16 | # ptests need more memory than standard to avoid the OOM killer | ||
17 | # also lttng-tools needs /tmp that has at least 1G | ||
18 | QB_MEM = "-m 2048" | ||
19 | |||
20 | # Sadly at the moment the full set of ptests is not robust enough and sporadically fails in random places | ||
21 | PTEST_EXPECT_FAILURE = "1" | ||
diff --git a/meta/recipes-graphics/images/core-image-weston-ptest-fast.bb b/meta/recipes-graphics/images/core-image-weston-ptest-fast.bb new file mode 100644 index 0000000000..df02befb66 --- /dev/null +++ b/meta/recipes-graphics/images/core-image-weston-ptest-fast.bb | |||
@@ -0,0 +1,20 @@ | |||
1 | require core-image-weston-sdk.bb | ||
2 | require conf/distro/include/ptest-packagelists.inc | ||
3 | |||
4 | # Include only fast (< 30 sec) ptests | ||
5 | IMAGE_INSTALL += "${PTESTS_FAST}" | ||
6 | |||
7 | DESCRIPTION += "Also includes ptest packages with fast execution times to allow for more automated QA." | ||
8 | |||
9 | # This image is sufficiently large (~1.8GB) that it can't actually fit in a live | ||
10 | # image (which has a 4GB limit), so nullify the overhead factor (1.3x out of the | ||
11 | # box) and explicitly add just 1500MB. | ||
12 | # strace-ptest in particular needs more than 500MB | ||
13 | IMAGE_OVERHEAD_FACTOR = "1.0" | ||
14 | IMAGE_ROOTFS_EXTRA_SPACE = "1524288" | ||
15 | |||
16 | # ptests need more memory than standard to avoid the OOM killer | ||
17 | QB_MEM = "-m 1024" | ||
18 | |||
19 | # Sadly at the moment the fast set of ptests is not robust enough and sporadically fails in a couple of places | ||
20 | PTEST_EXPECT_FAILURE = "1" | ||
diff --git a/meta/recipes-graphics/images/core-image-weston-sdk.bb b/meta/recipes-graphics/images/core-image-weston-sdk.bb new file mode 100644 index 0000000000..f5f7dade54 --- /dev/null +++ b/meta/recipes-graphics/images/core-image-weston-sdk.bb | |||
@@ -0,0 +1,11 @@ | |||
1 | require core-image-weston.bb | ||
2 | |||
3 | DESCRIPTION = "Image with Weston support that includes everything within \ | ||
4 | core-image-weston plus meta-toolchain, development headers and libraries to \ | ||
5 | form a standalone SDK." | ||
6 | |||
7 | IMAGE_FEATURES += "dev-pkgs tools-sdk \ | ||
8 | tools-debug eclipse-debug tools-profile tools-testapps debug-tweaks ssh-server-openssh" | ||
9 | |||
10 | IMAGE_INSTALL += "kernel-devsrc" | ||
11 | |||