Re: [PATCH 1/2] set mode specific defaults for machine and distro

Re: [PATCH 1/2] set mode specific defaults for machine and distro

[MOESSBAUER, Felix]

On Fri, 2024-03-08 at 15:07 +0100, Jan Kiszka wrote:
> On 08.03.24 15:03, Moessbauer, Felix (T CED OES-DE) wrote:
> > On Fri, 2024-03-08 at 14:30 +0100, Jan Kiszka wrote:
> > > On 08.03.24 13:22, Felix Moessbauer wrote:
> > > > When running with the ISAR build system, set these to values
> > > > which
> > > > correspond to entries in the ISAR core layer instead of yocto.
> > > > 
> > > > Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
> > > > ---
> > > >  docs/format-changelog.rst                | 6 ++++++
> > > >  docs/userguide/project-configuration.inc | 4 ++--
> > > >  kas/config.py                            | 8 ++++++--
> > > >  3 files changed, 14 insertions(+), 4 deletions(-)
> > > > 
> > > > diff --git a/docs/format-changelog.rst b/docs/format-
> > > > changelog.rst
> > > > index 98f0c8daa..ea9133a65 100644
> > > > --- a/docs/format-changelog.rst
> > > > +++ b/docs/format-changelog.rst
> > > > @@ -163,3 +163,9 @@ Fixed
> > > >  
> > > >  - The key ``tag`` introduced in v15 was not supported in
> > > > ``defaults``.
> > > >    It's now added.
> > > > +
> > > > +Changed behavior
> > > > +~~~~~~~~~~~~~~~~
> > > > +
> > > > +- In ISAR mode, set ``machine`` to ``qemuarm64`` and
> > > > ``distro`` to
> > > > +  ``debian-bullseye`` if omitted (instead of ``qemux86-64``
> > > > and
> > > > ``poky``).
> > > > diff --git a/docs/userguide/project-configuration.inc
> > > > b/docs/userguide/project-configuration.inc
> > > > index 0e7637163..f31e360ab 100644
> > > > --- a/docs/userguide/project-configuration.inc
> > > > +++ b/docs/userguide/project-configuration.inc
> > > > @@ -273,12 +273,12 @@ Configuration reference
> > > >  ``machine``: string [optional]
> > > >    Contains the value of the ``MACHINE`` variable that is
> > > > written
> > > > into the
> > > >    ``local.conf``. Can be overwritten by the ``KAS_MACHINE``
> > > > environment
> > > > -  variable and defaults to ``qemux86-64``.
> > > > +  variable and defaults to ``qemux86-64`` (``qemuamd64`` on
> > > > ISAR).
> > > >  
> > > >  ``distro``: string [optional]
> > > >    Contains the value of the ``DISTRO`` variable that is
> > > > written
> > > > into the
> > > >    ``local.conf``. Can be overwritten by the ``KAS_DISTRO``
> > > > environment
> > > > -  variable and defaults to ``poky``.
> > > > +  variable and defaults to ``poky`` (``debian-bullseye`` on
> > > > ISAR).
> > > >  
> > > >  ``target``: string [optional] or list [optional]
> > > >    Contains the target or a list of targets to build by
> > > > bitbake.
> > > > Can be
> > > > diff --git a/kas/config.py b/kas/config.py
> > > > index 5918e6e1e..707631e35 100644
> > > > --- a/kas/config.py
> > > > +++ b/kas/config.py
> > > > @@ -192,15 +192,19 @@ class Config:
> > > >          """
> > > >              Returns the machine
> > > >          """
> > > > +        default = 'qemuamd64' if self.get_build_system() ==
> > > > 'isar'
> > > > \
> > > > +            else 'qemux86-64'
> > > 
> > > This would only help if the user included meta-isar - not
> > > generally
> > > the
> > > case.
> > 
> > Right. However it also does not hurt. Or do you prefer to not set
> > the
> > MACHINE at all in this case?
> 
> Anything which would make the resulting errors better readable and
> translatable into fitting defaults would be welcome. Not sure if
> leaving
> the machine blank would help either.

Unfortunately the error handling for that is completely missing in
ISAR. This only becomes visible when building a multiconfig target but
forgetting to set the machine and distro in the kas project config
(which is anyways just needed for the initial bitbake parsing).
Not much we can do here, except for putting the ISAR ML in CC.

PS: I just saw that the isar-init-build-env puts in "qemuarm" as
default. What...!

Felix

> 
> Jan
> 

-- 
Siemens AG, Technology
Linux Expert Center