From 82c905dc58a36aeae40b1b273a12f63fb1973cf4 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 13 Apr 2020 13:39:40 -0500 Subject: meta-openembedded and poky: subtree updates Squash of the following due to dependencies among them and OpenBMC changes: meta-openembedded: subtree update:d0748372d2..9201611135 meta-openembedded: subtree update:9201611135..17fd382f34 poky: subtree update:9052e5b32a..2e11d97b6c poky: subtree update:2e11d97b6c..a8544811d7 The change log was too large for the jenkins plugin to handle therefore it has been removed. Here is the first and last commit of each subtree: meta-openembedded:d0748372d2 cppzmq: bump to version 4.6.0 meta-openembedded:17fd382f34 mpv: Remove X11 dependency poky:9052e5b32a package_ipk: Remove pointless comment to trigger rebuild poky:a8544811d7 pbzip2: Fix license warning Change-Id: If0fc6c37629642ee207a4ca2f7aa501a2c673cd6 Signed-off-by: Andrew Geissler --- poky/meta/recipes-sato/images/core-image-sato-ptest-fast.bb | 3 +++ poky/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb | 8 +++++--- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'poky/meta/recipes-sato/images') diff --git a/poky/meta/recipes-sato/images/core-image-sato-ptest-fast.bb b/poky/meta/recipes-sato/images/core-image-sato-ptest-fast.bb index b794a7dc9..364121730 100644 --- a/poky/meta/recipes-sato/images/core-image-sato-ptest-fast.bb +++ b/poky/meta/recipes-sato/images/core-image-sato-ptest-fast.bb @@ -14,3 +14,6 @@ IMAGE_ROOTFS_EXTRA_SPACE = "1524288" # ptests need more memory than standard to avoid the OOM killer QB_MEM = "-m 1024" + +# Sadly at the moment the fast set of ptests is not robust enough and sporadically fails in a couple of places +PTEST_EXPECT_FAILURE = "1" diff --git a/poky/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb b/poky/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb index ff297fe32..bf749acd7 100644 --- a/poky/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb +++ b/poky/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb @@ -3,8 +3,6 @@ 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 @@ -18,4 +16,8 @@ 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" +# also lttng-tools needs /tmp that has at least 1G +QB_MEM = "-m 2048" + +# Sadly at the moment the full set of ptests is not robust enough and sporadically fails in random places +PTEST_EXPECT_FAILURE = "1" -- cgit v1.2.3