[PATCH 0/1] Remove hard-code distro name in the multistrap template

[PATCH 0/1] Remove hard-code distro name in the multistrap template

[Cedric Hombourger]

As users may define their own distro name, the multistrap configuration template
we provide should not have it hard-coded to "isar" but use whatever DEBDISTRONAME
setting we receive. Failure to do will result in fetch failures from the isar-apt
source feed.

Cedric Hombourger (1):
  buildchroot: remove hard-coded distro names in the multistrap template

 meta/recipes-devtools/buildchroot/buildchroot.bb           | 1 +
 meta/recipes-devtools/buildchroot/files/multistrap.conf.in | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

-- 
2.11.0

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

[Cedric Hombourger]

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
-- 
2.11.0

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

[Henning Schild]

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>:

> 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

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

[Jan Kiszka]

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? :)

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
> 

-- 
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux

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

[Henning Schild]

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  
> >   
> 

Re: [PATCH 0/1] Remove hard-code distro name in the multistrap template

[Claudius Heine]

Hi,

On 02/21/2018 02:19 PM, Cedric Hombourger wrote:
> As users may define their own distro name, the multistrap configuration template
> we provide should not have it hard-coded to "isar" but use whatever DEBDISTRONAME
> setting we receive. Failure to do will result in fetch failures from the isar-apt
> source feed.

Just FYI: this fix is also included in my multistrap removal patchset.

Cheers,
Claudius

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-54 Fax: (+49)-8142-66989-80 Email: ch@denx.de

RE: [PATCH 0/1] Remove hard-code distro name in the multistrap template

[Hombourger, Cedric]

Awesome :)

If I am not mistaken, there are still some TODOs for the multistrap removal patch series
(it however does look very promising!). If I may offer my opinion, I would suggest we get this small patch integrated (if acceptable ofcourse!)

Cedric

-----Original Message-----
From: Claudius Heine [mailto:claudius.heine.ext@siemens.com] 
Sent: Wednesday, February 21, 2018 4:30 PM
To: Hombourger, Cedric <Cedric_Hombourger@mentor.com>; isar-users@googlegroups.com
Subject: Re: [PATCH 0/1] Remove hard-code distro name in the multistrap template

Hi,

On 02/21/2018 02:19 PM, Cedric Hombourger wrote:
> As users may define their own distro name, the multistrap 
> configuration template we provide should not have it hard-coded to 
> "isar" but use whatever DEBDISTRONAME setting we receive. Failure to 
> do will result in fetch failures from the isar-apt source feed.

Just FYI: this fix is also included in my multistrap removal patchset.

Cheers,
Claudius

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-54 Fax: (+49)-8142-66989-80 Email: ch@denx.de

Re: [PATCH 0/1] Remove hard-code distro name in the multistrap template

[Claudius Heine]

Hi Cedric,

On 02/21/2018 04:51 PM, Hombourger, Cedric wrote:
> Awesome :)
> 
> If I am not mistaken, there are still some TODOs for the multistrap removal patch series
> (it however does look very promising!). If I may offer my opinion, I would suggest we get this small patch integrated (if acceptable ofcourse!)

Yeah of course.

My message wasn't really addressed for you specifically or a statement 
against merging of your patch. I wrote it because your patch touches the 
same code basis as mine and this bug could have been carried into my 
implementation with debootstrap.

Cheers,
Claudius

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-54 Fax: (+49)-8142-66989-80 Email: ch@denx.de

Re: [PATCH 0/1] Remove hard-code distro name in the multistrap template

[Alexander Smirnov]

Hi,

On 02/21/2018 04:19 PM, Cedric Hombourger wrote:
> As users may define their own distro name, the multistrap configuration template
> we provide should not have it hard-coded to "isar" but use whatever DEBDISTRONAME
> setting we receive. Failure to do will result in fetch failures from the isar-apt
> source feed.

I have two questions here:

1. What is the user impact to define distro name *in* buildchroot? This 
should be absolutely transparent for user, this apt is used only to 
install deps for building new packages.

2. Why the distro name for image multistrap remains Isar then?

Alex

RE: [PATCH 0/1] Remove hard-code distro name in the multistrap template

[Hombourger, Cedric]

Hi Alex,

