From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6524996667803959296 X-Received: by 2002:a19:c950:: with SMTP id z77mr184236lff.10.1550831201204; Fri, 22 Feb 2019 02:26:41 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:5083:: with SMTP id f3ls521864lfm.14.gmail; Fri, 22 Feb 2019 02:26:40 -0800 (PST) X-Google-Smtp-Source: AHgI3Iaf+q8RR5RVPaAtfusDoUxbOBT0A2ooLgbOe4cIBVwy4BfuWpc7OzZuu5lsxof/G+G4IKdW X-Received: by 2002:ac2:4150:: with SMTP id c16mr187095lfi.2.1550831200685; Fri, 22 Feb 2019 02:26:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550831200; cv=none; d=google.com; s=arc-20160816; b=If/7uADGuXG5MtuytNRaOHkKtoyJdn6pVrKU5vz+7Okaizq3yTOO5DKhJfmn3H8Y3J ophOMVZ9LwCGymmT7jzTfMgzBSx22kP/lpKGFBWs6kkXzk6/0lWNYpItGzyhw8zBoFkJ tF80HSLMO4iMfn8Lz0WhgVW0Hv306Viu3oy9JIQYg5XOhs9SFBkG6olObclVeCBvuTn5 vyGlMKsv4izgSP92WwzNnEe0OL6zXC8l+v8Bn8dL/pVsEJ3yUIVkilVFo9mZfkLAiJqJ ngRqb9LRTlpDFiBGNNMluIbqfLNgCEZwu/HPPaAjQ+6IDFImUr9dee3HMg0AeEUf5bkf +nsQ== 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:subject:cc:to:from:date; bh=cjtR+qs343w1WHlQUwASeOcPMVaPTGSKsfU2WB41cjk=; b=0Y+qmXHqbT1nWTrB7c8z1Ul6reTMev7LU9E4aL98Wu5VyQp/GARGzjHQ1X9pbl5gw8 CLb6l3vpAMtW5LWfZEUf0G1tYBzceZ3Aa+wc3tfrNjC3xIxYM/4FCOegCX4AyG1/yogf MGjGrgEyxbNLmTDZ5vtDLCBKiq9zcbkSq47Z8k7qPXQXd+p4bXTu9atnW0SCHTaunLy6 lVFgn6sh1L1wV+Rbb4/jaUVoScJyVks6TjgawcpxAXARmu4nakAPNPf0tbHSiKn5wZCv 2ARAp1gSw+fa2+Rg9Fy6ghMfmYp4S7/JF4koLdn0y7tfmMzthGL9V1bx41CUMKzf1jaO hcZw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id a18-v6si48740lji.3.2019.02.22.02.26.40 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Feb 2019 02:26:40 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id x1MAQdWi003312 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 22 Feb 2019 11:26:39 +0100 Received: from md1za8fc.ad001.siemens.net ([139.25.0.113]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id x1MAQd4D024310; Fri, 22 Feb 2019 11:26:39 +0100 Date: Fri, 22 Feb 2019 11:26:38 +0100 From: Henning Schild To: Cedric Hombourger Cc: Subject: Re: [PATCH 1/1] buildchroot: remove hard-coded distro names in the multistrap template Message-ID: <20190222112638.31e77bd8@md1za8fc.ad001.siemens.net> In-Reply-To: <20180221131924.4744-2-Cedric_Hombourger@mentor.com> References: <20180221131924.4744-1-Cedric_Hombourger@mentor.com> <20180221131924.4744-2-Cedric_Hombourger@mentor.com> X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TUID: Kw6qeKLo4Ayn 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 : > 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