From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6942517048885903360 X-Received: by 2002:a2e:8e70:: with SMTP id t16mr247113ljk.489.1616430717572; Mon, 22 Mar 2021 09:31:57 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:2050:: with SMTP id t16ls2555740ljo.4.gmail; Mon, 22 Mar 2021 09:31:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwTcg4H/RxweZdT0PEpYd38W4T0ntz5pDZbV6G3seZywOzOmw94aJ7VNJUbWSj6+8etuf8S X-Received: by 2002:a2e:9195:: with SMTP id f21mr263142ljg.160.1616430716466; Mon, 22 Mar 2021 09:31:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1616430716; cv=none; d=google.com; s=arc-20160816; b=k+QG5/upFsEv/rnMVK0rqUxQH8Ngy9mW/qN1EH0/EbY1jUBKB8MLFcrz4JOFQkjVjS LfWwlJPdRKh2s8Bcok2lZpFyHUXsjHXANGvE85fKYhxdO1uijiFRJ9B8wAXhPn7cB6Nn sOVQqIZZdI+QZplsVTdellQz/KhIBp+84tcAz1iJ1CGy/Sbn4WZjaSq3CV/6qMyduORJ Eykm+fqfu7vQJNf9UzsxXCHg334m/YMou4BCqEKtlUrJ1+CcDFixJKAhkXmbdQ03MRtl MUsR+3V00CsevBRpzbmOVt7wAe7uxaNiOFTVpHdxMjy1Lb67K9e14p0XH99U0U5gczUT DA0A== 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=VEBfplw/LuU91TyBNSi9hk7uPV//3DAMVr82ACxuDfE=; b=wvef4VhYkDBV8PDI3HIiQAGoW2utirwaxvE+Czx627xVsh8OOh26/FeIB6q9En4Bpo GeYSDBwIxxjb/Z2s6WL6uplXKJCW/ohlwQTFq99YvoayiHkmay+hW52Vmv0pA2Ue1S3Y 3Om3PuVx7Ext5olQChIO4NjQJfs03zh+yqGpum3ArMgLrc40jJ5N6eQPjKjlacFrygDT xBtRpcJ2BVlgWbliPXjkpYLj6pJSrQGZ50a0MbOs4YWChVH/0hflqvmQW6y3XpBdzsIi g+yq6tyvl70RtiE3JTr8E0MeXltjA4//lmN3oxkGBVlYtR13YwWS9Yx9NZ5wne+5hLok 3lpA== 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 v203si434545lfa.10.2021.03.22.09.31.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 22 Mar 2021 09:31:56 -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 12MGVpY7021727 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 22 Mar 2021 17:31:54 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v2 1/3] Revert "meta/conf/distro: Cleanup DISTRO_APT_SOURCES" Date: Mon, 22 Mar 2021 19:31:38 +0300 Message-Id: <20210322163140.159616-2-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: z1iyLbK9OKAJ This 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