Patchwork multilib.conf: Workaround opkg multilib issues

login
register
mail settings
Submitter Richard Purdie
Date April 12, 2013, 4:46 p.m.
Message ID <1365785190.16702.65.camel@ted>
Download mbox | patch
Permalink /patch/48043/
State Accepted
Commit 6310e66cd62aab6109027a8dce9c56bf721bea92
Headers show

Comments

Richard Purdie - April 12, 2013, 4:46 p.m.
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>
---
Martin Jansa - April 12, 2013, 5:43 p.m.
On Fri, Apr 12, 2013 at 05:46:30PM +0100, Richard Purdie wrote:
> 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.

Can we add --force-overwrite only when MULTILIB is enabled?
 
> [YOCTO #3453]
> 
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
> diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
> index 9a129f1..9ff06cc 100644
> --- 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"
> 
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Richard Purdie - April 12, 2013, 9:36 p.m.
On Fri, 2013-04-12 at 19:43 +0200, Martin Jansa wrote:
> On Fri, Apr 12, 2013 at 05:46:30PM +0100, Richard Purdie wrote:
> > 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.
> 
> Can we add --force-overwrite only when MULTILIB is enabled?

This is why I'd put it in multilib.conf since that isn't included by
default and only used by people using multilibs.

Cheers,

Richard

> > [YOCTO #3453]
> > 
> > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> > ---
> > diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
> > index 9a129f1..9ff06cc 100644
> > --- 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"
> > 
> > 
> > 
> > _______________________________________________
> > Openembedded-core mailing list
> > Openembedded-core@lists.openembedded.org
> > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>

Patch

diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
index 9a129f1..9ff06cc 100644
--- 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"