* [PATCH v2 0/3] Fix DISTRO_APT_SOURCES declaration
@ 2021-03-22 16:31 Anton Mikanovich
2021-03-22 16:31 ` [PATCH v2 1/3] Revert "meta/conf/distro: Cleanup DISTRO_APT_SOURCES" Anton Mikanovich
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Anton Mikanovich @ 2021-03-22 16:31 UTC (permalink / raw)
To: isar-users; +Cc: Anton Mikanovich
This patchset revert
f3b4f74a869a ("meta/conf/distro: Cleanup DISTRO_APT_SOURCES")
and perform the same cleanup in correct way to fix custom distro usage.
This also fix debian-sid.list and debian-sid-ports.list misusing caused
by lost "-ports" prefix.
---
Changes since v1:
- Fix Ubuntu targets build.
Anton Mikanovich (3):
Revert "meta/conf/distro: Cleanup DISTRO_APT_SOURCES"
ubuntu: Fix building of non-arm64 targets
meta/conf/distro: Make debian inherit DISTRO_APT_SOURCES declaration
meta-isar/conf/distro/ubuntu-focal.conf | 3 +++
meta/conf/distro/debian-common.conf | 2 +-
meta/conf/distro/debian-sid-ports.conf | 1 +
3 files changed, 5 insertions(+), 1 deletion(-)
--
2.25.1
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2 1/3] Revert "meta/conf/distro: Cleanup DISTRO_APT_SOURCES"
2021-03-22 16:31 [PATCH v2 0/3] Fix DISTRO_APT_SOURCES declaration Anton Mikanovich
@ 2021-03-22 16:31 ` Anton Mikanovich
2021-03-22 16:31 ` [PATCH v2 2/3] ubuntu: Fix building of non-arm64 targets Anton Mikanovich
2021-03-22 16:31 ` [PATCH v2 3/3] meta/conf/distro: Make debian inherit DISTRO_APT_SOURCES declaration Anton Mikanovich
2 siblings, 0 replies; 6+ messages in thread
From: Anton Mikanovich @ 2021-03-22 16:31 UTC (permalink / raw)
To: isar-users; +Cc: Anton Mikanovich
This cleanup brakes APT sources declaration for custom distros based on
debian-buster, debian-stretch, etc, because ${DISTRO}.list do not exist.
This reverts commit f3b4f74a869a83487b3ef735b6d14948bd89084b.
---
meta/conf/distro/debian-bullseye.conf | 1 +
meta/conf/distro/debian-buster.conf | 1 +
meta/conf/distro/debian-common.conf | 1 -
meta/conf/distro/debian-sid-ports.conf | 1 +
meta/conf/distro/debian-stretch.conf | 1 +
5 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/meta/conf/distro/debian-bullseye.conf b/meta/conf/distro/debian-bullseye.conf
index 98bd049..a93543c 100644
--- a/meta/conf/distro/debian-bullseye.conf
+++ b/meta/conf/distro/debian-bullseye.conf
@@ -6,6 +6,7 @@ BASE_DISTRO_CODENAME = "bullseye"
HOST_DISTRO ?= "debian-${BASE_DISTRO_CODENAME}"
+DISTRO_APT_SOURCES ?= "conf/distro/debian-${BASE_DISTRO_CODENAME}.list"
DISTRO_CONFIG_SCRIPT ?= "debian-configscript.sh"
DISTRO_KERNELS ?= "4kc-malta 5kc-malta 686 686-pae amd64 arm64 armmp \
armmp-lpae cloud-amd64 loongson-3 octeon powerpc64le rpi s390x marvell \
diff --git a/meta/conf/distro/debian-buster.conf b/meta/conf/distro/debian-buster.conf
index e7c837b..c898dba 100644
--- a/meta/conf/distro/debian-buster.conf
+++ b/meta/conf/distro/debian-buster.conf
@@ -6,6 +6,7 @@ BASE_DISTRO_CODENAME = "buster"
HOST_DISTRO ?= "debian-buster"
+DISTRO_APT_SOURCES ?= "conf/distro/debian-buster.list"
DISTRO_CONFIG_SCRIPT ?= "debian-configscript.sh"
DISTRO_KERNELS ?= "4kc-malta 5kc-malta 686 686-pae amd64 arm64 armmp \
armmp-lpae cloud-amd64 loongson-3 marvell octeon powerpc64le rpi s390x \
diff --git a/meta/conf/distro/debian-common.conf b/meta/conf/distro/debian-common.conf
index cb7f8ed..ca33d46 100644
--- a/meta/conf/distro/debian-common.conf
+++ b/meta/conf/distro/debian-common.conf
@@ -6,7 +6,6 @@
BASE_DISTRO = "debian"
HOST_DISTRO_APT_SOURCES ?= "conf/distro/${HOST_DISTRO}.list"
-DISTRO_APT_SOURCES ?= "conf/distro/${DISTRO}.list"
WIC_IMAGER_INSTALL = "parted \
gdisk \
diff --git a/meta/conf/distro/debian-sid-ports.conf b/meta/conf/distro/debian-sid-ports.conf
index 03e14b5..8a8beb5 100644
--- a/meta/conf/distro/debian-sid-ports.conf
+++ b/meta/conf/distro/debian-sid-ports.conf
@@ -12,6 +12,7 @@ HOST_DISTRO ?= "debian-sid"
DEBIAN_PORTS_KEY = "https://www.ports.debian.org/archive_2020.key;sha256sum=d24c6d2fe55e563ff0d998666b5e55dd8058742517a6839d9c23d201b48180c8"
+DISTRO_APT_SOURCES ?= "conf/distro/debian-${BASE_DISTRO_CODENAME}-ports.list"
DISTRO_BOOTSTRAP_KEYS += "${DEBIAN_PORTS_KEY}"
DISTRO_CONFIG_SCRIPT ?= "debian-configscript.sh"
DISTRO_KERNELS ?= "riscv64"
diff --git a/meta/conf/distro/debian-stretch.conf b/meta/conf/distro/debian-stretch.conf
index e1b9394..931256b 100644
--- a/meta/conf/distro/debian-stretch.conf
+++ b/meta/conf/distro/debian-stretch.conf
@@ -7,6 +7,7 @@ BASE_DISTRO_CODENAME = "stretch"
HOST_DISTRO ?= "debian-stretch"
+DISTRO_APT_SOURCES ?= "conf/distro/debian-stretch.list"
DISTRO_CONFIG_SCRIPT ?= "debian-configscript.sh"
DISTRO_KERNELS ?= "4kc-malta 586 5kc-malta 686 686-pae amd64 arm64 armmp \
armmp-lpae kirkwood loongson-3 marvell octeon orion5x powerpc64le \
--
2.25.1
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2 2/3] ubuntu: Fix building of non-arm64 targets
2021-03-22 16:31 [PATCH v2 0/3] Fix DISTRO_APT_SOURCES declaration Anton Mikanovich
2021-03-22 16:31 ` [PATCH v2 1/3] Revert "meta/conf/distro: Cleanup DISTRO_APT_SOURCES" Anton Mikanovich
@ 2021-03-22 16:31 ` Anton Mikanovich
2021-03-22 16:49 ` Jan Kiszka
2021-03-22 16:31 ` [PATCH v2 3/3] meta/conf/distro: Make debian inherit DISTRO_APT_SOURCES declaration Anton Mikanovich
2 siblings, 1 reply; 6+ messages in thread
From: Anton Mikanovich @ 2021-03-22 16:31 UTC (permalink / raw)
To: isar-users; +Cc: Anton Mikanovich
Generic apt sources list for ubuntu targets was added but not actually
used. This made qemuamd64-focal not buildable.
Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
---
meta-isar/conf/distro/ubuntu-focal.conf | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta-isar/conf/distro/ubuntu-focal.conf b/meta-isar/conf/distro/ubuntu-focal.conf
index 0e4557e..ceb854d 100644
--- a/meta-isar/conf/distro/ubuntu-focal.conf
+++ b/meta-isar/conf/distro/ubuntu-focal.conf
@@ -5,6 +5,7 @@
require conf/distro/debian-common.conf
+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}"
--
2.25.1
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2 3/3] meta/conf/distro: Make debian inherit DISTRO_APT_SOURCES declaration
2021-03-22 16:31 [PATCH v2 0/3] Fix DISTRO_APT_SOURCES declaration Anton Mikanovich
2021-03-22 16:31 ` [PATCH v2 1/3] Revert "meta/conf/distro: Cleanup DISTRO_APT_SOURCES" Anton Mikanovich
2021-03-22 16:31 ` [PATCH v2 2/3] ubuntu: Fix building of non-arm64 targets Anton Mikanovich
@ 2021-03-22 16:31 ` Anton Mikanovich
2 siblings, 0 replies; 6+ messages in thread
From: Anton Mikanovich @ 2021-03-22 16:31 UTC (permalink / raw)
To: isar-users; +Cc: Anton Mikanovich
To simplify distro introduction move all DISTRO_APT_SOURCES declarations
from debian-*.conf to parent debian-common.conf. Left declaration in
debian-sid-ports.conf untouched because of "-ports" suffix usage.
Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
---
meta-isar/conf/distro/ubuntu-focal.conf | 2 ++
meta/conf/distro/debian-bullseye.conf | 1 -
meta/conf/distro/debian-buster.conf | 1 -
meta/conf/distro/debian-common.conf | 1 +
meta/conf/distro/debian-stretch.conf | 1 -
5 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta-isar/conf/distro/ubuntu-focal.conf b/meta-isar/conf/distro/ubuntu-focal.conf
index ceb854d..4dfa201 100644
--- a/meta-isar/conf/distro/ubuntu-focal.conf
+++ b/meta-isar/conf/distro/ubuntu-focal.conf
@@ -5,6 +5,8 @@
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}"
diff --git a/meta/conf/distro/debian-bullseye.conf b/meta/conf/distro/debian-bullseye.conf
index a93543c..98bd049 100644
--- a/meta/conf/distro/debian-bullseye.conf
+++ b/meta/conf/distro/debian-bullseye.conf
@@ -6,7 +6,6 @@ BASE_DISTRO_CODENAME = "bullseye"
HOST_DISTRO ?= "debian-${BASE_DISTRO_CODENAME}"
-DISTRO_APT_SOURCES ?= "conf/distro/debian-${BASE_DISTRO_CODENAME}.list"
DISTRO_CONFIG_SCRIPT ?= "debian-configscript.sh"
DISTRO_KERNELS ?= "4kc-malta 5kc-malta 686 686-pae amd64 arm64 armmp \
armmp-lpae cloud-amd64 loongson-3 octeon powerpc64le rpi s390x marvell \
diff --git a/meta/conf/distro/debian-buster.conf b/meta/conf/distro/debian-buster.conf
index c898dba..e7c837b 100644
--- a/meta/conf/distro/debian-buster.conf
+++ b/meta/conf/distro/debian-buster.conf
@@ -6,7 +6,6 @@ BASE_DISTRO_CODENAME = "buster"
HOST_DISTRO ?= "debian-buster"
-DISTRO_APT_SOURCES ?= "conf/distro/debian-buster.list"
DISTRO_CONFIG_SCRIPT ?= "debian-configscript.sh"
DISTRO_KERNELS ?= "4kc-malta 5kc-malta 686 686-pae amd64 arm64 armmp \
armmp-lpae cloud-amd64 loongson-3 marvell octeon powerpc64le rpi s390x \
diff --git a/meta/conf/distro/debian-common.conf b/meta/conf/distro/debian-common.conf
index ca33d46..ba5262a 100644
--- a/meta/conf/distro/debian-common.conf
+++ b/meta/conf/distro/debian-common.conf
@@ -6,6 +6,7 @@
BASE_DISTRO = "debian"
HOST_DISTRO_APT_SOURCES ?= "conf/distro/${HOST_DISTRO}.list"
+DISTRO_APT_SOURCES ?= "conf/distro/${BASE_DISTRO}-${BASE_DISTRO_CODENAME}.list"
WIC_IMAGER_INSTALL = "parted \
gdisk \
diff --git a/meta/conf/distro/debian-stretch.conf b/meta/conf/distro/debian-stretch.conf
index 931256b..e1b9394 100644
--- a/meta/conf/distro/debian-stretch.conf
+++ b/meta/conf/distro/debian-stretch.conf
@@ -7,7 +7,6 @@ BASE_DISTRO_CODENAME = "stretch"
HOST_DISTRO ?= "debian-stretch"
-DISTRO_APT_SOURCES ?= "conf/distro/debian-stretch.list"
DISTRO_CONFIG_SCRIPT ?= "debian-configscript.sh"
DISTRO_KERNELS ?= "4kc-malta 586 5kc-malta 686 686-pae amd64 arm64 armmp \
armmp-lpae kirkwood loongson-3 marvell octeon orion5x powerpc64le \
--
2.25.1
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2 2/3] ubuntu: Fix building of non-arm64 targets
2021-03-22 16:31 ` [PATCH v2 2/3] ubuntu: Fix building of non-arm64 targets Anton Mikanovich
@ 2021-03-22 16:49 ` Jan Kiszka
2021-03-23 11:56 ` Anton Mikanovich
0 siblings, 1 reply; 6+ messages in thread
From: Jan Kiszka @ 2021-03-22 16:49 UTC (permalink / raw)
To: Anton Mikanovich, isar-users
On 22.03.21 17:31, Anton Mikanovich wrote:
> Generic apt sources list for ubuntu targets was added but not actually
> used. This made qemuamd64-focal not buildable.
>
The commit message is misleading: patch 1 causes this. Before that,
DISTRO_APT_SOURCE came from debian-common.conf (which had other issues,
as we know). You likely want to reorder to avoid bisection breakage.
Jan
> Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
> ---
> meta-isar/conf/distro/ubuntu-focal.conf | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/meta-isar/conf/distro/ubuntu-focal.conf b/meta-isar/conf/distro/ubuntu-focal.conf
> index 0e4557e..ceb854d 100644
> --- a/meta-isar/conf/distro/ubuntu-focal.conf
> +++ b/meta-isar/conf/distro/ubuntu-focal.conf
> @@ -5,6 +5,7 @@
>
> require conf/distro/debian-common.conf
>
> +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}"
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2 2/3] ubuntu: Fix building of non-arm64 targets
2021-03-22 16:49 ` Jan Kiszka
@ 2021-03-23 11:56 ` Anton Mikanovich
0 siblings, 0 replies; 6+ messages in thread
From: Anton Mikanovich @ 2021-03-23 11:56 UTC (permalink / raw)
To: Jan Kiszka, isar-users
22.03.2021 19:49, Jan Kiszka wrote:
> On 22.03.21 17:31, Anton Mikanovich wrote:
>> Generic apt sources list for ubuntu targets was added but not actually
>> used. This made qemuamd64-focal not buildable.
>>
> The commit message is misleading: patch 1 causes this. Before that,
> DISTRO_APT_SOURCE came from debian-common.conf (which had other issues,
> as we know). You likely want to reorder to avoid bisection breakage.
>
> Jan
>
>> Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
>> ---
>> meta-isar/conf/distro/ubuntu-focal.conf | 1 +
>> 1 file changed, 1 insertion(+)
>>
>> diff --git a/meta-isar/conf/distro/ubuntu-focal.conf b/meta-isar/conf/distro/ubuntu-focal.conf
>> index 0e4557e..ceb854d 100644
>> --- a/meta-isar/conf/distro/ubuntu-focal.conf
>> +++ b/meta-isar/conf/distro/ubuntu-focal.conf
>> @@ -5,6 +5,7 @@
>>
>> require conf/distro/debian-common.conf
>>
>> +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}"
>>
>>
Thanks for notice, will send new patchset.
--
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] 6+ messages in thread
end of thread, other threads:[~2021-03-23 11:56 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-22 16:31 [PATCH v2 0/3] Fix DISTRO_APT_SOURCES declaration Anton Mikanovich
2021-03-22 16:31 ` [PATCH v2 1/3] Revert "meta/conf/distro: Cleanup DISTRO_APT_SOURCES" Anton Mikanovich
2021-03-22 16:31 ` [PATCH v2 2/3] ubuntu: Fix building of non-arm64 targets Anton Mikanovich
2021-03-22 16:49 ` Jan Kiszka
2021-03-23 11:56 ` Anton Mikanovich
2021-03-22 16:31 ` [PATCH v2 3/3] meta/conf/distro: Make debian inherit DISTRO_APT_SOURCES declaration Anton Mikanovich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox