summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-12 17:46:30 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-13 23:49:33 +0100
commitee61cfbd84018f922a5bdc0f4e65f7dc369a5cd4 (patch)
tree0114c238d51e9a382f38b58ed7d801c91941e1a1 /meta/conf
parentd98cb97342be1b366cd8b28c2e216d26dbb7a23f (diff)
downloadpoky-ee61cfbd84018f922a5bdc0f4e65f7dc369a5cd4.tar.gz
multilib.conf: Workaround opkg multilib issues
Multilib with opkg hasn't worked since the --force-overwrite option was dropped in http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=88a9f6db3482623c9cb54fb03db1045051cec9f6 Since we merged the libexecdir changes, we also need the --force-maintainer flag to avoid conf file conflicts. Both these changes are suboptimal however the alternative is completely broken and these changes only affect people who have multilibs enabled and use opkg. [YOCTO #3453] (From OE-Core rev: 6310e66cd62aab6109027a8dce9c56bf721bea92) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/multilib.conf2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
index 9a129f1a30..9ff06cc768 100644
--- a/meta/conf/multilib.conf
+++ b/meta/conf/multilib.conf
@@ -14,3 +14,5 @@ INHERIT += "multilib_global"
14BBCLASSEXTEND_append = " ${MULTILIBS}" 14BBCLASSEXTEND_append = " ${MULTILIBS}"
15 15
16MULTILIB_GLOBAL_VARIANTS = "lib32 lib64 libx32" 16MULTILIB_GLOBAL_VARIANTS = "lib32 lib64 libx32"
17
18OPKG_ARGS_append = " --force-maintainer --force-overwrite"