From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6935049130177724416 X-Received: by 2002:a7b:c3c1:: with SMTP id t1mr4037267wmj.47.1614691958680; Tue, 02 Mar 2021 05:32:38 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:d1e6:: with SMTP id g6ls23175811wrd.3.gmail; Tue, 02 Mar 2021 05:32:37 -0800 (PST) X-Google-Smtp-Source: ABdhPJzmW9PB608ZwWwh6n3CXZg2zMAf024rJLl9LpJL8B8VIRiN6Np64TKb7d66P791SocO/03w X-Received: by 2002:adf:f150:: with SMTP id y16mr18037373wro.414.1614691957818; Tue, 02 Mar 2021 05:32:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614691957; cv=none; d=google.com; s=arc-20160816; b=zqTvITMw91zr8VrLYfT15eT3FN4xOkS8Az5cZCHsEse1MXJGawuWbmxn7NYBqMik7T yKdwsgL04pXJmgKx+bv4GZsGKwQcDTq2Xx/ME2PVM6BQy0DDD7RM9trsBf3mpGt3btRE ErS1y/UN1TDtfcVNHTUQuwejLYLpYXPJRJIMvcNW0E42eTMMs71V2XLsb3sOP6yk7EVz ff/pnHax9Vgo029oenu6q0E3bWWdlfmrgl7Npuu5CeiabM1pxHXFpiRtyx3CsyNn0UNg ogV6rj+twJndWyu3I59uXwvWi/7PH7HN0v74E7kAt2RfGEnlODWDCjex+kO1Q2QvLTaN FBxQ== 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=F9hq6E0JTX+CfFc9rmeZHIJAVz28Yid6rZDiTgKj/Xg=; b=J2VnNUAJtJrVY2xe25vewPCQ7SP35T1oQotdITSOkju4eubuz7zzZR5Q+lNU1v8nlL zgvicsLg8f2R/04oJ8BRtdOS+yixMrj5iDQlDmgRFpN7Yy321GTc8wORtRndDoc0E2or NNfFMjW52re5oOJcQflAOYmGCGHkIa9IIoGioxWKm7woPV4iQ3BAwLGuUa+GY105D3R3 0fCYLgOP2dJOC8lGPnL9zK9Z21cTJLal0CNmMDGBDuGUoRFXSD998gbrc2oAHXHSudWp VEf3kORSH1SN7KV/r0dJ4901d1ohX+K6JGrtmdST55OPRDZSNgQIVIQ/hnFLBAYfJxQG H3XQ== 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 o17si301318wrp.5.2021.03.02.05.32.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 02 Mar 2021 05:32:37 -0800 (PST) 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-205-79-121-178.mgts.dynamic.pppoe.byfly.by [178.121.79.205] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 122DWUL8001223 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 2 Mar 2021 14:32:37 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v1 2/2] meta/conf/distro: Make debian inherit DISTRO_APT_SOURCES declaration Date: Tue, 2 Mar 2021 16:32:12 +0300 Message-Id: <20210302133212.27119-3-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210302133212.27119-1-amikan@ilbers.de> References: <20210302133212.27119-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: Ii6j+t6YNrwN 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/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 - 4 files changed, 1 insertion(+), 3 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 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 \ -- 2.25.1