Sorry for the delayed response, last few days were hectic over here :)

1. Well if you have a layer setting DEBDISTRONAME then the dpkg-base class uses the user-defined name and the buildchroot class will fail to fetch custom packages you may have as build dependencies
2. I don't think it does, isar-image-base.bb also does a subst: -e 's|##ISAR_DISTRO_SUITE##|${DEBDISTRONAME}|g'

Does that make sense / help?

Cedric

-----Original Message-----
From: Alexander Smirnov [mailto:asmirnov@ilbers.de] 
Sent: Friday, March 2, 2018 1:35 PM
To: Hombourger, Cedric <Cedric_Hombourger@mentor.com>; isar-users@googlegroups.com
Subject: Re: [PATCH 0/1] Remove hard-code distro name in the multistrap template

Hi,

On 02/21/2018 04:19 PM, Cedric Hombourger wrote:
> As users may define their own distro name, the multistrap 
> configuration template we provide should not have it hard-coded to 
> "isar" but use whatever DEBDISTRONAME setting we receive. Failure to 
> do will result in fetch failures from the isar-apt source feed.

I have two questions here:

1. What is the user impact to define distro name *in* buildchroot? This should be absolutely transparent for user, this apt is used only to install deps for building new packages.

2. Why the distro name for image multistrap remains Isar then?

Alex

Re: [PATCH 0/1] Remove hard-code distro name in the multistrap template

[Alexander Smirnov]

On 02/21/2018 04:19 PM, Cedric Hombourger wrote:
> As users may define their own distro name, the multistrap configuration template
> we provide should not have it hard-coded to "isar" but use whatever DEBDISTRONAME
> setting we receive. Failure to do will result in fetch failures from the isar-apt
> source feed.
> 

Applied to next, thanks!

Alex

Re: [PATCH 0/1] Remove hard-code distro name in the multistrap template

[chombourger]

[-- Attachment #1.1: Type: text/plain, Size: 667 bytes --]

Hi Alex,

Thank you!

For some reason the changes do not show up on GitHub
e.g. 
https://github.com/ilbers/isar/blob/next/meta/recipes-devtools/buildchroot/files/multistrap.conf.in

Any idea why?

Cedric

On Thursday, March 15, 2018 at 2:59:22 PM UTC+1, Alexander Smirnov wrote:
>
> On 02/21/2018 04:19 PM, Cedric Hombourger wrote: 
> > As users may define their own distro name, the multistrap configuration 
> template 
> > we provide should not have it hard-coded to "isar" but use whatever 
> DEBDISTRONAME 
> > setting we receive. Failure to do will result in fetch failures from the 
> isar-apt 
> > source feed. 
> > 
>
> Applied to next, thanks! 
>
> Alex 
>

[-- Attachment #1.2: Type: text/html, Size: 875 bytes --]

Re: [PATCH 0/1] Remove hard-code distro name in the multistrap template

[Jan Kiszka]

On 2018-04-04 08:25, chombourger@gmail.com wrote:
> Hi Alex,
> 
> Thank you!
> 
> For some reason the changes do not show up on GitHub
> e.g.
> https://github.com/ilbers/isar/blob/next/meta/recipes-devtools/buildchroot/files/multistrap.conf.in
> 
> Any idea why?

Maybe because the patched code is about to vanish (debootstrap)?

Jan

-- 
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux

Re: [PATCH 0/1] Remove hard-code distro name in the multistrap template

[Cedric Hombourger]

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

That would be a good reason ;)


On Wed, Apr 4, 2018, 12:43 PM Jan Kiszka <jan.kiszka@siemens.com> wrote:

> On 2018-04-04 08:25, chombourger@gmail.com wrote:
> > Hi Alex,
> >
> > Thank you!
> >
> > For some reason the changes do not show up on GitHub
> > e.g.
> >
> https://github.com/ilbers/isar/blob/next/meta/recipes-devtools/buildchroot/files/multistrap.conf.in
> >
> > Any idea why?
>
> Maybe because the patched code is about to vanish (debootstrap)?
>
> Jan
>
> --
> Siemens AG, Corporate Technology, CT RDA IOT SES-DE
> Corporate Competence Center Embedded Linux
>

[-- Attachment #2: Type: text/html, Size: 1158 bytes --]