diff mbox series

meta/conf/distro: Fix filling of DISTRO_APT_SOURCES with default sources

Message ID 20210203090927.97067-1-florian.bezdeka@siemens.com
State Rejected, archived
Headers show
Series meta/conf/distro: Fix filling of DISTRO_APT_SOURCES with default sources | expand

Commit Message

Florian Bezdeka Feb. 2, 2021, 11:09 p.m. UTC 
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(-)

Comments

Jan Kiszka Feb. 2, 2021, 11:43 p.m. UTC | #1 
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
>
Florian Bezdeka Feb. 3, 2021, 10:57 p.m. UTC | #2 
On Wed, 2021-02-03 at 10:43 +0100, Jan Kiszka wrote:
> 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.
> 

I see... That's truly not correct.

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

+1 for a revert from my side. Added Vijai to CC (author of the cleanup
commit). Maybe we get some more comments.

> Jan
> 
> >  WIC_IMAGER_INSTALL = "parted \
> >                        gdisk \
> > --
> > 2.29.2
> > 
> 
>
Anton Mikanovich March 2, 2021, 3:37 a.m. UTC | #3 
04.02.2021 11:57, florian.bezdeka@siemens.com wrote:
> On Wed, 2021-02-03 at 10:43 +0100, Jan Kiszka wrote:
>
> This isn't correct. DISTRO_APT_SOURCES points to the target distro,
> HOST_DISTRO_APT_SOURCES to the host distro.
>
>> 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"
>>>
> I see... That's truly not correct.
>
>> 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.
>>
> +1 for a revert from my side. Added Vijai to CC (author of the cleanup
> commit). Maybe we get some more comments.
>
>> Jan
>>
>>>   WIC_IMAGER_INSTALL = "parted \
>>>                         gdisk \
>>> --
>>> 2.29.2
>>>
>>
I've just proposed revert+fix here: 
https://groups.google.com/g/isar-users/c/Mf1QQuAQ9V4/m/VVXDYt29BgAJ
Please, review.
diff mbox series

Patch

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"
 
 WIC_IMAGER_INSTALL = "parted \
                       gdisk \