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/rootfs_rpm.bbclass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'meta/classes/rootfs_rpm.bbclass') diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass index 135ca75fa5..7936d77b96 100644 --- a/meta/classes/rootfs_rpm.bbclass +++ b/meta/classes/rootfs_rpm.bbclass @@ -218,7 +218,9 @@ python () { default_tune = localdata.getVar("DEFAULTTUNE_virtclass-multilib-" + eext[1], False) if default_tune: localdata.setVar("DEFAULTTUNE", default_tune) - ml_package_archs += localdata.getVar("PACKAGE_ARCHS", True) or "" + localdata.setVar("MACHINE_ARCH", eext[1] + "_" + localdata.getVar("MACHINE_ARCH", False)) + package_archs = localdata.getVar("PACKAGE_ARCHS", True) or "" + ml_package_archs += " " + package_archs #bb.note("ML_PACKAGE_ARCHS %s %s %s" % (eext[1], localdata.getVar("PACKAGE_ARCHS", True) or "(none)", overrides)) bb.data.setVar('MULTILIB_PACKAGE_ARCHS', ml_package_archs, d) } -- cgit v1.2.3-54-g00ecf