From 63099553f607b34732ad0903651cf97fbebdc46f Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Mon, 17 Jan 2022 00:21:50 +0800 Subject: multilib.bbclass: set rpm file color for 32-bit multilib image The default rpm file color is 2 that Elf64 is preferred according to OE-Core commit 56fa74497393a10f751d01c600c1936761e00294. For 32-bit multilib image such as lib32-core-image-sato, Elf32 should be preferred. Set it in multilib.bbclass. (From OE-Core rev: 195f4a648251e53ed3070e060ad3e3f3832793e3) Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/classes/multilib.bbclass | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'meta/classes/multilib.bbclass') diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass index 73ad2ab7b3..4a3e582816 100644 --- a/meta/classes/multilib.bbclass +++ b/meta/classes/multilib.bbclass @@ -92,6 +92,10 @@ multilib_virtclass_handler[eventmask] = "bb.event.RecipePreFinalise" python __anonymous () { if bb.data.inherits_class('image', d): + # set rpm preferred file color for 32-bit multilib image + if d.getVar("SITEINFO_BITS") == "32": + d.setVar("RPM_PREFER_ELF_ARCH", "1") + variant = d.getVar("BBEXTENDVARIANT") import oe.classextend -- cgit v1.2.3-54-g00ecf