Re: [PATCH] meta/conf/distro: Fix filling of DISTRO_APT_SOURCES with default sources

[Jan Kiszka <jan.kiszka@siemens.com>]

On 03.02.21 10:09, Bezdeka, Florian (T RDA IOT SES-DE) wrote:
> From: Florian Bezdeka <florian.bezdeka@siemens.com>
> 
> The following (quite minimal) distribution inheritance did not work:
> 
> own-distro.conf:
> require conf/distro/debian-buster.conf
> 
> Build result (error):
> E: option suite may not be empty
> 
> The reason for the build failure was that own-distro did not have any APT
> sources configured. This was broken with f3b4f74a869a. ${DISTRO} is set
> to "own-distro" in this case and the apt source file (${DISTRO}.list)
> might not exist.
> 
> Fixes: f3b4f74a869a ("meta/conf/distro: Cleanup DISTRO_APT_SOURCES")
> Signed-off-by: Florian Bezdeka <florian.bezdeka@siemens.com>
> ---
>  meta/conf/distro/debian-common.conf | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/conf/distro/debian-common.conf b/meta/conf/distro/debian-common.conf
> index cb7f8ed..aa32b24 100644
> --- a/meta/conf/distro/debian-common.conf
> +++ b/meta/conf/distro/debian-common.conf
> @@ -6,7 +6,7 @@
>  BASE_DISTRO = "debian"
> 
>  HOST_DISTRO_APT_SOURCES ?= "conf/distro/${HOST_DISTRO}.list"
> -DISTRO_APT_SOURCES ?= "conf/distro/${DISTRO}.list"
> +DISTRO_APT_SOURCES ?= "conf/distro/${HOST_DISTRO}.list"
> 

This isn't correct. DISTRO_APT_SOURCES points to the target distro,
HOST_DISTRO_APT_SOURCES to the host distro.

If we want to ease defining deviating distros under own names that can
easily include debian-xxx.conf, we need to revert that cleanup commit,
hard-coding the association between distro conf an chosen list files again.

Jan

>  WIC_IMAGER_INSTALL = "parted \
>                        gdisk \
> --
> 2.29.2
> 


-- 
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux