summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2021-04-23 20:02:48 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-04-27 15:11:47 +0100
commitf66d90a06fb8f8d0c0e108933c53b0d4126f7c10 (patch)
tree62135b58cb238ffb739eb0851ac0638e6eea0b13
parent73bdeae2fca632e2ab50166632059f11fc259ac8 (diff)
downloadpoky-f66d90a06fb8f8d0c0e108933c53b0d4126f7c10.tar.gz
core-image-weston: add sdk/ptest images
This is the first step towards rebasing the AB matrix from sato to weston; the eventual goal is to keep sato only in core-image-sato image. The broader rationale is that X11 is effectively deprecated technology at this point with only minimal maintenance; standalone X server will not be developed any further, and all attention currently is towards making it work well under Wayland. I believe YP should be defaulting to Wayland and not X11. (From OE-Core rev: 3a6996f87a9e32f2e6e668dce98f77d0b40fceb8) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/distro/include/maintainers.inc3
-rw-r--r--meta/recipes-graphics/images/core-image-weston-ptest-all.bb21
-rw-r--r--meta/recipes-graphics/images/core-image-weston-ptest-fast.bb20
-rw-r--r--meta/recipes-graphics/images/core-image-weston-sdk.bb11
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.
117RECIPE_MAINTAINER_pn-core-image-testmaster = "Richard Purdie <richard.purdie@linuxfoundation.org>" 117RECIPE_MAINTAINER_pn-core-image-testmaster = "Richard Purdie <richard.purdie@linuxfoundation.org>"
118RECIPE_MAINTAINER_pn-core-image-clutter = "Richard Purdie <richard.purdie@linuxfoundation.org>" 118RECIPE_MAINTAINER_pn-core-image-clutter = "Richard Purdie <richard.purdie@linuxfoundation.org>"
119RECIPE_MAINTAINER_pn-core-image-weston = "Richard Purdie <richard.purdie@linuxfoundation.org>" 119RECIPE_MAINTAINER_pn-core-image-weston = "Richard Purdie <richard.purdie@linuxfoundation.org>"
120RECIPE_MAINTAINER_pn-core-image-weston-ptest-all = "Richard Purdie <richard.purdie@linuxfoundation.org>"
121RECIPE_MAINTAINER_pn-core-image-weston-ptest-fast = "Richard Purdie <richard.purdie@linuxfoundation.org>"
122RECIPE_MAINTAINER_pn-core-image-weston-sdk = "Richard Purdie <richard.purdie@linuxfoundation.org>"
120RECIPE_MAINTAINER_pn-core-image-x11 = "Richard Purdie <richard.purdie@linuxfoundation.org>" 123RECIPE_MAINTAINER_pn-core-image-x11 = "Richard Purdie <richard.purdie@linuxfoundation.org>"
121RECIPE_MAINTAINER_pn-core-image-sato-dev = "Richard Purdie <richard.purdie@linuxfoundation.org>" 124RECIPE_MAINTAINER_pn-core-image-sato-dev = "Richard Purdie <richard.purdie@linuxfoundation.org>"
122RECIPE_MAINTAINER_pn-core-image-sato-ptest-fast = "Richard Purdie <richard.purdie@linuxfoundation.org>" 125RECIPE_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 @@
1require core-image-weston-sdk.bb
2require conf/distro/include/ptest-packagelists.inc
3
4DESCRIPTION += "Also includes ptest packages."
5
6# Include the full set of ptests
7IMAGE_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
13IMAGE_OVERHEAD_FACTOR = "1.0"
14IMAGE_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
18QB_MEM = "-m 2048"
19
20# Sadly at the moment the full set of ptests is not robust enough and sporadically fails in random places
21PTEST_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 @@
1require core-image-weston-sdk.bb
2require conf/distro/include/ptest-packagelists.inc
3
4# Include only fast (< 30 sec) ptests
5IMAGE_INSTALL += "${PTESTS_FAST}"
6
7DESCRIPTION += "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
13IMAGE_OVERHEAD_FACTOR = "1.0"
14IMAGE_ROOTFS_EXTRA_SPACE = "1524288"
15
16# ptests need more memory than standard to avoid the OOM killer
17QB_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
20PTEST_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 @@
1require core-image-weston.bb
2
3DESCRIPTION = "Image with Weston support that includes everything within \
4core-image-weston plus meta-toolchain, development headers and libraries to \
5form a standalone SDK."
6
7IMAGE_FEATURES += "dev-pkgs tools-sdk \
8 tools-debug eclipse-debug tools-profile tools-testapps debug-tweaks ssh-server-openssh"
9
10IMAGE_INSTALL += "kernel-devsrc"
11