diff mbox series

[2/2] multilib.bbclass: set rpm file color for 32-bit multilib image

Message ID 20220116162150.23946-2-kai.kang@windriver.com
State Accepted, archived
Commit 195f4a648251e53ed3070e060ad3e3f3832793e3
Headers show
Series [1/2] speex: fix CVE-2020-23903 | expand

Commit Message

Kai Jan. 16, 2022, 4:21 p.m. UTC 
From: Kai Kang <kai.kang@windriver.com>

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.

Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
 meta/classes/multilib.bbclass | 4 ++++
 1 file changed, 4 insertions(+)
diff mbox series

Patch

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