From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6806942465336016896 X-Received: by 2002:a19:c304:: with SMTP id t4mr1856993lff.177.1584864795264; Sun, 22 Mar 2020 01:13:15 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:96:: with SMTP id 22ls2195742ljq.0.gmail; Sun, 22 Mar 2020 01:13:14 -0700 (PDT) X-Google-Smtp-Source: ADFU+vs3ZWVerj+60gvX7xuIS86H000OuYEMHViuKoAUt3BdB1njgNznFB3VtXRFR13WcDqTXGUB X-Received: by 2002:a2e:90da:: with SMTP id o26mr10624244ljg.254.1584864794442; Sun, 22 Mar 2020 01:13:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1584864794; cv=none; d=google.com; s=arc-20160816; b=dELvYvOLpI7rIp1ZPEar3eF6F8UqZhsj0F8RcD+bRtvZPKbM+hiUdZd0QhOIvonHif gCVPD1HCi7bsuqgXsVPtvomBMyWQDVrmcLfu7MYeDkxuA/d40zbAWQWS8ZXI5oxW7L+z plNMA8cEii6UXMIUFbrIIVLMWdtRi38gd4boaDhTfMzDtqVK+qI648wQnrUfu6lmzLhp /sU0YiaZ42JoPjWzr5lzBEaiNAeXgLYMfFURlWMEeEbIf8XxfobD2vviErvXbolkoPRC J7w4ik6lvdBu6YfDtiAg9E3TsQQg9H8EaidFhKuYfhoC9pNGN1lZT5hbIl9vYzbACAhT Y1UA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:mime-version:user-agent :date:message-id:to:subject:from; bh=j7TFTZ7PRd2YoBvI1azaSxoMeJNJnktzmtE5MjQMmQ8=; b=nrSiBSWCP75MMqIKTRoq7+LOFHJ2RVSFcNUuaQ2TaYFLjG8KNnq284IwwdTI6r1Nbq Gu40NbqFjmqzSEf/DXwskDWaK0vzJEPUx3253dV3nHCGI1f6kJBtXDutMA4jW1p9rYNu 1bMtaFvH5whr8ScakOjA2rsvSXLSflLhV7fKTtgOxCmR+ggNFWImI3LMscgwcIS+p7QL JBmn3yjettg+JexVP2XSFKbdn9KnZ514hb0PWsVnyWzKI+WDcyUHxEXQFaXTm9CTAtdX GUSV7d8VlGqjNNTtqQxlZ2hor8TShgX1Xx+ydZlfQaIzSkX7c1RstGptyIB3a4KpE2Iw qmGg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id a21si783273lff.3.2020.03.22.01.13.14 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 22 Mar 2020 01:13:14 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id 02M8DD0h014854 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Sun, 22 Mar 2020 09:13:13 +0100 Received: from [167.87.6.154] ([167.87.6.154]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 02M8DDY9029097 for ; Sun, 22 Mar 2020 09:13:13 +0100 From: Jan Kiszka Subject: [PATCH] Allow to manage HOST_DISTRO_APT_SOURCES via distro config To: isar-users Message-ID: <276fd433-688c-4131-d3d6-74fbb08bc865@siemens.com> Date: Sun, 22 Mar 2020 09:13:13 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: 3oeY4//rh1ae From: Jan Kiszka Avoid any hard-coded assumption about how HOST_DISTRO_APT_SOURCES is defined and move this into the distro configuration. This does not change anything for in-tree distro configs but makes life easier for layers that define their own distro. Signed-off-by: Jan Kiszka --- meta-isar/conf/distro/raspbian-stretch.conf | 1 + meta/conf/distro/debian-common.conf | 2 ++ meta/conf/distro/debian-sid-ports.conf | 2 +- meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 1 - 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/meta-isar/conf/distro/raspbian-stretch.conf b/meta-isar/conf/distro/raspbian-stretch.conf index 25c484d6..c8f523b3 100644 --- a/meta-isar/conf/distro/raspbian-stretch.conf +++ b/meta-isar/conf/distro/raspbian-stretch.conf @@ -7,6 +7,7 @@ BASE_DISTRO = "raspbian" BASE_DISTRO_CODENAME = "stretch" HOST_DISTRO ?= "debian-stretch" +HOST_DISTRO_APT_SOURCES ?= "conf/distro/${HOST_DISTRO}.list" DISTRO_APT_SOURCES ?= "conf/distro/raspbian-stretch.list" DISTRO_BOOTSTRAP_KEYS += "https://archive.raspbian.org/raspbian.public.key;sha256sum=ca59cd4f2bcbc3a1d41ba6815a02a8dc5c175467a59bd87edeac458f4a5345de" diff --git a/meta/conf/distro/debian-common.conf b/meta/conf/distro/debian-common.conf index b845c738..7d681c49 100644 --- a/meta/conf/distro/debian-common.conf +++ b/meta/conf/distro/debian-common.conf @@ -5,6 +5,8 @@ BASE_DISTRO = "debian" +HOST_DISTRO_APT_SOURCES ?= "conf/distro/${HOST_DISTRO}.list" + WIC_IMAGER_INSTALL = "parted \ gdisk \ util-linux \ diff --git a/meta/conf/distro/debian-sid-ports.conf b/meta/conf/distro/debian-sid-ports.conf index 4997584e..8a8beb5a 100644 --- a/meta/conf/distro/debian-sid-ports.conf +++ b/meta/conf/distro/debian-sid-ports.conf @@ -17,7 +17,7 @@ DISTRO_BOOTSTRAP_KEYS += "${DEBIAN_PORTS_KEY}" DISTRO_CONFIG_SCRIPT ?= "debian-configscript.sh" DISTRO_KERNELS ?= "riscv64" -HOST_DISTRO_APT_SOURCES_append = " ${DISTRO_APT_SOURCES}" +HOST_DISTRO_APT_SOURCES += "${DISTRO_APT_SOURCES}" THIRD_PARTY_APT_KEYS += "${DEBIAN_PORTS_KEY}" IMAGE_PREINSTALL += "init" diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index 16b4395b..6f496d9e 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -28,7 +28,6 @@ DEPLOY_ISAR_BOOTSTRAP ?= "" DISTRO_BOOTSTRAP_BASE_PACKAGES = "locales" DISTRO_BOOTSTRAP_BASE_PACKAGES_append_gnupg = ",gnupg" DISTRO_BOOTSTRAP_BASE_PACKAGES_append_https-support = ",apt-transport-https,ca-certificates" -HOST_DISTRO_APT_SOURCES += "conf/distro/${HOST_DISTRO}.list" python () { distro_bootstrap_keys = (d.getVar("DISTRO_BOOTSTRAP_KEYS") or "").split() -- 2.16.4