summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2022-01-17 00:21:50 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-01-17 11:48:17 +0000
commit195f4a648251e53ed3070e060ad3e3f3832793e3 (patch)
tree6d6d397f363169f08fb074ebcb19687717b2b417
parent487e9f16a00f895159b79f1865fe8b626b47ddc2 (diff)
downloadopenembedded-core-contrib-195f4a648251e53ed3070e060ad3e3f3832793e3.tar.gz
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. Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/multilib.bbclass4
1 files changed, 4 insertions, 0 deletions
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