[langdale,25/27] staging: Separate out different multiconfig manifests

From: Richard Purdie <richard.purdie@linuxfoundation.org>

"""
require conf/multilib.conf
MACHINE = "qemuarm64"
MULTILIBS = "multilib:lib32"
DEFAULTTUNE:virtclass-multilib-lib32 = "armv7athf-neon"

bitbake gcc-cross-canadian-arm
"""

and then inspecting the lib32* manifest files under recipe-sysroot-native shows
them referencing lib32-recipe-sysroot instead of recipe-sysroot as used by
gcc-cross-canadian recipes.

To fix this separate out the manifest by multilib. It is caching mechanism to
optimise disk usage so this doesn't break anything, just separated out some files.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
(cherry picked from commit 891d3faa3ed3d1cc231da58e5fa1325f05d5ade5)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
 meta/classes-global/staging.bbclass | 3 +++
 1 file changed, 3 insertions(+)

On Thu, 2023-03-09 at 12:58 -1000, Steve Sakoman wrote:
> From: Richard Purdie <richard.purdie@linuxfoundation.org>
> 
> """
> require conf/multilib.conf
> MACHINE = "qemuarm64"
> MULTILIBS = "multilib:lib32"
> DEFAULTTUNE:virtclass-multilib-lib32 = "armv7athf-neon"
> 
> bitbake gcc-cross-canadian-arm
> """
> 
> and then inspecting the lib32* manifest files under recipe-sysroot-native shows
> them referencing lib32-recipe-sysroot instead of recipe-sysroot as used by
> gcc-cross-canadian recipes.
> 
> To fix this separate out the manifest by multilib. It is caching mechanism to
> optimise disk usage so this doesn't break anything, just separated out some files.
> 
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
> (cherry picked from commit 891d3faa3ed3d1cc231da58e5fa1325f05d5ade5)
> Signed-off-by: Steve Sakoman <steve@sakoman.com>
> ---
>  meta/classes-global/staging.bbclass | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/meta/classes-global/staging.bbclass b/meta/classes-global/staging.bbclass
> index 5a1f43de78..e6d0d1d55c 100644
> --- a/meta/classes-global/staging.bbclass
> +++ b/meta/classes-global/staging.bbclass
> @@ -275,6 +275,9 @@ python extend_recipe_sysroot() {
>      pn = d.getVar("PN")
>      stagingdir = d.getVar("STAGING_DIR")
>      sharedmanifests = d.getVar("COMPONENTS_DIR") + "/manifests"
> +    mlprefix = d.getVar("MLPREFIX")
> +    if mlprefix:
> +        sharedmanifests = sharedmanifests + "/" + mlprefix
>      recipesysroot = d.getVar("RECIPE_SYSROOT")
>      recipesysrootnative = d.getVar("RECIPE_SYSROOT_NATIVE")
>  

The "real" fix merged today so this should probably wait to go with
that.

Cheers,

Richard

On Thu, Mar 9, 2023 at 1:15 PM Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
>
> On Thu, 2023-03-09 at 12:58 -1000, Steve Sakoman wrote:
> > From: Richard Purdie <richard.purdie@linuxfoundation.org>
> >
> > """
> > require conf/multilib.conf
> > MACHINE = "qemuarm64"
> > MULTILIBS = "multilib:lib32"
> > DEFAULTTUNE:virtclass-multilib-lib32 = "armv7athf-neon"
> >
> > bitbake gcc-cross-canadian-arm
> > """
> >
> > and then inspecting the lib32* manifest files under recipe-sysroot-native shows
> > them referencing lib32-recipe-sysroot instead of recipe-sysroot as used by
> > gcc-cross-canadian recipes.
> >
> > To fix this separate out the manifest by multilib. It is caching mechanism to
> > optimise disk usage so this doesn't break anything, just separated out some files.
> >
> > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> > Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
> > (cherry picked from commit 891d3faa3ed3d1cc231da58e5fa1325f05d5ade5)
> > Signed-off-by: Steve Sakoman <steve@sakoman.com>
> > ---
> >  meta/classes-global/staging.bbclass | 3 +++
> >  1 file changed, 3 insertions(+)
> >
> > diff --git a/meta/classes-global/staging.bbclass b/meta/classes-global/staging.bbclass
> > index 5a1f43de78..e6d0d1d55c 100644
> > --- a/meta/classes-global/staging.bbclass
> > +++ b/meta/classes-global/staging.bbclass
> > @@ -275,6 +275,9 @@ python extend_recipe_sysroot() {
> >      pn = d.getVar("PN")
> >      stagingdir = d.getVar("STAGING_DIR")
> >      sharedmanifests = d.getVar("COMPONENTS_DIR") + "/manifests"
> > +    mlprefix = d.getVar("MLPREFIX")
> > +    if mlprefix:
> > +        sharedmanifests = sharedmanifests + "/" + mlprefix
> >      recipesysroot = d.getVar("RECIPE_SYSROOT")
> >      recipesysrootnative = d.getVar("RECIPE_SYSROOT_NATIVE")
> >
>
> The "real" fix merged today so this should probably wait to go with
> that.

Thanks for reviewing, I'll hold this back for the next patch set.

Steve