From patchwork Mon Oct 26 20:26:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vijai Kumar K X-Patchwork-Id: 167 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:e04f:0:0:0:0:0 with SMTP id v15csp3194685oos; Mon, 26 Oct 2020 23:27:24 -0700 (PDT) X-Received: by 2002:a17:90a:9915:: with SMTP id b21mr626559pjp.150.1603780044401; Mon, 26 Oct 2020 23:27:24 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1603780044; cv=pass; d=google.com; s=arc-20160816; b=BrUKsSYLReA3QgxiJOrzwS5Dp3rHrHdUNoqJ97QTanHxprOfdb0bK/V9Pz7LYq8oqA oInbRUma0/OqzXLnf6KEzhioO8yuQPr3SLAxUpburnc1psa7fGMX1VaxA2drvZyfsHZh PuGFh2IIY5ZUvK5FRCrHwRJcuJxc6pu5uDjKkSrMbkD/ljNjAHEiftOT12n3V8qo7St/ xWah67QUFsUHQZdch3nqbhDYi1KuL5x1KofA5fk0Fmi+6E58Q5gRfMOFp1M1v4JF+Zx6 UbuvNtkgi0uuRkQJKpQ+34mv7kvXHZMGhop8jJ8TPZFOZE2pdyrD0U/QiPfpC9nkkwyz bB6A== 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:message-id:date :subject:cc:to:from:ironport-sdr:ironport-sdr:sender:dkim-signature; bh=yz9VBBTwAOTSnMKu/8tMbOfX7mrrhN2QtD1QbsivPhg=; b=BABf76Etno/8jLkWlxC97ja4vBI0pXeKk0xm0/ssYf4PNRUnWL+/dk4izeeHIkqUu8 UYisV1XCcbn8knGhvlgnmq6C0aV1roH4UxyckeekPKQzg/bZVU5nId8d3ormHc9r2UPB pdOTRDleXO1i8r2WPylugxoCKWHsa4kIZ/HcsX+vG27Ff6IFAeDLraVs38M3XX1QJZ/p lFzjhBjyjb9UjKhopc/2hDfkayebRbxh2f4k4qL0MLVKP7iDJSZqpAJ2zE576itU/mMH yky3eno2kG47Bu8+dlDziJeyUdpGzApJvK6QbEsh+ULJYuJzz3goE4G72CkzZXBDrEcv zPUQ== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=ZATCWktN; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrbs73336akgqes2kdxuy@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRBS73336AKGQES2KDXUY@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 s15sor356204plr.19.2020.10.26.23.27.23 (Google Transport Security); Mon, 26 Oct 2020 23:27:24 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbcwp7lf37ukrbs73336akgqes2kdxuy@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=ZATCWktN; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrbs73336akgqes2kdxuy@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRBS73336AKGQES2KDXUY@googlegroups.com ARC-Seal: i=2; a=rsa-sha256; t=1603780043; cv=pass; d=google.com; s=arc-20160816; b=GZ7Vn/aBky7x+QRjYTKM8JZST5c8JT4oFq/9mN/99sfzWyasNjTwNU4lgPk5SnMvdD gBqcREDAX0kDbHjNag6Vx1cmLaTF/2Bc9Y2g1wQqMpUlexpalUSbRj77l1DPLIdyCsW2 eDB4E03+Mb3e8DyrFd3r1oQgV0hcKhpE0MpdMDprGwJhgIcvrkomuSGDvdHNyfHRb3MA w85lKM8jgqeyOvBRqezd0LC6zvPAuA2CrRo/J0zwzN6yz7oPGMwP7SKxZmMwHBPa3O3z 8zt+1V7xSz8/ZUIJvKQP6tMrqk4j75bh9zSpZh5UDLDH37TqTbuaDWzUWxKHlA/dgpV/ K4ow== 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:message-id:date :subject:cc:to:from:ironport-sdr:ironport-sdr:sender:dkim-signature; bh=yz9VBBTwAOTSnMKu/8tMbOfX7mrrhN2QtD1QbsivPhg=; b=MF131eYLjMunbdV+D3BvHY91lr0VKeLUeuXIIrS4Ab7WGHQZidnYOcnYtwvTTgDXPb G03bulykWO8YJFZ2zBNfarRpMrFIIWiv49hUZjgLHj0DoS/HTEl4UbPVh6opcjHfkpu5 LhhdWDrz5qyzFL8fq6gTL84yYyjqsXfP02UUHQDdLymf3a/VkfA5Sp8G89JQp0ihznIq J95Sbcs9BQSsffA2OpG0ZAFJph0tt2FLEPJrHO//RqaSE1XlgQbA10NFubp/1Uw4oHKm GalGBF9vtwJUCbvxG7XNPFxYYvHxZ0vEaXOulIgZ+95uMUIp5diEcfdj9QmLTb6pfs+L jYWQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.141.98 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:ironport-sdr:ironport-sdr:from:to:cc:subject:date:message-id :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=yz9VBBTwAOTSnMKu/8tMbOfX7mrrhN2QtD1QbsivPhg=; b=ZATCWktNBrYXRc9wzInX9PlFEvEl6k1npgySuUZH6Pso1hzqK9MUBscU/3MMlGZwM/ Bw+p2V+NQ/EQN6V1KsI5qXzceWIpGpeEPQFWK+XUeArR8YcjsnsVG9/WDfv5wffXXsoa LgYbptqQVChv6OrGr5YmnA/eRUxodiXufYN3E9cukJOGCwoxxzhxT/Tpmo0i4mK7u6AI pG4hVCvte37oNIwJsErbKdmqT+OdBoEYmerDzl/8N4lWWixt/ihvSjTtErnZAft1Ut4Y UMZqQunuKuRSWoMPsWLc1pB0NKLhZzuEbUWKeyn9WHaSpqRYtFuYD/4z9KkrrSUP9L1p 2FYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:ironport-sdr:ironport-sdr:from:to:cc :subject:date:message-id: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=yz9VBBTwAOTSnMKu/8tMbOfX7mrrhN2QtD1QbsivPhg=; b=Mj/1Df7xrTPmF8dxl3RGrQb0L55GrKEA7iolV2iw2A9vZD40VYG63GzeoQo1Su7Lqc 1AYVZWOmLmBipEzIS2bSnU5woUHJpVos3oiaP/FQatUxM8K/ajNYrpTKJQLE+fkDbMPL wU/Tx6kkDm71ZFm64axL1CUREDMoPGOJf438pUDM/3WyQUAgkSbWiUH0jEJtIr/mOmk7 G1XULYjFhacBgabQpL2SKSbSCDDtoEEgffgVuWt9azzJATd0EHJBec0IYWrBnPJtC9yE LKK0lZYPbmvRULWwt7HT4oOEf3c56gh3foHm4OFsVc3buTacnLCZZJwxay6LZQmuBniA 2YqQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM5328s1r2z5jXtTiLi3yrhPY94u6hPxlgvrkTctcykPRb6B6jVDU2 DqOCbCU4NF3uOZq5WO+Cnlk= X-Google-Smtp-Source: ABdhPJxYLuO81twL0A/dWdHCh2oeNzF9IyNTb1bgTw8GLPRkHXBL/lIq+0wVLPu5Lqw0XnjWcKlNmg== X-Received: by 2002:a17:902:b492:b029:d4:d88c:d1a7 with SMTP id y18-20020a170902b492b02900d4d88cd1a7mr984294plr.15.1603780043656; Mon, 26 Oct 2020 23:27:23 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:90b:ec1:: with SMTP id gz1ls349228pjb.3.gmail; Mon, 26 Oct 2020 23:27:23 -0700 (PDT) X-Received: by 2002:a17:90a:34cd:: with SMTP id m13mr645401pjf.201.1603780043008; Mon, 26 Oct 2020 23:27:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1603780043; cv=none; d=google.com; s=arc-20160816; b=BPe42I5Jyy+TRI0swcYRUxkD+BLBNy/xrqntK3Km9NHlPvwqiSxCABSCJ1uFyx4L+t zizzQ5/mHF3sasG0etvL6FVMdbGVQoivuODtwoN3VTguu3m/FHQGQRZJRD99PDq2ngNS tT3B53rrBW4xExifFt61kMIm78rcjZv/0/d0qkH6KAc3ejsOx3Zw54tUjJXQ3wGChLM6 n9RUhc13aVPajQld3pWmjf94xXAO68oY4dJLD5UZZDmqVFfazuxUFZT4uJ4lbAdNQLC8 2I/Q5sOO0X3fOOqpAnd2Vun2488uIN/06IBPYOYyyObXTIHc1hHgeazKzxNq0hp+lydl Pc8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:message-id:date:subject:cc:to:from:ironport-sdr :ironport-sdr; bh=DYq2ul8NeE/FiiZBRSzt3i1gotQ34HNQ80CtndFny6s=; b=RnbrKZLcAuegRQiQK6SqQuizzr2ETLQ0e2Y1n5MNi6MvOqc9rK98TtHA5jLDMXKptU +uFYJHPiDJm0hcnGKpg3s0ra6Rt3ihJBvUHOvnKn63bpSaYXuIUqjIKHgn+ymuJVnRZ/ LleJ5cwic/jq6Q4dbabi0w5SQIWQ1P4hVZBWJZVOkg/6a0LQJ3+MDm4u05EZ6bIuKlHI vip4IIpAg/ssKoFdg5w0BGke1ppT1VbOTvqhcwyMnUUJRPQQ5lXcxNW5IMP3DyzhXnnc mzafmnZv+RZCcaTeXt3qiOaABvuYeUrC1GJl5Rje6frHRCl+kLHnnK5g1yZ1NQoN7Uca 6cLA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.141.98 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com Received: from esa2.mentor.iphmx.com (esa2.mentor.iphmx.com. [68.232.141.98]) by gmr-mx.google.com with ESMTPS id h24si46177plr.0.2020.10.26.23.27.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Oct 2020 23:27:22 -0700 (PDT) Received-SPF: pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.141.98 as permitted sender) client-ip=68.232.141.98; IronPort-SDR: +MyD+Tj3mXjBFHXuf2zs7TxnBUaG4HpjfUm7novmQGxouRQVVLkb42mlIRSIcuzuwNYpG+aNVk PB9+i40SfCGDxgMOlcntZa5Gp8OPwee33yD92Jic/jWV9m93xMEz0DK0LyYlJr5VFW6wk2DVB4 RDnnH29HyUHA+4VnKReVgivBXf6QEDz4ekautOUEiy7B0o+9H8ELBYN2RwdtgtwOS4UR9jdY+F iF1XyXfVxbLJ1eNA+NeRS3pS1kkB0FCetIjWksv8U81O9ebQbqHIhBb4DNmz63kL5Nmbm0PcMY v5M= X-IronPort-AV: E=Sophos;i="5.77,422,1596528000"; d="scan'208";a="54427690" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa2.mentor.iphmx.com with ESMTP; 26 Oct 2020 22:27:22 -0800 IronPort-SDR: CV2yg2V3bhjTWMyXy2Pib1mmKuhfoMvmLVoDdoqeQW/Vrz27WLZIocqRSf2roNCGYKxY4HTWoz JMqBprIaC9C+0aWf/tptEk2+wJStzk4c121pZ0OoXQb9gVvwMaUzXeLSlB5T2zLNF16PY8iPUD ++gTa9ii81vQi1mcbQzqyDvbtx32Aoarr4AwnoRBtdBa96VUf34+sYOSY/4gM1OhFTHqW43szj U7U/LTce+ft3mIZwtrrbEiZE2ITGaCWhuuRjBA9vM+U83dT1diF0CLwYNTyjji3eZSvMLf3WcD cdU= From: Vijai Kumar K To: CC: Vijai Kumar K Subject: [PATCH] meta/conf/distro: Cleanup DISTRO_APT_SOURCES Date: Tue, 27 Oct 2020 11:56:57 +0530 Message-ID: <20201027062657.11401-1-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 X-ClientProxiedBy: SVR-ORW-MBX-05.mgc.mentorg.com (147.34.90.205) To svr-orw-mbx-01.mgc.mentorg.com (147.34.90.201) X-Original-Sender: vijaikumar_kanagarajan@mentor.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.141.98 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com 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?1681685264245897482?= X-GMAIL-MSGID: =?utf-8?q?1681685264245897482?= All sources list file is named based on the DISTRO name. Simplify the DISTRO_APT_SOURCES declaration and move it to debian-common.conf. Signed-off-by: Vijai Kumar K Reviewed-by: Jan Kiszka --- 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-sid-ports.conf | 1 - meta/conf/distro/debian-stretch.conf | 1 - 5 files changed, 1 insertion(+), 4 deletions(-) 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 582678f..51017b3 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/${DISTRO}.list" WIC_IMAGER_INSTALL = "parted \ gdisk \ diff --git a/meta/conf/distro/debian-sid-ports.conf b/meta/conf/distro/debian-sid-ports.conf index 8a8beb5..03e14b5 100644 --- a/meta/conf/distro/debian-sid-ports.conf +++ b/meta/conf/distro/debian-sid-ports.conf @@ -12,7 +12,6 @@ HOST_DISTRO ?= "debian-sid" DEBIAN_PORTS_KEY = "https://www.ports.debian.org/archive_2020.key;sha256sum=d24c6d2fe55e563ff0d998666b5e55dd8058742517a6839d9c23d201b48180c8" -DISTRO_APT_SOURCES ?= "conf/distro/debian-${BASE_DISTRO_CODENAME}-ports.list" DISTRO_BOOTSTRAP_KEYS += "${DEBIAN_PORTS_KEY}" DISTRO_CONFIG_SCRIPT ?= "debian-configscript.sh" DISTRO_KERNELS ?= "riscv64" 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 \