From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6942517048885903360 X-Received: by 2002:ac2:546b:: with SMTP id e11mr2472983lfn.48.1616503554628; Tue, 23 Mar 2021 05:45:54 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:b603:: with SMTP id r3ls3120623ljn.5.gmail; Tue, 23 Mar 2021 05:45:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwrEia76zeOKMtlelX1yJ+QCLgRJz738TrwokajjV1xDZ3WDEfoe6KmyCWmXj32RBPRbXLg X-Received: by 2002:a2e:8006:: with SMTP id j6mr2918816ljg.417.1616503553621; Tue, 23 Mar 2021 05:45:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1616503553; cv=none; d=google.com; s=arc-20160816; b=oTPTsVmWXsnT6wwa+RYZpaKvIzukPcfOddJUI2r9tRf/cXFpb/pt9yEDt86RQvVoZ1 ZTKmEN6cPB6Ob1M0hDXezqMeIJQY8iskrUkH960jSEfjK+V16dRBU4NBpmdZNOvUJoFn yaYqD24f2PLR1Lwd4seZ+A3dWDiDRxDs57E/y+dMOgjfY3XhDBp4pZQTsoVOw3xEpU/A HWkKncVlz5FwP5efYYuY41KXW9LC1gL/HRUNHAp12/tXdOcIV264PvdcWvT/6Jx4Td8W ZVBbxAAophLq7I03R7hDPLbNdDmbtrAQCioqbXzg3091uENbF1HnGgfs0zf52lt78jDb 4skQ== 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=cENayqqGEz38S5WfiIcifgRSkW1PdZ+BWWM5BI3EWw8=; b=SdokGlpRAScbP7Put0eZ9VH6MQpitKoJRqEzRh5CNutIk4YvSRBiwFK4zcVHgwNWv9 ScMoma873+f4cquxCUweQj2pWpomsxP1uWkg8ztLS1ZYehjcu4vLOHu2TV2Ck7IA5Gsv SfGNAgRmSykkK1udiXCofIwbsGl+jfnpbeX0dMnwz1ytNGE9aY4EUnvtqSBrkOnzixCw 820rhqbmntNMy+MLbFtFfGxfAr8HKyFQb4OsaC4nr6sE4xgjP4tvXOXsF2kqtqrGSmFg eoiRh6lJDsvkeQ2i3DtlkW+r/XSvgvS2Y3VMIaOmVkhHaCERYsxw/IsVxwqrvNsB4P2D TIkA== 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 d32si385248lfv.8.2021.03.23.05.45.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Mar 2021 05:45:53 -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-65-41-120-178.brest.dynamic.pppoe.byfly.by [178.120.41.65]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 12NCjko8026388 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 23 Mar 2021 13:45:52 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v3 2/3] Revert "meta/conf/distro: Cleanup DISTRO_APT_SOURCES" Date: Tue, 23 Mar 2021 15:45:37 +0300 Message-Id: <20210323124538.171770-3-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210323124538.171770-1-amikan@ilbers.de> References: <20210323124538.171770-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: IJQfne5m+GaC Previous cleanup brakes APT sources declaration for custom distros based on debian-buster, debian-stretch, etc, because ${DISTRO}.list do not exist. This reverts commit f3b4f74a869a83487b3ef735b6d14948bd89084b. --- 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, 4 insertions(+), 1 deletion(-) diff --git a/meta/conf/distro/debian-bullseye.conf b/meta/conf/distro/debian-bullseye.conf index 98bd049..a93543c 100644 --- a/meta/conf/distro/debian-bullseye.conf +++ b/meta/conf/distro/debian-bullseye.conf @@ -6,6 +6,7 @@ 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 e7c837b..c898dba 100644 --- a/meta/conf/distro/debian-buster.conf +++ b/meta/conf/distro/debian-buster.conf @@ -6,6 +6,7 @@ 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 cb7f8ed..ca33d46 100644 --- a/meta/conf/distro/debian-common.conf +++ b/meta/conf/distro/debian-common.conf @@ -6,7 +6,6 @@ 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 03e14b5..8a8beb5 100644 --- a/meta/conf/distro/debian-sid-ports.conf +++ b/meta/conf/distro/debian-sid-ports.conf @@ -12,6 +12,7 @@ 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 e1b9394..931256b 100644 --- a/meta/conf/distro/debian-stretch.conf +++ b/meta/conf/distro/debian-stretch.conf @@ -7,6 +7,7 @@ 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