From patchwork Mon Mar 22 06:31:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 376 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:378f:0:0:0:0:0 with SMTP id r137csp3733549oor; Mon, 22 Mar 2021 09:31:58 -0700 (PDT) X-Received: by 2002:a19:6a16:: with SMTP id u22mr124923lfu.356.1616430717921; Mon, 22 Mar 2021 09:31:57 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1616430717; cv=pass; d=google.com; s=arc-20160816; b=x+MjsKbNCLbCPf5napMO4ycjL6savQ8lhL93hZcKl336dgZO/zUhGUS5V8pdzbDZCP b6fXak9l8joycCsl//ZJX8ir7j3eqepR1/umdjB80XN3DdlYVvLNgPeKy+q3Hn61VXPw TFxZUG398aRhdicTAqpR0DereUKEUhbRFsSYKd9SZbDNk66BQUVtIrt9DYv4aQ4qWtV9 lnRHfmbk1scykJ7gTVHd8qmkZcULR389WC1HlpUSE2692tboqlzapdaAOTHdJ9w8zpHW gIs55W2eINr2fSXt73atO0W6epFWNDTalFpVBAmNx0nsNQ4Qm4bAhbgpoElGRcKJUKZo pjMQ== 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=HlYkbmD1pdfWPYLTusXY1L6/kQBoNg3I3zl2w9nMzts=; b=yXJ58qrRyVSpa8p2tDu3+VXQbpOyxCyGECoeeradxDkfL2Fgz3AYy0WinmbOByUtHP NSRDPJY3LQLvyZFD/yYa+IzvDylkxw4jcODtvfcOD6yvF45hdCe/dxssi6xGGXvUrzv0 zhvspdIEo4t9+zShj2j+TlFCIHDm300M+DHO3ljSJHwz61fOHdFb5df2KMTBZSKMftrE A44S8ocXo5pDIXgr5S0obyam1kH9WcDrQ9eEKNRQQ8D6kwTzd/rnPtvt7gV7lfD1U+8G yB8ogvB7ztECouh67Rned99oJvlZZqxt6NZNSOu4B4a3rP5FomND7hATbs+I2ZK2IkvR R5rA== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=nVIprQba; arc=pass (i=2 spf=pass spfdomain=ilbers.de); spf=pass (google.com: domain of isar-users+bncbchiponzwecrb7mm4obamgqe6ntll4y@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCHIPONZWECRB7MM4OBAMGQE6NTLL4Y@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 n144sor3069820lfa.133.2021.03.22.09.31.57 (Google Transport Security); Mon, 22 Mar 2021 09:31:57 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbchiponzwecrb7mm4obamgqe6ntll4y@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=nVIprQba; arc=pass (i=2 spf=pass spfdomain=ilbers.de); spf=pass (google.com: domain of isar-users+bncbchiponzwecrb7mm4obamgqe6ntll4y@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCHIPONZWECRB7MM4OBAMGQE6NTLL4Y@googlegroups.com ARC-Seal: i=2; a=rsa-sha256; t=1616430717; cv=pass; d=google.com; s=arc-20160816; b=mEpYkJbHRhc/Qc7K4WYGukkrdljbgCGw0jqxqisINzMs/9zwiQ3j0oLC/GM4GBpiBX n8BZS8CAoDnJaCY1yYC50hXNKFQPFnppPBvflsjKuWfkmeqwGGaiJd3zREI1TY/GQcMa r1nt/kHeq4nYaHLmJIdxCHYNBFiEHWrLXuQt7PbWVrHqeSDFw4fFmX7hvKAmJtHrASou Nd4AMMX4uIcSt2/q0OiV/diI17UoxGSw+ccyaNqVpvygB34Du+SKyH6b8334F6tWkw3L WDvMT9WMZQXVXNJi5o9TMe5Cv0G8yyBv+VGtuToQkrNIDle6zbMtpf81hUQ47UOrWABo 7q3w== 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=HlYkbmD1pdfWPYLTusXY1L6/kQBoNg3I3zl2w9nMzts=; b=H1G31N+lJqBUCMinMfqrpesBr0brkoNuQeVaozOJ7RNSD9ML16Gwhpxo8ivRYDYJVu s3M8jJf4ff4dNfg79Zyuft95IF8XlxUrGBvDJd5Ov6G+HusQianph0TUbFSxdxF00+tC vYFzAsgb+65GfbdGECXMlUePFhfFttGWBUDWD53QZTGOAKIduws1v5nIc/WnL9iO9Dez F3FBQOn2I3TQlA6WphUpzNG+7EfhsHqQ++JMlIXVs3uMC4YpBzYlzw3NXRP98wqaYEzI SGhvwv8w0WBuRhjY529hGma3FW+x33TFnLUl/6FVses6IGgHrHIO/YGn0X7Tp8Bw+1+7 51oQ== 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=HlYkbmD1pdfWPYLTusXY1L6/kQBoNg3I3zl2w9nMzts=; b=nVIprQba0vVSo+VcuYemLi3og9ZWWCIdwFLwHIkHxqJII8SLrn6PC9sAJMK4J+HrS8 KvjbJB3BKy4kH/wjGpzqksHU6G6cI4ZOI4R0tAZ197wbBq1sH4D/bVrnroyFDfW5JltD v7WeNA1hlmkO+O4m1GiWV1nJbTMfrHISPGeg7TDbzE2Yy1nCkb9vtH0F9BgtxEzdUVvO RlIgUDp99oIT1WGgoQCmNGAK/2ZWrTQD/m5XvNsQj83hasNJIRtIqU+obxoLrpEjs/uZ OObyUEIOmOc6GXUe0H1XTOA1JhZznpVIIa+Fj/C9c+wwj02KEURpLd2A8bjW5icpznWL jnNw== 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=HlYkbmD1pdfWPYLTusXY1L6/kQBoNg3I3zl2w9nMzts=; b=S0H8LfM4sJISYNvjzUCTMos+PosywS5EE2nKnYLtlRvQLV+PnGqvsTM6y5GQ0WZPM9 4+fzWjbSXC5mmphw739m2wElBqCE4hPaQkzrgtJ0b5luSKNDwhC/KhKXyQ7QRNWR9lsP Pt5DuNjBGbR0+LXXodAGFN2ja8WqSI9PidjM7uHFQP+GaAShkCOS92EnwGyzjlXBcAKL FVO1wWYQGX9k+VWyiFWuNG4P/fIkcZMYiVS65sHS9sDxD5QOC1KpSA4GDATaudhzt9+a 8Na1Fzb7MXp/kGqhnyfvduoozNT9iSJqgUybDXAhloa6FwXveRf6h7PqAdJjFtV9lqfP egYQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM533v9zgpRYqEYOay4VWJzSzDTBbEiMMxZei/Z7InFFJz1yz1sJFZ eewr3j9T0SRbqK/i2kfOU7Q= X-Google-Smtp-Source: ABdhPJz8k9Li4zMA5IIR+TjdFddrNp9fn9Gs8Yqbc5kqI6KEi2pGYY9oBufvrilCFegITx+ZlnIG1w== X-Received: by 2002:a19:234b:: with SMTP id j72mr105475lfj.293.1616430717503; 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-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 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; 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 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?1694950456239846930?= X-GMAIL-MSGID: =?utf-8?q?1694950456239846930?= 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 \