From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6942517048885903360 X-Received: by 2002:a17:906:5e4a:: with SMTP id b10mr676505eju.116.1616430720919; Mon, 22 Mar 2021 09:32:00 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:aa7:d788:: with SMTP id s8ls2318151edq.1.gmail; Mon, 22 Mar 2021 09:32:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyOk3MtpfIt/Jf5peI9gAZVuBgZvj+34G3Xlpj2BfBPmQnycwqtlEnkvuuh5iC23aa0R+yX X-Received: by 2002:a50:ec81:: with SMTP id e1mr472789edr.0.1616430720042; Mon, 22 Mar 2021 09:32:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1616430720; cv=none; d=google.com; s=arc-20160816; b=TbPJ0GwPaVCT0knjeOU3tPGMk0NSgNughRfSYUb0DOXmwzzwxqVf0uq3qJcBAlN9tL 6PvCZAwZOH6cumJKrPnzahXjzQN4aqUkw4pPfibeG2w11v7xJVFxe7l2m33z+JgXGCIU pIbYwlfObCUWqXnwZlbT/DyeZ4oaGWRbop57DTRY5pnZv+2PAqpNIwj9Ge7/EyMrKZLf t3vl2xv5gtdkw4bQqw9vZXzyYYDlTweJgJCdeUnM0cbzefZvgzz/SsGk/zwllfyiGbwU ll1hDL1ajZo+314FcfaUwBforz/7PEXSSMp6De/AK96664uVkOSv8xwLrwbNwCvRYRmT +O1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=XBlV3G7DXTnJGh96RchdKWJo4PEsuMkKk6vnGSMeweQ=; b=Cnb0rZynrtI+mSKIySgcyMscfVLQuUnpSdZknBaiZFY8AyhnTCWh44rTkzatjy4n0X 3SnNk6CipCcjqLx8kxvLpyLCgjc5NsnfWnaH4YpU+vRO5zSC3C0NTfde6/fjdfXBXIvn Imt/oJjPKIJgcvJa5A9wy08JfUDbQY5FNTDRKS5z6tyAgoU+lDftDTUN2CKQ80ddIJZT ocMHmU4/Lhi1FRs3S2m54FknFIOWAJDlZI+3X4MbiEUX3uHa+hBFdAl4d9jrwEZ6rBDi cd7JQUs7neMMNsma1SJfF7iiqGPtiwVTTSTwwS5tkBI44Cc6S0exvA+emVN2zZ3eo+OX +kbA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id w5si461999edv.1.2021.03.22.09.31.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 22 Mar 2021 09:32:00 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from localhost.localdomain (mm-180-82-121-178.mgts.dynamic.pppoe.byfly.by [178.121.82.180] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 12MGVpY9021727 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 22 Mar 2021 17:31:59 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v2 3/3] meta/conf/distro: Make debian inherit DISTRO_APT_SOURCES declaration Date: Mon, 22 Mar 2021 19:31:40 +0300 Message-Id: <20210322163140.159616-4-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210322163140.159616-1-amikan@ilbers.de> References: <20210322163140.159616-1-amikan@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: 5YrH/JBrpWpz 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 --- 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