Re: [PATCH 1/1] buildchroot: remove hard-coded distro names in the multistrap template

[Henning Schild <henning.schild@siemens.com>]

Am Fri, 22 Feb 2019 11:32:57 +0100
schrieb Jan Kiszka <jan.kiszka@siemens.com>:

> On 22.02.19 11:26, [ext] Henning Schild wrote:
> > Hi,
> > 
> > unfortunately Isar is pretty inconsistent with debian naming.
> > "Debian" is a distro, like "ubuntu" or "mint". "stretch" and
> > "buster" are suites ...
> > 
> > suite=distro is wrong
> > 
> > Please choose another name for that variable. One point less to
> > clean up when setting things straight.
> > 
> > Henning
> > 
> > Am Wed, 21 Feb 2018 13:19:24 +0000
> > schrieb Cedric Hombourger <Cedric_Hombourger@mentor.com>:  
> 
> Were you on a time ride, Henning? :)

Oh, i guess Feb looked ok ;). I recently had to change mail clients,
and thunderbird seriously messes with your mails if you just use it
once a quarter....

Henning

> Jan
> 
> >   
> >> The multistrap configuration template assumes the distribution
> >> will be "isar"; this may however be changed via the DEBDISTRONAME
> >> variable. Add yet another variable substitution to the template
> >> processing code.
> >>
> >> Signed-off-by: Cedric Hombourger <Cedric_Hombourger@mentor.com>
> >> ---
> >>   meta/recipes-devtools/buildchroot/buildchroot.bb           | 1 +
> >>   meta/recipes-devtools/buildchroot/files/multistrap.conf.in | 2 +-
> >>   2 files changed, 2 insertions(+), 1 deletion(-)
> >>
> >> diff --git a/meta/recipes-devtools/buildchroot/buildchroot.bb
> >> b/meta/recipes-devtools/buildchroot/buildchroot.bb index
> >> 520daf9..12577c7 100644 ---
> >> a/meta/recipes-devtools/buildchroot/buildchroot.bb +++
> >> b/meta/recipes-devtools/buildchroot/buildchroot.bb @@ -60,6 +60,7
> >> @@ do_build() { -e
> >> 's|##DISTRO_APT_SOURCE_SEC##|${DISTRO_APT_SOURCE_SEC}|g' \ -e
> >> 's|##DISTRO_SUITE##|${DISTRO_SUITE}|g' \ -e
> >> 's|##DISTRO_COMPONENTS##|${DISTRO_COMPONENTS}|g' \
> >> +        -e 's|##DEBDISTRONAME##|${DEBDISTRONAME}|g' \
> >>           -e
> >> 's|##CONFIG_SCRIPT##|./'"$WORKDIR_REL"'/configscript.sh|g' \ -e
> >> 's|##SETUP_SCRIPT##|./'"$WORKDIR_REL"'/setup.sh|g' \ -e
> >> 's|##DIR_HOOKS##|./'"$WORKDIR_REL"'/hooks_multistrap|g' \ diff
> >> --git a/meta/recipes-devtools/buildchroot/files/multistrap.conf.in
> >> b/meta/recipes-devtools/buildchroot/files/multistrap.conf.in index
> >> 480a4b8..ee0ea09 100644 ---
> >> a/meta/recipes-devtools/buildchroot/files/multistrap.conf.in +++
> >> b/meta/recipes-devtools/buildchroot/files/multistrap.conf.in @@
> >> -32,6 +32,6 @@ omitdebsrc=true [isar-apt]
> >>   source=file:///isar-apt
> >> -suite=isar
> >> +suite=##DEBDISTRONAME##
> >>   components=main
> >>   omitdebsrc=true  
> >   
>