From patchwork Mon Mar 22 06:31:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 378 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:378f:0:0:0:0:0 with SMTP id r137csp3733600oor; Mon, 22 Mar 2021 09:32:01 -0700 (PDT) X-Received: by 2002:adf:c389:: with SMTP id p9mr374456wrf.410.1616430721159; Mon, 22 Mar 2021 09:32:01 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1616430721; cv=pass; d=google.com; s=arc-20160816; b=GAPAk9R/ixnsZXSlOobm6W/zzLuDYdil+NnYaNXr36ewc+0bu/DNTyEOEKbexNTA6i Lat23l9B8RMppzu7akBL8j6UZZkRaXu8BnvEvgTiWy0FdH9RvtkVJ56Kkhd2ScIva9ma gzm5oXCCyxaeF3SgdGFWCgS/OfLsblJ43YNcAnzIUnznLYSft1YU/IM+CH8IGymtjPQD wzO5QZtLJRaQswDh9Ii0XyBXFrFhrTx5fod/nE+BHejhAW0gweksMKQ8F6tZ3K3ToZCh MaDPr2u40s3o8oYUSepLWpaInCcjgpP9Ppsw/rZj660SFw/xDTBEptcoqgLZqB/1wYxm FD1g== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=dpLMUiBTp+6Km3LcJuc3aShKsTtZ/wXA3Uz7TDNIyp8=; b=nb7Nse6ogwpIjWoH7rhfkbTSRwGBWjV3O41tNmCTiYNljHpybXBbxPkQYVBSUFekgZ JJe8SlINOc2kiNWYyccedYDJJJ+qmoPLEgtRfw/PxgEqtPUqpuv5/1B5+uQpGoXiGFVi MyUq8IqVAqSu/9pILvKOotDGFxxrjuyOc3WMm5wsLm4umwkAehk/PXradzGLTL0x0lzx Rk7F6zIg/cp3SSPrAl6ijo3kOFUZWBgqHDMNRdv97gYLSTX91/YavtDxz9DRklmnylHt MBGIaG9dRy5JH99pZ4TXTEIF1gNpVxJdcZOm4qr7D5HSLUBBX+PyuM1cWAUFjBOp0P0W vEZg== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=cyHigcKJ; arc=pass (i=2 spf=pass spfdomain=ilbers.de); spf=pass (google.com: domain of isar-users+bncbchiponzwecrbaen4obamgqekjdf2ny@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCHIPONZWECRBAEN4OBAMGQEKJDF2NY@googlegroups.com Received: from mail-sor-f55.google.com (mail-sor-f55.google.com. [209.85.220.55]) by mx.google.com with SMTPS id w13sor6759677wmi.16.2021.03.22.09.32.00 (Google Transport Security); Mon, 22 Mar 2021 09:32:01 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbchiponzwecrbaen4obamgqekjdf2ny@googlegroups.com designates 209.85.220.55 as permitted sender) client-ip=209.85.220.55; Authentication-Results: mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=cyHigcKJ; arc=pass (i=2 spf=pass spfdomain=ilbers.de); spf=pass (google.com: domain of isar-users+bncbchiponzwecrbaen4obamgqekjdf2ny@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCHIPONZWECRBAEN4OBAMGQEKJDF2NY@googlegroups.com ARC-Seal: i=2; a=rsa-sha256; t=1616430720; cv=pass; d=google.com; s=arc-20160816; b=nWRUgAtKb+zoIU0w4RzrlfHVHLhLaMTiWUC7LkQcW8I+55RIhHc1JqXgB8OL65Q+dN Vus0WqzJ/ftfS/glz2QwvWnPPz7y5mcC6/apW7CIQ5tXnNe1GK0ZM7taCAcdC5F06KqN PRkpWejajKuHqQWjak15OS/AtMglO8c3sgt4MiBGNEI++BU3P4VQ4rusTL00er/FGc5R 6L5RAf1n92OmUCb5fV+3mk8nW1mh6P5PmRTdB5YxG4WShGEQXqUhnjagtQ+16qVWpWP7 3GwKaJAj4jWpHaHuCQo/8bbO8lLLRCUQ84bOy9tSdy7nz6X0sKOFFXdXINPZ615NOu8S 4ZbQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=dpLMUiBTp+6Km3LcJuc3aShKsTtZ/wXA3Uz7TDNIyp8=; b=QC8gcIf3QLnkPVQG8F4OjYxZWPy/qpCoF/0VmZGzp5Rf52WaV47CttCLMS59qUE2U4 HLQNcbatNaKbNR1erXgNud2HUzqgSxVV2TuIvR/nXl32ZcG6QZ95XFSAt/u3Nkkg/S64 8pL6anssVf7nYndOyaNybni8QJ1SFlJ42IakOYgMdGlTD9EuadJF6JjzO8iBW97gmwI/ P5j9d04bLruLHpankmJCU/GkE2FPNdXA4P6REBwYYLCgvIB6xZXB2wsZ4hyw5T3P6SVw P+rfM9f14d5AZ81qzSbDCXaod/0qpi/k0HYTMiH2XzxUZr/adjvi0NGsbXQEREY22Fjr 9llw== ARC-Authentication-Results: i=2; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=dpLMUiBTp+6Km3LcJuc3aShKsTtZ/wXA3Uz7TDNIyp8=; b=cyHigcKJN/V3ORuJrfX0dF4VC6zaOgpGbqGFVRg/syPMLoxOdcNV7re8rhaqxRXrgK Jf4BJbSUqZjCiJ9ND8X8QxGzYLVCnw4UWXUrIA1VEEHFsP+bUZ6jI8KqugGsfB+XRiBd b5/aSKfgz77xG6EkbmtE9+HyDy6NZmc1sEEm459VtRDRRajuwsaEQVFRcQkmy1jXFRWb HWrIelPX7d7u/jX/5GDFB6p63f01X8FiLsjjOVg3Zr7/9emkyYFxAkL6QKTzo38NwOgW c9RBZSPT/VC06CSzQaNL7X+kXKesYYC1fWOQ9dILSjG5ErhVUx45G48+o1i3/iRcl8Z2 9H/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=dpLMUiBTp+6Km3LcJuc3aShKsTtZ/wXA3Uz7TDNIyp8=; b=aB5zUMkA2MBviHpZFbNzLQt2EfUujw2CNgNXO/+etH/so+peQoo1rFghIUbB2TsmMx dGWWNNWSzzGohxMPB4d+dpQW0v6VQJjD/Yj4uX6CiMrxpE2IxdGqAb5kCwWZ+JaGTD1T fRssZPEgq3n/LxGEH87UJ2hxW4yhazHOV8Z84DErMRJ89XHQAUjxJS/pKe4kqAJXBDh9 immhpwHGz67PxnzengKx0nucIbSUAFnuUALILa89isxpRRNOM2NpyHpSjDsIT6b16u35 RpOsjLCyLaTZg+d18ju2UU5oFH+d8pMZ3LLCaX3CkFqJebcxEC21/UyGOc0AULEUDkOH 5UNg== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM530BeAOZpkyPhaJhT49fmM4Yttib2gjf80DY21AwX3tK/Z18PSOJ CiO1wCRb4wkE2qAZDzGrkDI= X-Google-Smtp-Source: ABdhPJz6OjpLQC/Souk/XT360rMpw3bwuwpm3/cAc+xjuZSMvt/dImc9/hvY6jjLvIRh9iyDVAL7hg== X-Received: by 2002:aa7:c709:: with SMTP id i9mr379011edq.319.1616430720825; 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-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 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; 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 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-Original-Sender: amikan@ilbers.de X-Original-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 Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1694950460231948894?= X-GMAIL-MSGID: =?utf-8?q?1694950460231948894?= 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 \