Re: [PATCH 1/7] allarch: only enable allarch when multilib is not used

[Martin Jansa <martin.jansa@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 8568 bytes --]

On Thu, Sep 13, 2018 at 08:20:07PM +0200, Martin Jansa wrote:
> On Thu, Sep 06, 2018 at 11:52:24PM +0800, kai.kang@windriver.com wrote:
> > From: Kai Kang <kai.kang@windriver.com>
> > 
> > Some allarch packages rdepends non-allarch packages. when multilib is
> > used, it doesn't expand the dependency chain correctly, e.g.
> > 
> > core-image-sato -> ca-certificates(allarch) -> openssl
> > 
> > we expect dependency chain for lib32-core-image-sato:
> > 
> > lib32-core-image-sato -> ca-certificates(allarch) -> lib32-openssl
> > 
> > it should install lib32-openssl for ca-certificates but openssl is still
> > wrongly required.
> > 
> > Only enable allarch when multilib is not used to fix the issue.
> > 
> > signed-off-by: kai kang <kai.kang@windriver.com>
> > ---
> >  meta/classes/allarch.bbclass         | 12 +++++++++++-
> >  meta/classes/icecc.bbclass           |  2 +-
> >  meta/classes/multilib.bbclass        |  3 ++-
> >  meta/classes/multilib_global.bbclass |  4 +---
> >  meta/classes/package.bbclass         |  9 ++++++---
> >  5 files changed, 21 insertions(+), 9 deletions(-)
> > 
> > diff --git a/meta/classes/allarch.bbclass b/meta/classes/allarch.bbclass
> > index 1eebe0bf2e..45f62a5939 100644
> > --- a/meta/classes/allarch.bbclass
> > +++ b/meta/classes/allarch.bbclass
> > @@ -2,7 +2,17 @@
> >  # This class is used for architecture independent recipes/data files (usually scripts)
> >  #
> >  
> > -PACKAGE_ARCH = "all"
> > +python allarch_package_arch_handler () {
> > +    if bb.data.inherits_class("nativesdk", d) or bb.data.inherits_class("crosssdk", d):
> > +        return
> > +
> > +    variants = d.getVar("MULTILIB_VARIANTS")
> > +    if not variants:
> > +        d.setVar("PACKAGE_ARCH", "all" )
> > +}
> > +
> > +addhandler allarch_package_arch_handler
> > +allarch_package_arch_handler[eventmask] = "bb.event.RecipePreFinalise"
> 
> Maybe I'm overlooking something, but doesn't this overwrite whatever
> PACKAGE_ARCH as set before this?
> 
> I have some recipes where the PACKAGE_ARCH is set to MACHINE_ARCH through
> another bbclass, but then overwritten with "all" by allarch_package_arch_handler:
> 
> # $PACKAGE_ARCH [5 operations]
> #   set oe-core/meta/conf/bitbake.conf:150
> #     [_defaultval] "${TUNE_PKGARCH}"
> #   set meta-lg-webos/meta-webos/conf/distro/include/webos.inc:241
> #     "${MACHINE_ARCH}"
> #   set oe-core/meta/conf/documentation.conf:304
> #     [doc] "The architecture of the resulting package or packages."
> #   set meta-lg-webos/meta-webos/classes/webos_machine_impl_dep.bbclass:11
> #     "${MACHINE_ARCH}"
> #   set allarch.bbclass:12 [allarch_package_arch_handler]
> #     "all"
> # pre-expansion value:
> #   "all"
> PACKAGE_ARCH="all"
> 
> But surprisingly if I do the same with e.g. packagegroup-core-boot in oe-core I get:
> 
> # $PACKAGE_ARCH [4 operations]
> #   set /OE/build/oe-core/openembedded-core/meta/conf/bitbake.conf:150
> #     [_defaultval] "${TUNE_PKGARCH}"
> #   set /OE/build/oe-core/openembedded-core/meta/conf/documentation.conf:304
> #     [doc] "The architecture of the resulting package or packages."
> #   set /OE/build/oe-core/openembedded-core/meta/recipes-core/packagegroups/packagegroup-core-boot.bb:9
> #     "${MACHINE_ARCH}"
> #   set? /OE/build/oe-core/openembedded-core/meta/classes/packagegroup.bbclass:12
> #     "all"
> # pre-expansion value:
> #   "${MACHINE_ARCH}"
> PACKAGE_ARCH="qemux86_64"
> 
> Why isn't allarch_package_arch_handler executed in the 2nd case?

Now I see the difference, I was still living in the days when
"disabling" allarch was possible just by setting PACKAGE_ARCH before
inheritting allarch, but now I see that packagegroups do conditional
inherit as well since:
http://git.openembedded.org/openembedded-core/commit/?id=9c826962ec8fa45c2b035427442b90a41517144e
http://git.openembedded.org/openembedded-core/commit/?id=2c9b1d304daade7b0907320aeb9c522e7ab9dcab
so I'll modify currently failing recipes to do the same and stop
inheritting allarch when PACKAGE_ARCH is set to something else.

