[PATCH] unify ubuntu-focal.conf with debian config files

[PATCH] unify ubuntu-focal.conf with debian config files

[Felix Moessbauer]

This patch reworks the ubuntu-focal.conf distro config file.
It unifies the pattern used for DISTRO_APT_SOURCES with the
pattern used in debian-common.conf.

By that, the BASE_DISTRO variable is used to select the corresponding
apt sources.
This makes it possible to derive custom distros based on ubuntu as well.

Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
---
 meta-isar/conf/distro/ubuntu-focal.conf | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/meta-isar/conf/distro/ubuntu-focal.conf b/meta-isar/conf/distro/ubuntu-focal.conf
index c0d12967..9e2ff27a 100644
--- a/meta-isar/conf/distro/ubuntu-focal.conf
+++ b/meta-isar/conf/distro/ubuntu-focal.conf
@@ -6,13 +6,11 @@
 require conf/distro/debian-common.conf
 
 BASE_DISTRO = "ubuntu"
-
-DISTRO_APT_SOURCES ?= "conf/distro/${DISTRO}.list"
-DISTRO_APT_SOURCES_arm64 ?= "conf/distro/${DISTRO}-ports.list"
-HOST_DISTRO_APT_SOURCES_append_arm64 = " ${DISTRO_APT_SOURCES}"
-
 BASE_DISTRO_CODENAME = "focal"
 
+DISTRO_APT_SOURCES_arm64 ?= "conf/distro/${BASE_DISTRO}-${BASE_DISTRO_CODENAME}-ports.list"
+HOST_DISTRO_APT_SOURCES_arm64 ?= "conf/distro/${HOST_DISTRO}-ports.list"
+
 # that is what debootstrap_1.0.118ubuntu1 does anyways
 DISTRO_DEBOOTSTRAP_SCRIPT = "/usr/share/debootstrap/scripts/gutsy"
 
-- 
2.30.2

Re: [PATCH] unify ubuntu-focal.conf with debian config files

[Anton Mikanovich]

27.09.2022 07:03, Felix Moessbauer wrote:
> This patch reworks the ubuntu-focal.conf distro config file.
> It unifies the pattern used for DISTRO_APT_SOURCES with the
> pattern used in debian-common.conf.
>
> By that, the BASE_DISTRO variable is used to select the corresponding
> apt sources.
> This makes it possible to derive custom distros based on ubuntu as well.
>
> Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
> ---
>   meta-isar/conf/distro/ubuntu-focal.conf | 8 +++-----
>   1 file changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/meta-isar/conf/distro/ubuntu-focal.conf b/meta-isar/conf/distro/ubuntu-focal.conf
> index c0d12967..9e2ff27a 100644
> --- a/meta-isar/conf/distro/ubuntu-focal.conf
> +++ b/meta-isar/conf/distro/ubuntu-focal.conf
> @@ -6,13 +6,11 @@
>   require conf/distro/debian-common.conf
>   
>   BASE_DISTRO = "ubuntu"
> -
> -DISTRO_APT_SOURCES ?= "conf/distro/${DISTRO}.list"
> -DISTRO_APT_SOURCES_arm64 ?= "conf/distro/${DISTRO}-ports.list"
> -HOST_DISTRO_APT_SOURCES_append_arm64 = " ${DISTRO_APT_SOURCES}"
> -
>   BASE_DISTRO_CODENAME = "focal"
>   
> +DISTRO_APT_SOURCES_arm64 ?= "conf/distro/${BASE_DISTRO}-${BASE_DISTRO_CODENAME}-ports.list"
> +HOST_DISTRO_APT_SOURCES_arm64 ?= "conf/distro/${HOST_DISTRO}-ports.list"
> +
>   # that is what debootstrap_1.0.118ubuntu1 does anyways
>   DISTRO_DEBOOTSTRAP_SCRIPT = "/usr/share/debootstrap/scripts/gutsy"
>   

Hello Felix,

Changing HOST_DISTRO_APT_SOURCES for arm64 was done incorrectly here.
It should be set to ubuntu-focal.list+ubuntu-focal-ports.list while you 
set it
just to ubuntu-focal-ports.list

RE: [PATCH] unify ubuntu-focal.conf with debian config files

[Moessbauer, Felix]

> -----Original Message-----
> From: Anton Mikanovich <amikan@ilbers.de>
> Sent: Wednesday, September 28, 2022 5:52 PM
> To: Moessbauer, Felix (T CED SES-DE) <felix.moessbauer@siemens.com>; isar-
> users@googlegroups.com
> Cc: Schild, Henning (T CED SES-DE) <henning.schild@siemens.com>
> Subject: Re: [PATCH] unify ubuntu-focal.conf with debian config files
> 
> 27.09.2022 07:03, Felix Moessbauer wrote:
> > This patch reworks the ubuntu-focal.conf distro config file.
> > It unifies the pattern used for DISTRO_APT_SOURCES with the pattern
> > used in debian-common.conf.
> >
> > By that, the BASE_DISTRO variable is used to select the corresponding
> > apt sources.
> > This makes it possible to derive custom distros based on ubuntu as well.
> >
> > Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
> > ---
> >   meta-isar/conf/distro/ubuntu-focal.conf | 8 +++-----
> >   1 file changed, 3 insertions(+), 5 deletions(-)
> >
> > diff --git a/meta-isar/conf/distro/ubuntu-focal.conf
> > b/meta-isar/conf/distro/ubuntu-focal.conf
> > index c0d12967..9e2ff27a 100644
> > --- a/meta-isar/conf/distro/ubuntu-focal.conf
> > +++ b/meta-isar/conf/distro/ubuntu-focal.conf
> > @@ -6,13 +6,11 @@
> >   require conf/distro/debian-common.conf
> >
> >   BASE_DISTRO = "ubuntu"
> > -
> > -DISTRO_APT_SOURCES ?= "conf/distro/${DISTRO}.list"
> > -DISTRO_APT_SOURCES_arm64 ?= "conf/distro/${DISTRO}-ports.list"
> > -HOST_DISTRO_APT_SOURCES_append_arm64 = " ${DISTRO_APT_SOURCES}"
> > -
> >   BASE_DISTRO_CODENAME = "focal"
> >
> > +DISTRO_APT_SOURCES_arm64 ?= "conf/distro/${BASE_DISTRO}-
> ${BASE_DISTRO_CODENAME}-ports.list"
> > +HOST_DISTRO_APT_SOURCES_arm64 ?= "conf/distro/${HOST_DISTRO}-
> ports.list"
> > +
> >   # that is what debootstrap_1.0.118ubuntu1 does anyways
> >   DISTRO_DEBOOTSTRAP_SCRIPT = "/usr/share/debootstrap/scripts/gutsy"
> >
> 
> Hello Felix,
> 
> Changing HOST_DISTRO_APT_SOURCES for arm64 was done incorrectly here.
> It should be set to ubuntu-focal.list+ubuntu-focal-ports.list while you set it just
> to ubuntu-focal-ports.list

Good catch!
The interesting thing this is that I tested this with both arm64 and amd64 (w / w/o cross) and it worked.
I'll change it and send a v2.

Felix