From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6888182836072808448 X-Received: by 2002:aa7:9424:0:b029:15d:5340:83b0 with SMTP id y4-20020aa794240000b029015d534083b0mr92859pfo.73.1603780043761; 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-Google-Smtp-Source: ABdhPJwmDrYFkwBSZaQTe/tvuQ3bBBdoytSn2qPMHKoSJFhirfZ/eZpBPN7W55xVh3hlgOpLlxXj 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 Return-Path: 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; 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 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 Content-Type: text/plain Return-Path: Vijaikumar_Kanagarajan@mentor.com 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-TUID: arbMMpecBhXG 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 --- 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 \ -- 2.17.1