Cheers,

> >  python () {
> >      # Allow this class to be included but overridden - only set
> > diff --git a/meta/classes/icecc.bbclass b/meta/classes/icecc.bbclass
> > index 0ca8de86c2..b5a8457747 100644
> > --- a/meta/classes/icecc.bbclass
> > +++ b/meta/classes/icecc.bbclass
> > @@ -171,7 +171,7 @@ def use_icecc(bb,d):
> >      return "yes"
> >  
> >  def icecc_is_allarch(bb, d):
> > -    return d.getVar("PACKAGE_ARCH") == "all" or bb.data.inherits_class('allarch', d)
> > +    return d.getVar("PACKAGE_ARCH") == "all"
> >  
> >  def icecc_is_kernel(bb, d):
> >      return \
> > diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
> > index f2ac8bdfef..7b4d6472b0 100644
> > --- a/meta/classes/multilib.bbclass
> > +++ b/meta/classes/multilib.bbclass
> > @@ -50,7 +50,8 @@ python multilib_virtclass_handler () {
> >      if bb.data.inherits_class('nativesdk', e.data) or bb.data.inherits_class('crosssdk', e.data):
> >          raise bb.parse.SkipRecipe("We can't extend nativesdk recipes")
> >  
> > -    if bb.data.inherits_class('allarch', e.data) and not bb.data.inherits_class('packagegroup', e.data):
> > +    if bb.data.inherits_class('allarch', e.data) and not d.getVar('MULTILIB_VARIANTS') \
> > +        and not bb.data.inherits_class('packagegroup', e.data):
> >          raise bb.parse.SkipRecipe("Don't extend allarch recipes which are not packagegroups")
> >  
> >      # Expand this since this won't work correctly once we set a multilib into place
> > diff --git a/meta/classes/multilib_global.bbclass b/meta/classes/multilib_global.bbclass
> > index d2ec1adfea..1bb62427b0 100644
> > --- a/meta/classes/multilib_global.bbclass
> > +++ b/meta/classes/multilib_global.bbclass
> > @@ -165,9 +165,7 @@ python multilib_virtclass_handler_global () {
> >          return
> >  
> >      if bb.data.inherits_class('kernel', e.data) or \
> > -            bb.data.inherits_class('module-base', e.data) or \
> > -            (bb.data.inherits_class('allarch', e.data) and\
> > -             not bb.data.inherits_class('packagegroup', e.data)):
> > +            bb.data.inherits_class('module-base', e.data):
> >              variants = (e.data.getVar("MULTILIB_VARIANTS") or "").split()
> >  
> >              import oe.classextend
> > diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
> > index 0b6f65a855..d1e9138c66 100644
> > --- a/meta/classes/package.bbclass
> > +++ b/meta/classes/package.bbclass
> > @@ -494,7 +494,8 @@ def get_package_mapping (pkg, basepkg, d):
> >  
> >      if key in data:
> >          # Have to avoid undoing the write_extra_pkgs(global_variants...)
> > -        if bb.data.inherits_class('allarch', d) and data[key] == basepkg:
> > +        if bb.data.inherits_class('allarch', d) and not d.getVar('MULTILIB_VARIANTS') \
> > +            and data[key] == basepkg:
> >              return pkg
> >          return data[key]
> >  
> > @@ -1413,7 +1414,8 @@ fi
> >      if bb.data.inherits_class('kernel', d) or bb.data.inherits_class('module-base', d):
> >          write_extra_pkgs(variants, pn, packages, pkgdatadir)
> >  
> > -    if (bb.data.inherits_class('allarch', d) and not bb.data.inherits_class('packagegroup', d)):
> > +    if bb.data.inherits_class('allarch', d) and not variants \
> > +        and not bb.data.inherits_class('packagegroup', d):
> >          write_extra_pkgs(global_variants, pn, packages, pkgdatadir)
> >  
> >      workdir = d.getVar('WORKDIR')
> > @@ -1502,7 +1504,8 @@ fi
> >      if bb.data.inherits_class('kernel', d) or bb.data.inherits_class('module-base', d):
> >          write_extra_runtime_pkgs(variants, packages, pkgdatadir)
> >  
> > -    if bb.data.inherits_class('allarch', d) and not bb.data.inherits_class('packagegroup', d):
> > +    if bb.data.inherits_class('allarch', d) and not variants \
> > +        and not bb.data.inherits_class('packagegroup', d):
> >          write_extra_runtime_pkgs(global_variants, packages, pkgdatadir)
> >  
> >  }
> > -- 
> > 2.18.0
> > 
> > -- 
> > _______________________________________________
> > Openembedded-core mailing list
> > Openembedded-core@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-core
> 
> -- 
> Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com



-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 201 bytes --]