From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6524996667803959296 X-Received: by 2002:ac2:5215:: with SMTP id a21mr187296lfl.5.1550831578842; Fri, 22 Feb 2019 02:32:58 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:9a18:: with SMTP id o24ls685378lji.3.gmail; Fri, 22 Feb 2019 02:32:58 -0800 (PST) X-Google-Smtp-Source: AHgI3Iam+yL+GqIMoPiplmGo9eAeepfEmevW1mleniVwwGeoS2Do0bYER+MdKxhoCCjxje8EJvAP X-Received: by 2002:a2e:9613:: with SMTP id v19mr196397ljh.16.1550831578188; Fri, 22 Feb 2019 02:32:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550831578; cv=none; d=google.com; s=arc-20160816; b=k8RGe9T7Hrf5b5/VA2zLrwckeaw5vSBtA7nj5YyEocmSIDqIBXc/vF6w3eMswBeWuH GtbOboHC6ounAqtAzHIf2cGfUmV6SRi1myFXZLJw20zqE9ZVPFQBK0x6sliW8BxvxIGc eXO6OcvEIgPJSVX/5V87UTUTDRM0kEJWuRkaERZt3wr4KrDWnm+CpsusYL167eUS26LA r05acraERON41uz256RV3OWrF81HXOodNBAMAaht0Z0Q1Xab7LZ0N4JKp+eHHPx2hoLt KaFizK/xULIPbs3tA+wzH9t7FapckZTstbS5wpBboH0uY26ZnmJ9aIP+VWNnp+J8iMR1 z75Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:from:references:cc:to:subject; bh=JmM8ER2bZzKaBdpEVgG4hkbWn/xCIAZFtFbVu7577RM=; b=cvOZAD94mND0pAiDDK2vISbYg1w3x9Y8Fix5PGLcnzWELcahcy7mSp8Wc9Rdn1yyiU sHSiVapJokvhst5oGjFcjdmjUIMAywYfIncQvPE0nazoJ3q1F0Ee6cYQE1vm971gzkvO TAA00kPQL29O7Vkj0nFUiUUc2h07QF1Gg1DAU9PlZQJ5kaZFk3lCOwdLI4+/k5beQh47 hXYCCXUMBqVaG5Dji640QHf5yV7UIfi7guUsFtX0Yfm7QL6lUtk0CBXt45mpuIdCfVt3 o+baWChYxnl4bPuR/lWQLeLRsWEFnecAM6Mpd8fDzx9o/2bYH4sYy+2FwMyGFgSk9Evd zcQw== 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 Return-Path: Received: from lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id c17si46553lff.1.2019.02.22.02.32.57 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Feb 2019 02:32:58 -0800 (PST) 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 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 x1MAWvR0007772 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 22 Feb 2019 11:32:57 +0100 Received: from [139.25.68.37] (md1q0hnc.ad001.siemens.net [139.25.68.37] (may be forged)) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id x1MAWvi1014168; Fri, 22 Feb 2019 11:32:57 +0100 Subject: Re: [PATCH 1/1] buildchroot: remove hard-coded distro names in the multistrap template To: "[ext] Henning Schild" , Cedric Hombourger Cc: isar-users@googlegroups.com References: <20180221131924.4744-1-Cedric_Hombourger@mentor.com> <20180221131924.4744-2-Cedric_Hombourger@mentor.com> <20190222112638.31e77bd8@md1za8fc.ad001.siemens.net> From: Jan Kiszka Message-ID: <554bc1a2-8772-5ca3-eb92-d310ce09b4ff@siemens.com> Date: Fri, 22 Feb 2019 11:32:57 +0100 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 In-Reply-To: <20190222112638.31e77bd8@md1za8fc.ad001.siemens.net> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: d80EVGFH6CgX On 22.02.19 11:26, [ext] Henning Schild wrote: > Hi, > > unfortunately Isar is pretty inconsistent with debian naming. "Debian" > is a distro, like "ubuntu" or "mint". "stretch" and "buster" are > suites ... > > suite=distro is wrong > > Please choose another name for that variable. One point less to clean > up when setting things straight. > > Henning > > Am Wed, 21 Feb 2018 13:19:24 +0000 > schrieb Cedric Hombourger : Were you on a time ride, Henning? :) Jan > >> The multistrap configuration template assumes the distribution will be >> "isar"; this may however be changed via the DEBDISTRONAME variable. >> Add yet another variable substitution to the template processing code. >> >> Signed-off-by: Cedric Hombourger >> --- >> meta/recipes-devtools/buildchroot/buildchroot.bb | 1 + >> meta/recipes-devtools/buildchroot/files/multistrap.conf.in | 2 +- >> 2 files changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/meta/recipes-devtools/buildchroot/buildchroot.bb >> b/meta/recipes-devtools/buildchroot/buildchroot.bb index >> 520daf9..12577c7 100644 --- >> a/meta/recipes-devtools/buildchroot/buildchroot.bb +++ >> b/meta/recipes-devtools/buildchroot/buildchroot.bb @@ -60,6 +60,7 @@ >> do_build() { -e >> 's|##DISTRO_APT_SOURCE_SEC##|${DISTRO_APT_SOURCE_SEC}|g' \ -e >> 's|##DISTRO_SUITE##|${DISTRO_SUITE}|g' \ -e >> 's|##DISTRO_COMPONENTS##|${DISTRO_COMPONENTS}|g' \ >> + -e 's|##DEBDISTRONAME##|${DEBDISTRONAME}|g' \ >> -e >> 's|##CONFIG_SCRIPT##|./'"$WORKDIR_REL"'/configscript.sh|g' \ -e >> 's|##SETUP_SCRIPT##|./'"$WORKDIR_REL"'/setup.sh|g' \ -e >> 's|##DIR_HOOKS##|./'"$WORKDIR_REL"'/hooks_multistrap|g' \ diff --git >> a/meta/recipes-devtools/buildchroot/files/multistrap.conf.in >> b/meta/recipes-devtools/buildchroot/files/multistrap.conf.in index >> 480a4b8..ee0ea09 100644 --- >> a/meta/recipes-devtools/buildchroot/files/multistrap.conf.in +++ >> b/meta/recipes-devtools/buildchroot/files/multistrap.conf.in @@ -32,6 >> +32,6 @@ omitdebsrc=true [isar-apt] >> source=file:///isar-apt >> -suite=isar >> +suite=##DEBDISTRONAME## >> components=main >> omitdebsrc=true > -- Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux