| Message ID | 20210322163140.159616-3-amikan@ilbers.de |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | Fix DISTRO_APT_SOURCES declaration | expand |
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}" > >
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.
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}"
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(+)