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 \ From patchwork Mon Mar 22 06:31:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 377 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:378f:0:0:0:0:0 with SMTP id r137csp3733574oor; Mon, 22 Mar 2021 09:31:59 -0700 (PDT) X-Received: by 2002:a05:600c:3556:: with SMTP id i22mr624857wmq.116.1616430719472; Mon, 22 Mar 2021 09:31:59 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1616430719; cv=pass; d=google.com; s=arc-20160816; b=ZcZlynjDll7GnzkRQy9T5+HRbW1DezO9uE9NB4gdaVbZUzsvEYhGXkVKUpugC/r5DP bsCbcPMfJy2q6jaMja6c8ITRD0EomMj94xmxRzwhjG+dwUbl7uZmcmEUAtm8v/Fg3+QK +q/VSDKzclhV8j3dNipRZcM3nfM5IPbWq1Ds+yH+SMzwKmO7UPCEyXGUBo4+RJIczuv8 BrHj6sKpATp2IYhtOxunjxO6+I8AumCkkjDe7saF/1YHMTIxNuGt9D1BOZSG74r2VLPy heY2sWPDm4G33Ij/qdC4wCfxXmA28g7qIL83oEIYKMe9e7Gi5/V9mMtMcK1yEUHIj66c z+WQ== 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=45haMB2mTzI6wmIjW9+7v6YrBJSPNeGuN0UvPYov0Kk=; b=FjSMFaAmBad7PAsuQElZirX+RO1eVlm/tfS2On25wlPonXwS0NsoDM/7/vqUF1QPhT bd3pt/F43rf/8D5FgjSiZPLLg/16XU/lOU6NovwP86CbgFlja0bCDMx/wjwBQ+kmLAop Mm9LurrHfWdGYKU2k39Myw/+M3ad3WDv+l2/QWq9K6WZHwYq76ym6q7Z+m2vjj8DTBo6 689rpDB5ZLMPi40I8/KSV1ttkJzCcXHFZO2hZcWS0iDx+fXX/FoLYOYQjYrtn3xsfZg0 8BRjmULRCPBPH0OJaHvi4vz5tt4VrI9sAN9eVStg2Ar2ad9qYIP6sZ1n/xsVfptmEwoX GUvQ== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=kEIy+VJy; arc=pass (i=2 spf=pass spfdomain=ilbers.de); spf=pass (google.com: domain of isar-users+bncbchiponzwecrb74m4obamgqeqfpddey@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCHIPONZWECRB74M4OBAMGQEQFPDDEY@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 c4sor7144215wrn.15.2021.03.22.09.31.59 (Google Transport Security); Mon, 22 Mar 2021 09:31:59 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbchiponzwecrb74m4obamgqeqfpddey@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=kEIy+VJy; arc=pass (i=2 spf=pass spfdomain=ilbers.de); spf=pass (google.com: domain of isar-users+bncbchiponzwecrb74m4obamgqeqfpddey@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCHIPONZWECRB74M4OBAMGQEQFPDDEY@googlegroups.com ARC-Seal: i=2; a=rsa-sha256; t=1616430719; cv=pass; d=google.com; s=arc-20160816; b=DseryfIsxtLqFdQMGXQm9qogUj6pmPaI6KP+ChI6MaesolTvjhqIwTDFpPQq6vyGtx clNAvkuKxIDvNbAWkblwxvTmQnBkrdmuWCV5f8zhwRQZms0uldkN+BHQRDvsLZ+vWXyd 97zNEhwkXHRquu94qudBc94+xOLhEZCS+5ThTSI4UQUOb8udzdZnqbGONBgkw6HR+xER AMrR3BTdy1ZHjHOgaHRAWKZqiGBldsfyL6aVmGZ2JrWZS5H18KdpAPgXEHo3FX2s/vGa Seop94BdIZA96Cebmk5/lQF9dQAv0ZfFUPfyGPP165E7K47//0U/xGHNgi+cO+XMJWzZ 0uEg== 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=45haMB2mTzI6wmIjW9+7v6YrBJSPNeGuN0UvPYov0Kk=; b=zgFVPvoRuyZi2JemYfdTB6l/xezMsvOj1vxXkBeALc3ky8Iuo8BHQk2NFp7MQP/8Nw XjmlsErF/ozk/adDdHlZk5CNEbpzAmx84dzYIoEmkizkXXPiwI47uZ416DVQRcKwePso T1DkoGzNsN14vCp3eFq/loTPsM0tEGpK6DzpxCCg5V6daMPyISz+TT8RW2oxyX1NVLnk PSsDthkeRu5L7TjZXbsPZmxGrkx6XnPlfBe0ebrMrXo8AEvg5O3w3NV5DDy+JLkpBjKo LzMRbU0zcceCeFvV+9g3Wa//rXO2gtq4okcHHj18I74WzE/De8LD5Qmh3eNgpR+NOok5 W2qQ== 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=45haMB2mTzI6wmIjW9+7v6YrBJSPNeGuN0UvPYov0Kk=; b=kEIy+VJyIoPxj09bCY9kz82zXEcZIGItibe4m7i5c6XqatSzbag0HHUz9QDstSEVGj P+Yq9PMUOhcL6oNpIVqe1OwvdTe0Tkl2JFYaawrRF4CdViXMntd3M1WQlTSHcdf57OrL X1gPaGy0DWAWEXT4h6f+cgnyZCA6md1JUj9q8NtZemtMVbFC70AYTnKsoKPHxAZCTo22 GAbAlZBs4Q6cRAIL4ahnwF4nj3N4AmT+LCcqgaA8lx0M70TGydyyGkOFSrUTN9NaFDa+ vgLZdkTdyFPrvkIizhs7PLCYMRV/FmKUr6MrjdfSNTh8Zz2yifDeDYAnPX+1YQJx3jl/ OPZA== 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=45haMB2mTzI6wmIjW9+7v6YrBJSPNeGuN0UvPYov0Kk=; b=FydkVBnPe988A/TlB0Ak6Z8U9iFT4AH7RSmsA7d1Bvj/tT7sceJZKk6nGBiDKy8v78 FahTGjQcdf00SbzEklp4A7dguIgX8l7/D1jpTgbyTOIk+i6XVRd1x2wQbowFLB+ZG3Ho +yZnmxJVC4Fm2VtCyLPHB1AntcG2FhwD9iboA6YuqXJdVhdp+wSvAANe3POsZQ/zBSBx HREhZ0ULzvPjkMUNmgL1md/yPVvbzIfAXgNbKAfqUk5ZtKKKfDVCpLxhBfQ1wOvleTeU eb3x5dgSzsM1lO2apnxCvGEfeX02ca9OC1atstJDA3GfJDnRBlg9Hw/n8+LI5niEF+Tp cSsA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM530ZKB9F4jrV5b0NQW5m0YsztTQBVtex4i6a2i+8I3i6VPZC7oM8 MXtmb44HvwtSTJPB9K/9oHM= X-Google-Smtp-Source: ABdhPJwLOST2k8qWU4pEA4mIEY2c4FAKqIOPv/nblq8+j46JSrQZ3XDrG4KO3XTjqYOZJv6lT3Nrgg== X-Received: by 2002:a5d:55c4:: with SMTP id i4mr425768wrw.84.1616430719237; Mon, 22 Mar 2021 09:31:59 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:24d4:: with SMTP id k203ls6439045wmk.0.canary-gmail; Mon, 22 Mar 2021 09:31:58 -0700 (PDT) X-Received: by 2002:a7b:c303:: with SMTP id k3mr629181wmj.100.1616430718505; Mon, 22 Mar 2021 09:31:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1616430718; cv=none; d=google.com; s=arc-20160816; b=nj9yI9xnBk5LbgD74l8IyrmHDArOVM7698I9dLIsGNnhMZFtvf1z1twxnq8kMV3Sv0 sOde4Xt25cwBY4s6cZ0GWRrSTbJVB11vvJpuTd67AgXvQ2Itz7LQxIvbb8LqybNoY+Vy 9cfCtJFjt8n5WuPtsTn5UKgr2iYvf9JjeXNC4tZL6W+ze+ehqbcC5EC/6dgVtZvHpb7W BS9kocvqHitF7oXJVbNHqGljD6auCS0iqq9IEV6QmbPgO68GaS8gWC9FuF2O8Bj3OyAH kEOuQDjsryZg5RF/YsY+K/rcKDjDuFwqaA2Fq/olMTGVKHIHlchrxz8GTXNxFaByQ1lN qY7Q== 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=ZRrYwR1BnHt5wota5YAfJ/wallkSjx+Y0tgtYowITGg=; b=EUp10d8wk1hynEurCVKd966WNOf17hHtfDD1t7JsfgOgaZr6yjXSJW8qpwRP5zPCu9 6RY86s0t3of0RXXuns8gJ48pdKtb2F15uxAfZlIN079XLzEswbx6Tz5ICG/3M/qSsbWQ KYTz4DOUtLNvc1KZcOdlzKoZGMBjWMF+P5J9Wk4+ZIDOPDwHX4qVoHt6ZE9g62FM8Rz7 vkKpnlgp38zOzQgwz+Sg9bJ+3k7BMB1fETWnUekHwuk41W+6PlBlUGJFlhry0zlCSYbz pbf/2xWNk/t9aI2kk55XNoZICYQy+yS5xMYsLNr1r9iML7HPWGsqOGr7OuCHRYuqLxYK 8q/A== 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 t124si20567wmb.3.2021.03.22.09.31.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 22 Mar 2021 09:31:58 -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 12MGVpY8021727 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 22 Mar 2021 17:31:57 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v2 2/3] ubuntu: Fix building of non-arm64 targets Date: Mon, 22 Mar 2021 19:31:39 +0300 Message-Id: <20210322163140.159616-3-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?1694950457822435651?= X-GMAIL-MSGID: =?utf-8?q?1694950457822435651?= Generic apt sources list for ubuntu targets was added but not actually used. This made qemuamd64-focal not buildable. Signed-off-by: Anton Mikanovich --- meta-isar/conf/distro/ubuntu-focal.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-isar/conf/distro/ubuntu-focal.conf b/meta-isar/conf/distro/ubuntu-focal.conf index 0e4557e..ceb854d 100644 --- a/meta-isar/conf/distro/ubuntu-focal.conf +++ b/meta-isar/conf/distro/ubuntu-focal.conf @@ -5,6 +5,7 @@ require conf/distro/debian-common.conf +DISTRO_APT_SOURCES ?= "conf/distro/${DISTRO}.list" DISTRO_APT_SOURCES_arm64 ?= "conf/distro/${DISTRO}-ports.list" HOST_DISTRO_APT_SOURCES_append_arm64 = " ${DISTRO_APT_SOURCES}" From patchwork Mon Mar 22 06:31:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 378 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:378f:0:0:0:0:0 with SMTP id r137csp3733600oor; Mon, 22 Mar 2021 09:32:01 -0700 (PDT) X-Received: by 2002:adf:c389:: with SMTP id p9mr374456wrf.410.1616430721159; Mon, 22 Mar 2021 09:32:01 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1616430721; cv=pass; d=google.com; s=arc-20160816; b=GAPAk9R/ixnsZXSlOobm6W/zzLuDYdil+NnYaNXr36ewc+0bu/DNTyEOEKbexNTA6i Lat23l9B8RMppzu7akBL8j6UZZkRaXu8BnvEvgTiWy0FdH9RvtkVJ56Kkhd2ScIva9ma gzm5oXCCyxaeF3SgdGFWCgS/OfLsblJ43YNcAnzIUnznLYSft1YU/IM+CH8IGymtjPQD wzO5QZtLJRaQswDh9Ii0XyBXFrFhrTx5fod/nE+BHejhAW0gweksMKQ8F6tZ3K3ToZCh MaDPr2u40s3o8oYUSepLWpaInCcjgpP9Ppsw/rZj660SFw/xDTBEptcoqgLZqB/1wYxm FD1g== 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=dpLMUiBTp+6Km3LcJuc3aShKsTtZ/wXA3Uz7TDNIyp8=; b=nb7Nse6ogwpIjWoH7rhfkbTSRwGBWjV3O41tNmCTiYNljHpybXBbxPkQYVBSUFekgZ JJe8SlINOc2kiNWYyccedYDJJJ+qmoPLEgtRfw/PxgEqtPUqpuv5/1B5+uQpGoXiGFVi MyUq8IqVAqSu/9pILvKOotDGFxxrjuyOc3WMm5wsLm4umwkAehk/PXradzGLTL0x0lzx Rk7F6zIg/cp3SSPrAl6ijo3kOFUZWBgqHDMNRdv97gYLSTX91/YavtDxz9DRklmnylHt MBGIaG9dRy5JH99pZ4TXTEIF1gNpVxJdcZOm4qr7D5HSLUBBX+PyuM1cWAUFjBOp0P0W vEZg== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=cyHigcKJ; arc=pass (i=2 spf=pass spfdomain=ilbers.de); spf=pass (google.com: domain of isar-users+bncbchiponzwecrbaen4obamgqekjdf2ny@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCHIPONZWECRBAEN4OBAMGQEKJDF2NY@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 w13sor6759677wmi.16.2021.03.22.09.32.00 (Google Transport Security); Mon, 22 Mar 2021 09:32:01 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbchiponzwecrbaen4obamgqekjdf2ny@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=cyHigcKJ; arc=pass (i=2 spf=pass spfdomain=ilbers.de); spf=pass (google.com: domain of isar-users+bncbchiponzwecrbaen4obamgqekjdf2ny@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCHIPONZWECRBAEN4OBAMGQEKJDF2NY@googlegroups.com ARC-Seal: i=2; a=rsa-sha256; t=1616430720; cv=pass; d=google.com; s=arc-20160816; b=nWRUgAtKb+zoIU0w4RzrlfHVHLhLaMTiWUC7LkQcW8I+55RIhHc1JqXgB8OL65Q+dN Vus0WqzJ/ftfS/glz2QwvWnPPz7y5mcC6/apW7CIQ5tXnNe1GK0ZM7taCAcdC5F06KqN PRkpWejajKuHqQWjak15OS/AtMglO8c3sgt4MiBGNEI++BU3P4VQ4rusTL00er/FGc5R 6L5RAf1n92OmUCb5fV+3mk8nW1mh6P5PmRTdB5YxG4WShGEQXqUhnjagtQ+16qVWpWP7 3GwKaJAj4jWpHaHuCQo/8bbO8lLLRCUQ84bOy9tSdy7nz6X0sKOFFXdXINPZ615NOu8S 4ZbQ== 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=dpLMUiBTp+6Km3LcJuc3aShKsTtZ/wXA3Uz7TDNIyp8=; b=QC8gcIf3QLnkPVQG8F4OjYxZWPy/qpCoF/0VmZGzp5Rf52WaV47CttCLMS59qUE2U4 HLQNcbatNaKbNR1erXgNud2HUzqgSxVV2TuIvR/nXl32ZcG6QZ95XFSAt/u3Nkkg/S64 8pL6anssVf7nYndOyaNybni8QJ1SFlJ42IakOYgMdGlTD9EuadJF6JjzO8iBW97gmwI/ P5j9d04bLruLHpankmJCU/GkE2FPNdXA4P6REBwYYLCgvIB6xZXB2wsZ4hyw5T3P6SVw P+rfM9f14d5AZ81qzSbDCXaod/0qpi/k0HYTMiH2XzxUZr/adjvi0NGsbXQEREY22Fjr 9llw== 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=dpLMUiBTp+6Km3LcJuc3aShKsTtZ/wXA3Uz7TDNIyp8=; b=cyHigcKJN/V3ORuJrfX0dF4VC6zaOgpGbqGFVRg/syPMLoxOdcNV7re8rhaqxRXrgK Jf4BJbSUqZjCiJ9ND8X8QxGzYLVCnw4UWXUrIA1VEEHFsP+bUZ6jI8KqugGsfB+XRiBd b5/aSKfgz77xG6EkbmtE9+HyDy6NZmc1sEEm459VtRDRRajuwsaEQVFRcQkmy1jXFRWb HWrIelPX7d7u/jX/5GDFB6p63f01X8FiLsjjOVg3Zr7/9emkyYFxAkL6QKTzo38NwOgW c9RBZSPT/VC06CSzQaNL7X+kXKesYYC1fWOQ9dILSjG5ErhVUx45G48+o1i3/iRcl8Z2 9H/Q== 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=dpLMUiBTp+6Km3LcJuc3aShKsTtZ/wXA3Uz7TDNIyp8=; b=aB5zUMkA2MBviHpZFbNzLQt2EfUujw2CNgNXO/+etH/so+peQoo1rFghIUbB2TsmMx dGWWNNWSzzGohxMPB4d+dpQW0v6VQJjD/Yj4uX6CiMrxpE2IxdGqAb5kCwWZ+JaGTD1T fRssZPEgq3n/LxGEH87UJ2hxW4yhazHOV8Z84DErMRJ89XHQAUjxJS/pKe4kqAJXBDh9 immhpwHGz67PxnzengKx0nucIbSUAFnuUALILa89isxpRRNOM2NpyHpSjDsIT6b16u35 RpOsjLCyLaTZg+d18ju2UU5oFH+d8pMZ3LLCaX3CkFqJebcxEC21/UyGOc0AULEUDkOH 5UNg== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM530BeAOZpkyPhaJhT49fmM4Yttib2gjf80DY21AwX3tK/Z18PSOJ CiO1wCRb4wkE2qAZDzGrkDI= X-Google-Smtp-Source: ABdhPJz6OjpLQC/Souk/XT360rMpw3bwuwpm3/cAc+xjuZSMvt/dImc9/hvY6jjLvIRh9iyDVAL7hg== X-Received: by 2002:aa7:c709:: with SMTP id i9mr379011edq.319.1616430720825; Mon, 22 Mar 2021 09:32:00 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:aa7:d788:: with SMTP id s8ls2318151edq.1.gmail; Mon, 22 Mar 2021 09:32:00 -0700 (PDT) X-Received: by 2002:a50:ec81:: with SMTP id e1mr472789edr.0.1616430720042; Mon, 22 Mar 2021 09:32:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1616430720; cv=none; d=google.com; s=arc-20160816; b=TbPJ0GwPaVCT0knjeOU3tPGMk0NSgNughRfSYUb0DOXmwzzwxqVf0uq3qJcBAlN9tL 6PvCZAwZOH6cumJKrPnzahXjzQN4aqUkw4pPfibeG2w11v7xJVFxe7l2m33z+JgXGCIU pIbYwlfObCUWqXnwZlbT/DyeZ4oaGWRbop57DTRY5pnZv+2PAqpNIwj9Ge7/EyMrKZLf t3vl2xv5gtdkw4bQqw9vZXzyYYDlTweJgJCdeUnM0cbzefZvgzz/SsGk/zwllfyiGbwU ll1hDL1ajZo+314FcfaUwBforz/7PEXSSMp6De/AK96664uVkOSv8xwLrwbNwCvRYRmT +O1g== 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=XBlV3G7DXTnJGh96RchdKWJo4PEsuMkKk6vnGSMeweQ=; b=Cnb0rZynrtI+mSKIySgcyMscfVLQuUnpSdZknBaiZFY8AyhnTCWh44rTkzatjy4n0X 3SnNk6CipCcjqLx8kxvLpyLCgjc5NsnfWnaH4YpU+vRO5zSC3C0NTfde6/fjdfXBXIvn Imt/oJjPKIJgcvJa5A9wy08JfUDbQY5FNTDRKS5z6tyAgoU+lDftDTUN2CKQ80ddIJZT ocMHmU4/Lhi1FRs3S2m54FknFIOWAJDlZI+3X4MbiEUX3uHa+hBFdAl4d9jrwEZ6rBDi cd7JQUs7neMMNsma1SJfF7iiqGPtiwVTTSTwwS5tkBI44Cc6S0exvA+emVN2zZ3eo+OX +kbA== 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 w5si461999edv.1.2021.03.22.09.31.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 22 Mar 2021 09:32:00 -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 12MGVpY9021727 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 22 Mar 2021 17:31:59 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v2 3/3] meta/conf/distro: Make debian inherit DISTRO_APT_SOURCES declaration Date: Mon, 22 Mar 2021 19:31:40 +0300 Message-Id: <20210322163140.159616-4-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?1694950460231948894?= X-GMAIL-MSGID: =?utf-8?q?1694950460231948894?= To simplify distro introduction move all DISTRO_APT_SOURCES declarations from debian-*.conf to parent debian-common.conf. Left declaration in debian-sid-ports.conf untouched because of "-ports" suffix usage. Signed-off-by: Anton Mikanovich --- meta-isar/conf/distro/ubuntu-focal.conf | 2 ++ 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-stretch.conf | 1 - 5 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-isar/conf/distro/ubuntu-focal.conf b/meta-isar/conf/distro/ubuntu-focal.conf index ceb854d..4dfa201 100644 --- a/meta-isar/conf/distro/ubuntu-focal.conf +++ b/meta-isar/conf/distro/ubuntu-focal.conf @@ -5,6 +5,8 @@ require conf/distro/debian-common.conf +BASE_DISTRO = "ubuntu" + DISTRO_APT_SOURCES ?= "conf/distro/${DISTRO}.list" DISTRO_APT_SOURCES_arm64 ?= "conf/distro/${DISTRO}-ports.list" HOST_DISTRO_APT_SOURCES_append_arm64 = " ${DISTRO_APT_SOURCES}" 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 ca33d46..ba5262a 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/${BASE_DISTRO}-${BASE_DISTRO_CODENAME}.list" WIC_IMAGER_INSTALL = "parted \ gdisk \ 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 \