From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6697090246153076736 X-Received: by 2002:a2e:880d:: with SMTP id x13mr4799813ljh.72.1559287832485; Fri, 31 May 2019 00:30:32 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:8998:: with SMTP id c24ls986776lji.15.gmail; Fri, 31 May 2019 00:30:31 -0700 (PDT) X-Google-Smtp-Source: APXvYqz3YkSRSWg4We5hBSG/cOTvz3q9SQezw9HG+3kNO3Qk7+nU1+P1aHoCUJ/xLKigmY8E/eij X-Received: by 2002:a2e:8588:: with SMTP id b8mr4705554lji.3.1559287831899; Fri, 31 May 2019 00:30:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559287831; cv=none; d=google.com; s=arc-20160816; b=ytndd21RLa3kDAC/MEPElJP/n7YMUvsz/HHPjoqCkiZ2CoqhhLAFOVZD450N6wTogK TYJe3iRa5moCaCpEMdWpNLyZIKVgjNCQTE2kmFPV2clVIXvaqO0tydiFsTh6HqvJtMiO Pf5s299eQnjBiHvmO3w4V9MgxzKmUoFaeCLU0Mgv5fzlIADsnsZh+pjgvbzny8iVSwbu tPyw14oGGpy+0e5VDuSVxfXmQQSGWHmhRPfGLwMDVhSBpOwsmIteduKL8zfpe+KmaiLq eeoUxnZnhVWsBhYITJue5QiMtR+Oh1FkZhKctTeKHJbKItr0drws3YLRuPtHG/BzSKtT 0A4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:mime-version:user-agent :date:message-id:subject:from:cc:to; bh=0VExzQ5RdNzoy4evKe8ZAVZhtmDYgApHD38P+Qdu9PE=; b=xXN25KiBQKRvruMi99uAupzcAOlZN1hYympXcwiA+J+sQzL2PQaNrHKz4tZD7Eahl+ TjZ3npXnAjRs6qgT6/AQzLKOyOv11cx41M6Tk1abxbcut39i6mtjtTkqrnFOmF286Mkz s5j1f0YdQxFpVoY6O/9tkXpYTF5cwixUpKisVgxeq0AfmeG0mAS7V/yViK/DJsZik6Qa 8TT5ab0ZdzGeQZPfFkbfvlBI2nJbefbYaZbrhfJil9ho2lqtjXs5O4UuDaKEgGDlXnZH QwlW/2TgUJAy0UVeXHBNhbaHv5Na+MtHpXFKbceP2jtwlQGSBYjy0oSPKbLb0q7XsYkG 6uUw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id n4si72063lfl.3.2019.05.31.00.30.31 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 May 2019 00:30:31 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id x4V7UUo9022066 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 31 May 2019 09:30:30 +0200 Received: from [139.22.34.37] ([139.22.34.37]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id x4V7USev014938; Fri, 31 May 2019 09:30:29 +0200 To: isar-users Cc: claudius Heine From: Jan Kiszka Subject: [PATCH] Set HOST_DISTRO default in distro configs Message-ID: Date: Fri, 31 May 2019 09:30:28 +0200 User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: M00KV/rGs1ez From: Jan Kiszka This particularly makes scenarios simpler where a downstream layer defines an own distro that is derived from debian-*. Signed-off-by: Jan Kiszka --- meta-isar/conf/distro/raspbian-stretch.conf | 2 ++ meta-isar/conf/multiconfig/rpi-stretch.conf | 1 - meta/conf/distro/debian-buster.conf | 2 ++ meta/conf/distro/debian-stretch.conf | 2 ++ 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/meta-isar/conf/distro/raspbian-stretch.conf b/meta-isar/conf/distro/raspbian-stretch.conf index 4c47376..9c7fa01 100644 --- a/meta-isar/conf/distro/raspbian-stretch.conf +++ b/meta-isar/conf/distro/raspbian-stretch.conf @@ -6,6 +6,8 @@ BASE_DISTRO = "raspbian" BASE_DISTRO_CODENAME = "stretch" +HOST_DISTRO ?= "debian-stretch" + DISTRO_APT_SOURCES += "conf/distro/raspbian-stretch.list" DISTRO_BOOTSTRAP_KEYS += "https://archive.raspbian.org/raspbian.public.key;sha256sum=ca59cd4f2bcbc3a1d41ba6815a02a8dc5c175467a59bd87edeac458f4a5345de" DISTRO_CONFIG_SCRIPT ?= "${LAYERDIR_isar}/conf/distro/raspbian-configscript.sh" diff --git a/meta-isar/conf/multiconfig/rpi-stretch.conf b/meta-isar/conf/multiconfig/rpi-stretch.conf index f3fac38..ec1f71d 100644 --- a/meta-isar/conf/multiconfig/rpi-stretch.conf +++ b/meta-isar/conf/multiconfig/rpi-stretch.conf @@ -12,7 +12,6 @@ MACHINE ?= "rpi" # This sets the default distribution configuration: DISTRO ?= "raspbian-stretch" DISTRO_ARCH ?= "armhf" -HOST_DISTRO ?= "debian-stretch" KERNEL_NAME ?= "rpi-rpfv" diff --git a/meta/conf/distro/debian-buster.conf b/meta/conf/distro/debian-buster.conf index 6b1daa3..021916b 100644 --- a/meta/conf/distro/debian-buster.conf +++ b/meta/conf/distro/debian-buster.conf @@ -4,6 +4,8 @@ require debian-common.conf 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 \ diff --git a/meta/conf/distro/debian-stretch.conf b/meta/conf/distro/debian-stretch.conf index cc9ca6e..45940e0 100644 --- a/meta/conf/distro/debian-stretch.conf +++ b/meta/conf/distro/debian-stretch.conf @@ -5,6 +5,8 @@ require debian-common.conf 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 \ -- 2.16.4