From 719e1edaebb13b8626a7dd85cdc8680f00a6b4ac Mon Sep 17 00:00:00 2001 From: Dongxiao Xu Date: Thu, 8 Sep 2011 21:35:37 +0800 Subject: rpm: add multilib prefix for archs under deploy/rpm Currently MACHINE_ARCH deploy folder is unique in multilib system, thus a lib32 version of rpm package will override a normal rpm package if its PACKAGE_ARCH is ${MACHINE_ARCH}. Define different deploy folder for multilib architectures to avoid the confliction. (From OE-Core rev: 921f984aa65e23d5a8ec5c2e58a96cb8a4790b5d) Signed-off-by: Dongxiao Xu Signed-off-by: Richard Purdie --- meta/classes/multilib.bbclass | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'meta/classes/multilib.bbclass') diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass index 583d76b0f3..138dd27a6e 100644 --- a/meta/classes/multilib.bbclass +++ b/meta/classes/multilib.bbclass @@ -76,4 +76,9 @@ python __anonymous () { multilib_map_variable("PACKAGES_DYNAMIC", variant, d) multilib_map_variable("PACKAGE_INSTALL", variant, d) multilib_map_variable("INITSCRIPT_PACKAGES", variant, d) + + package_arch = d.getVar("PACKAGE_ARCH", True) + machine_arch = d.getVar("MACHINE_ARCH", True) + if package_arch == machine_arch: + d.setVar("PACKAGE_ARCH", variant + "_" + package_arch) } -- cgit v1.2.3-54-g00ecf