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]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
index 9a129f1a3068433a37d47da244997f0bd905e72d..9ff06cc7685f01bf44d9b44b8cb4eb88da0a1cee 100644 (file)
--- a/meta/conf/multilib.conf
+++ b/meta/conf/multilib.conf
@@ -14,3 +14,5 @@ INHERIT += "multilib_global"
 BBCLASSEXTEND_append = " ${MULTILIBS}"
 
 MULTILIB_GLOBAL_VARIANTS  = "lib32 lib64 libx32"
+
+OPKG_ARGS_append = " --force-maintainer --force-overwrite"