* [PATCH] meta/conf/distro: Fix filling of DISTRO_APT_SOURCES with default sources
@ 2021-02-03 9:09 florian.bezdeka
2021-02-03 9:43 ` Jan Kiszka
0 siblings, 1 reply; 4+ messages in thread
From: florian.bezdeka @ 2021-02-03 9:09 UTC (permalink / raw)
To: isar-users; +Cc: jan.kiszka, florian.bezdeka
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"
WIC_IMAGER_INSTALL = "parted \
gdisk \
--
2.29.2
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] meta/conf/distro: Fix filling of DISTRO_APT_SOURCES with default sources
2021-02-03 9:09 [PATCH] meta/conf/distro: Fix filling of DISTRO_APT_SOURCES with default sources florian.bezdeka
@ 2021-02-03 9:43 ` Jan Kiszka
2021-02-04 8:57 ` florian.bezdeka
0 siblings, 1 reply; 4+ messages in thread
From: Jan Kiszka @ 2021-02-03 9:43 UTC (permalink / raw)
To: Bezdeka, Florian (T RDA IOT SES-DE), isar-users
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
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] meta/conf/distro: Fix filling of DISTRO_APT_SOURCES with default sources
2021-02-03 9:43 ` Jan Kiszka
@ 2021-02-04 8:57 ` florian.bezdeka
2021-03-02 13:37 ` Anton Mikanovich
0 siblings, 1 reply; 4+ messages in thread
From: florian.bezdeka @ 2021-02-04 8:57 UTC (permalink / raw)
To: isar-users, jan.kiszka; +Cc: Vijaikumar_Kanagarajan
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
> >
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] meta/conf/distro: Fix filling of DISTRO_APT_SOURCES with default sources
2021-02-04 8:57 ` florian.bezdeka
@ 2021-03-02 13:37 ` Anton Mikanovich
0 siblings, 0 replies; 4+ messages in thread
From: Anton Mikanovich @ 2021-03-02 13:37 UTC (permalink / raw)
To: florian.bezdeka, isar-users, jan.kiszka; +Cc: Vijaikumar_Kanagarajan
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.
--
Anton Mikanovich
Promwad Ltd.
External service provider of ilbers GmbH
Maria-Merian-Str. 8
85521 Ottobrunn, Germany
+49 (89) 122 67 24-0
Commercial register Munich, HRB 214197
General Manager: Baurzhan Ismagulov
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-03-02 13:37 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-03 9:09 [PATCH] meta/conf/distro: Fix filling of DISTRO_APT_SOURCES with default sources florian.bezdeka
2021-02-03 9:43 ` Jan Kiszka
2021-02-04 8:57 ` florian.bezdeka
2021-03-02 13:37 ` Anton Mikanovich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox