From: Cedric Hombourger <Cedric_Hombourger@mentor.com>
To: <isar-users@googlegroups.com>
Subject: [PATCH 1/1] buildchroot: remove hard-coded distro names in the multistrap template
Date: Wed, 21 Feb 2018 13:19:24 +0000 [thread overview]
Message-ID: <20180221131924.4744-2-Cedric_Hombourger@mentor.com> (raw)
In-Reply-To: <20180221131924.4744-1-Cedric_Hombourger@mentor.com>
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 <Cedric_Hombourger@mentor.com>
---
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
next prev parent reply other threads:[~2018-02-21 13:19 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-21 13:19 [PATCH 0/1] Remove hard-code distro name " Cedric Hombourger
2018-02-21 13:19 ` Cedric Hombourger [this message]
2019-02-22 10:26 ` [PATCH 1/1] buildchroot: remove hard-coded distro names " Henning Schild
2019-02-22 10:32 ` Jan Kiszka
2019-02-25 16:03 ` Henning Schild
2018-02-21 15:30 ` [PATCH 0/1] Remove hard-code distro name " Claudius Heine
2018-02-21 15:51 ` Hombourger, Cedric
2018-02-21 16:10 ` Claudius Heine
2018-03-02 12:34 ` Alexander Smirnov
2018-03-07 11:24 ` Hombourger, Cedric
2018-03-15 13:59 ` Alexander Smirnov
2018-04-04 6:25 ` chombourger
2018-04-04 10:43 ` Jan Kiszka
2018-04-04 10:49 ` Cedric Hombourger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180221131924.4744-2-Cedric_Hombourger@mentor.com \
--to=cedric_hombourger@mentor.com \
--cc=isar-users@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox