From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6524996667803959296 X-Received: by 10.157.20.236 with SMTP id r41mr1616806otr.43.1519219176700; Wed, 21 Feb 2018 05:19:36 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 10.202.207.148 with SMTP id f142ls132311oig.16.gmail; Wed, 21 Feb 2018 05:19:36 -0800 (PST) X-Google-Smtp-Source: AH8x226OimI28vlLiJtRqNpamZ+k7VdJq321J/jbtnbXvmMu/jzKbzt1eYIFU3WuvdfokJn7zDqw X-Received: by 10.202.84.86 with SMTP id i83mr1421974oib.18.1519219176332; Wed, 21 Feb 2018 05:19:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519219176; cv=none; d=google.com; s=arc-20160816; b=QC41O983uMQ0Nykg1VMcR0wEdAut26SQEs1bIADp5bhujdjfEm5GB2MBGWEk+te6M+ givwVcZ0ad3BkjE1zFx1XTIKM+gzVRF9lsnwXiIhU5SoQYek8Da9ChjWnu5n4Z2gQF/s 3YeOoQEHVPIgs2coqSx/X5gJ8bskwuJOlzgsQAF78DBfLK6xAFwq5G1w2CTSNzib4y58 GAQwn3NL7KlXYBIR5D6kjxQLdF7fwt/PMKDGf2THkAAfT8jXOLvUW2rZVIGodLuSvNVw 9UfMMVYve3hUEv2khrkFppBkap5aYfjN8cJv8X36ZMqMt2nI2EffJw0M2FpeFje853sM jt2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:references:in-reply-to:message-id:date:subject:to:from :arc-authentication-results; bh=uUYbvRdT+bUCyu1nj9mdsYdc71AogU2BLGaKs0e6iRc=; b=jDoDuNGA2KF5zQZgjOHjyOHgLkGtL6pzKw1ePTMtioxHfts0V9HQHjvvABYfpncqyS c0rzyfX6QObx3kvPJSws/FWHGOv8NfzUTgha5wsbOZV69FEBeab+Yzrk8Udi/HKvBw/o +0YcShx0F8kCdqtFuz6vwFhvIoFwOjMDP27zWXbrxdI98KEqnEiCO8zS7lODQ7Db7aQV f4GSkG+Chv7JSMpxl06Jo1S4+XXcIvBvE6QdVvXh+No7FX2EUz7JBbAtR+epw5mjFiyI u4SzkqWpowgx3kKERBWvIPT6MRTQfmyl5d8bL+vtjgjDmRgT1Y5u/inFw3mzR8aXutiV TjKQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of cedric_hombourger@mentor.com designates 192.94.38.131 as permitted sender) smtp.mailfrom=Cedric_Hombourger@mentor.com Return-Path: Received: from relay1.mentorg.com (relay1.mentorg.com. [192.94.38.131]) by gmr-mx.google.com with ESMTPS id w8si105355oth.3.2018.02.21.05.19.36 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Feb 2018 05:19:36 -0800 (PST) Received-SPF: pass (google.com: domain of cedric_hombourger@mentor.com designates 192.94.38.131 as permitted sender) client-ip=192.94.38.131; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of cedric_hombourger@mentor.com designates 192.94.38.131 as permitted sender) smtp.mailfrom=Cedric_Hombourger@mentor.com Received: from nat-ies.mentorg.com ([192.94.31.2] helo=svr-ies-mbx-02.mgc.mentorg.com) by relay1.mentorg.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-SHA384:256) id 1eoUJ5-0002Wr-Ne from Cedric_Hombourger@mentor.com for isar-users@googlegroups.com; Wed, 21 Feb 2018 05:19:35 -0800 Received: from 8ed3f6b9f02f.anacadf.mentorg.com (137.202.0.87) by svr-ies-mbx-02.mgc.mentorg.com (139.181.222.2) with Microsoft SMTP Server (TLS) id 15.0.1320.4; Wed, 21 Feb 2018 13:19:32 +0000 From: Cedric Hombourger To: Subject: [PATCH 1/1] buildchroot: remove hard-coded distro names in the multistrap template Date: Wed, 21 Feb 2018 13:19:24 +0000 Message-ID: <20180221131924.4744-2-Cedric_Hombourger@mentor.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180221131924.4744-1-Cedric_Hombourger@mentor.com> References: <20180221131924.4744-1-Cedric_Hombourger@mentor.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [137.202.0.87] X-ClientProxiedBy: svr-ies-mbx-02.mgc.mentorg.com (139.181.222.2) To svr-ies-mbx-02.mgc.mentorg.com (139.181.222.2) X-TUID: Ptv0ZYZPu30X 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 -- 2.11.0