public inbox for isar-users@googlegroups.com
 help / color / mirror / Atom feed
From: "florian.bezdeka@siemens.com" <florian.bezdeka@siemens.com>
To: "isar-users@googlegroups.com" <isar-users@googlegroups.com>
Cc: "jan.kiszka@siemens.com" <jan.kiszka@siemens.com>,
	"florian.bezdeka@siemens.com" <florian.bezdeka@siemens.com>
Subject: [PATCH] meta/conf/distro: Fix filling of DISTRO_APT_SOURCES with default sources
Date: Wed, 3 Feb 2021 09:09:36 +0000	[thread overview]
Message-ID: <20210203090927.97067-1-florian.bezdeka@siemens.com> (raw)

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

             reply	other threads:[~2021-02-03  9:09 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-03  9:09 florian.bezdeka [this message]
2021-02-03  9:43 ` Jan Kiszka
2021-02-04  8:57   ` florian.bezdeka
2021-03-02 13:37     ` Anton Mikanovich

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210203090927.97067-1-florian.bezdeka@siemens.com \
    --to=florian.bezdeka@siemens.com \
    --cc=isar-users@googlegroups.com \
    --cc=jan.kiszka@siemens.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox