From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6812547951170158592 X-Received: by 2002:a17:906:64b:: with SMTP id t11mr19981392ejb.224.1586169924125; Mon, 06 Apr 2020 03:45:24 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a50:99d5:: with SMTP id n21ls8059831edb.10.gmail; Mon, 06 Apr 2020 03:45:23 -0700 (PDT) X-Google-Smtp-Source: APiQypIKyj77dYHEBxzkl0IafU8w/LwIGbUt3JbDwnE8Gq7oNmV1TAVehnk77lHLysO69TEdxFCg X-Received: by 2002:a50:8e08:: with SMTP id 8mr19071684edw.153.1586169923303; Mon, 06 Apr 2020 03:45:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1586169923; cv=none; d=google.com; s=arc-20160816; b=NBa7oCz/iZBJ7s6S/HjWTcQFPGXRjt5Pz23SJCLxo4tzkPWXewTYDy9fwN2TZumIGA 9BmDJdBIKLvi1gM1gESuzDvN+zfkYnt1m5sTa15jI5LHDfNJH6MaLvL6n1a0MBwEMi5z iPfPtuamE6Y7rCVKVJEUD2N/sj2p9ccQaWzgPSFtxc90dOxSh24D3CG+qwffxttcwsg5 GT4ok0cT+sywYRm6DPLmXL8uI1OmAEraB+ahKzhFIOHr6h3WCrS5RUgtEq6XamAYpmPn ISQPmOtWmvB2X25ddbWp2OZM4bEqypHyWFJlelt0CPTCBTBLKmLnsYbBu6sIVTjQSJok YwPA== 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=TI+Rf+c0lUwoN16SjjxRUUZKj2eF29ZeuKf7EoyVS+Q=; b=y2y/jXp7UMxbHTwUleYcYfeEr/Zbf6vUUqF2rm7x5T9gctdHk7B0lPuMhHYnsiR8om UU+JIBSPHva2UpMyl/8/hwIfnOPOHLZ6PedU4NjwiWl0mq87C1fPSth0CK03h038ikZM 2H0KJarFEKdkvOVjT5rdNuxHjisddqsVWsLblCUK4mZrkqzoX/D2vn2O08X1Y7XUcnji nuUaPBaDwTZNc5h38Uq1iCL5Od3Cr/LuhM6UMITKLAAxcy+ZfrToRUEHrPdqBd1XbMbC +NSkdJSzAFOmgIhdRPGlx3iRXDC7fSKk7My+LAbW9kQ9H455XheJaAlwaTPFBp3ZBv6q kZyQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 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 goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id v14si914018edr.4.2020.04.06.03.45.23 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Apr 2020 03:45:23 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 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 goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id 036AjM1f014498 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 6 Apr 2020 12:45:22 +0200 Received: from [139.22.38.89] ([139.22.38.89]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 036AjMSn012311 for ; Mon, 6 Apr 2020 12:45:22 +0200 From: Jan Kiszka Subject: [PATCH v2] Allow to manage HOST_DISTRO_APT_SOURCES via distro config To: isar-users Message-ID: Date: Mon, 6 Apr 2020 12:45:22 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.6.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: 4zhPNh+9GryH 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 --- Changes in v2: - rebased over next 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 9ab80acc..da0d436b 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -26,7 +26,6 @@ DEPLOY_ISAR_BOOTSTRAP ?= "" DISTRO_BOOTSTRAP_BASE_PACKAGES = "locales" DISTRO_BOOTSTRAP_BASE_PACKAGES_append_gnupg = ",gnupg" DISTRO_BOOTSTRAP_BASE_PACKAGES_append_https-support = "${@https_support(d)}" -HOST_DISTRO_APT_SOURCES += "conf/distro/${HOST_DISTRO}.list" inherit deb-dl-dir -- 2.16.4 -- Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux