From 3f5c70649a9aaa13ef755ea57576d2bd6d9d2e60 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 20 Aug 2019 17:32:10 +0200 Subject: images: use 512M of RAM in qemu if 'opengl" is in DISTRO_FEATURES 256M was found to be no longer sufficient, as the X server fails to start with the modesetting driver and 3D enabled. Only images that actually include X11 are adjusted. (From OE-Core rev: 9dd0812acc73287287b48d28e0935baf7f545b58) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-core/images/build-appliance-image_15.0.0.bb | 2 ++ meta/recipes-graphics/images/core-image-clutter.bb | 2 ++ meta/recipes-graphics/images/core-image-x11.bb | 2 ++ meta/recipes-sato/images/core-image-sato.bb | 2 ++ 4 files changed, 8 insertions(+) diff --git a/meta/recipes-core/images/build-appliance-image_15.0.0.bb b/meta/recipes-core/images/build-appliance-image_15.0.0.bb index e9cac98c57..3f1b1c7a5e 100644 --- a/meta/recipes-core/images/build-appliance-image_15.0.0.bb +++ b/meta/recipes-core/images/build-appliance-image_15.0.0.bb @@ -11,6 +11,8 @@ IMAGE_INSTALL = "packagegroup-core-boot packagegroup-core-ssh-openssh packagegro IMAGE_FEATURES += "x11-base package-management splash" +QB_MEM = '${@bb.utils.contains("DISTRO_FEATURES", "opengl", "-m 512", "-m 256", d)}' + # Ensure there's enough space to do a core-image-sato build, with rm_work enabled IMAGE_ROOTFS_EXTRA_SPACE = "41943040" diff --git a/meta/recipes-graphics/images/core-image-clutter.bb b/meta/recipes-graphics/images/core-image-clutter.bb index b0f25cf1b1..a594461022 100644 --- a/meta/recipes-graphics/images/core-image-clutter.bb +++ b/meta/recipes-graphics/images/core-image-clutter.bb @@ -11,3 +11,5 @@ IMAGE_INSTALL = "\ " inherit core-image + +QB_MEM = '${@bb.utils.contains("DISTRO_FEATURES", "opengl", "-m 512", "-m 256", d)}' diff --git a/meta/recipes-graphics/images/core-image-x11.bb b/meta/recipes-graphics/images/core-image-x11.bb index 8455bb8cae..cd5374949d 100644 --- a/meta/recipes-graphics/images/core-image-x11.bb +++ b/meta/recipes-graphics/images/core-image-x11.bb @@ -7,3 +7,5 @@ LICENSE = "MIT" inherit core-image distro_features_check REQUIRED_DISTRO_FEATURES = "x11" + +QB_MEM = '${@bb.utils.contains("DISTRO_FEATURES", "opengl", "-m 512", "-m 256", d)}' diff --git a/meta/recipes-sato/images/core-image-sato.bb b/meta/recipes-sato/images/core-image-sato.bb index b897950285..878e0eaa8d 100644 --- a/meta/recipes-sato/images/core-image-sato.bb +++ b/meta/recipes-sato/images/core-image-sato.bb @@ -10,3 +10,5 @@ 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" + +QB_MEM = '${@bb.utils.contains("DISTRO_FEATURES", "opengl", "-m 512", "-m 256", d)}' -- cgit v1.2.3-54-g00ecf