Previously, to satisfy opengl's requirement for at least 512MB of memory, QB_MEM was overriden by core-image-sato. This made it impossible for machine configurations to specify their own values, so this clause was moved to qemuboot instead and rewritten as a default to allow other recipes to state their own values if needed.
Signed-off-by: Brett Warren <[email protected]> --- meta/classes/qemuboot.bbclass | 2 +- meta/recipes-sato/images/core-image-sato.bb | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/meta/classes/qemuboot.bbclass b/meta/classes/qemuboot.bbclass index d8f62ef6ea..3a51fc5b5e 100644 --- a/meta/classes/qemuboot.bbclass +++ b/meta/classes/qemuboot.bbclass @@ -73,7 +73,7 @@ # IMAGE_CLASSES += "qemuboot" # See "runqemu help" for more info -QB_MEM ?= "-m 256" +QB_MEM ?= '${@bb.utils.contains("DISTRO_FEATURES", "opengl", "-m 512", "-m 256", d)}' QB_SERIAL_OPT ?= "-serial mon:stdio -serial null" QB_DEFAULT_KERNEL ?= "${KERNEL_IMAGETYPE}" QB_DEFAULT_FSTYPE ?= "ext4" diff --git a/meta/recipes-sato/images/core-image-sato.bb b/meta/recipes-sato/images/core-image-sato.bb index 673106eb6d..640313d6f7 100644 --- a/meta/recipes-sato/images/core-image-sato.bb +++ b/meta/recipes-sato/images/core-image-sato.bb @@ -11,5 +11,4 @@ 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)}' QB_MEM_qemumips = "-m 256" -- 2.17.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#142994): https://lists.openembedded.org/g/openembedded-core/message/142994 Mute This Topic: https://lists.openembedded.org/mt/77239203/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
