diff options
| author | Jason M. Bills <jason.m.bills@intel.com> | 2022-01-06 23:59:39 +0300 |
|---|---|---|
| committer | Jason M. Bills <jason.m.bills@intel.com> | 2022-01-06 23:59:39 +0300 |
| commit | 32777eec25d2c527a62e5ffab90a3dfef35855aa (patch) | |
| tree | 588a90a6fe9fb0b35c7ce23ea3bd79fa5151ccde /poky/meta/recipes-core/images | |
| parent | 61f1ca1b31a9a1108e9e7f71e47fdc19beb0490b (diff) | |
| parent | 5cc2f81c5b66da00cad24e18b0d23442af060c3f (diff) | |
| download | openbmc-32777eec25d2c527a62e5ffab90a3dfef35855aa.tar.xz | |
Merge tag '0.86' of firmware.bmc.openbmc.yocto.openbmc into update
Diffstat (limited to 'poky/meta/recipes-core/images')
| -rw-r--r-- | poky/meta/recipes-core/images/build-appliance-image_15.0.0.bb | 2 | ||||
| -rw-r--r-- | poky/meta/recipes-core/images/core-image-ptest-all.bb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/poky/meta/recipes-core/images/build-appliance-image_15.0.0.bb b/poky/meta/recipes-core/images/build-appliance-image_15.0.0.bb index 17e06a056..86dc69129 100644 --- a/poky/meta/recipes-core/images/build-appliance-image_15.0.0.bb +++ b/poky/meta/recipes-core/images/build-appliance-image_15.0.0.bb @@ -24,7 +24,7 @@ IMAGE_FSTYPES = "wic.vmdk wic.vhd wic.vhdx" inherit core-image setuptools3 -SRCREV ?= "75f491e5e20bd0aade764ea5bd15f547fafb7684" +SRCREV ?= "98dcd17a5c6c3c6ac3f542b47e358c714f88af6a" SRC_URI = "git://git.yoctoproject.org/poky \ file://Yocto_Build_Appliance.vmx \ file://Yocto_Build_Appliance.vmxf \ diff --git a/poky/meta/recipes-core/images/core-image-ptest-all.bb b/poky/meta/recipes-core/images/core-image-ptest-all.bb index c1d6aa28a..147245167 100644 --- a/poky/meta/recipes-core/images/core-image-ptest-all.bb +++ b/poky/meta/recipes-core/images/core-image-ptest-all.bb @@ -18,8 +18,8 @@ IMAGE_OVERHEAD_FACTOR = "1.0" IMAGE_ROOTFS_EXTRA_SPACE = "1124288" # ptests need more memory than standard to avoid the OOM killer -# also lttng-tools needs /tmp that has at least 1G -QB_MEM = "-m 2048" +# also lttng-tools needs /tmp that has at least 2G +QB_MEM = "-m 4096" # Sadly at the moment the full set of ptests is not robust enough and sporadically fails in random places PTEST_EXPECT_FAILURE = "1" |