From: Cedric Hombourger <Cedric_Hombourger@mentor.com>
To: <isar-users@googlegroups.com>
Cc: Cedric Hombourger <Cedric_Hombourger@mentor.com>
Subject: [PATCH v2] isar-bootstrap: preserve environment in sudo'ed debootstrap call
Date: Thu, 13 Sep 2018 14:46:20 +0200 [thread overview]
Message-ID: <1536842780-221-1-git-send-email-Cedric_Hombourger@mentor.com> (raw)
In-Reply-To: <e31621bea09840149e8667a403b1b0f8@svr-ies-mbx-02.mgc.mentorg.com>
Make bitbake add proxy environment variables and preserve them when
calling debootstrap under sudo. This is required to get user-defined
proxies used while bootstraping Isar.
Signed-off-by: Cedric Hombourger <Cedric_Hombourger@mentor.com>
---
meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
index 4010307..cfad136 100644
--- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
+++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
@@ -171,7 +171,8 @@ isar_bootstrap() {
esac
shift
done
- sudo flock "${ISAR_BOOTSTRAP_LOCK}" -c "\
+ E="${@bb.utils.export_proxies(d)}"
+ sudo -E flock "${ISAR_BOOTSTRAP_LOCK}" -c "\
set -e
if [ ! -e "${DEPLOY_ISAR_BOOTSTRAP}" ]; then
if [ -e "${ROOTFSDIR}" ]; then
@@ -179,7 +180,6 @@ isar_bootstrap() {
umount -l "${ROOTFSDIR}/proc" || true
rm -rf "${ROOTFSDIR}"
fi
- E="${@bb.utils.export_proxies(d)}"
if [ ${IS_HOST} ]; then
${DEBOOTSTRAP} --verbose \
--variant=minbase \
@@ -233,7 +233,6 @@ isar_bootstrap() {
mount -t devtmpfs -o mode=0755,nosuid devtmpfs ${ROOTFSDIR}/dev
mount -t proc none ${ROOTFSDIR}/proc
- E="${@bb.utils.export_proxies(d)}"
export DEBIAN_FRONTEND=noninteractive
chroot "${ROOTFSDIR}" /usr/bin/apt-get update -y
chroot "${ROOTFSDIR}" /usr/bin/apt-get dist-upgrade -y \
--
2.11.0
next prev parent reply other threads:[~2018-09-13 12:46 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-13 12:20 [PATCH] " Cedric Hombourger
2018-09-13 12:36 ` Henning Schild
2018-09-13 12:42 ` Hombourger, Cedric
2018-09-13 12:46 ` Cedric Hombourger [this message]
2018-09-13 13:09 ` [PATCH v2] " Jan Kiszka
2018-09-13 13:15 ` Hombourger, Cedric
2018-09-13 13:37 ` Henning Schild
2018-09-13 16:17 ` chombourger
2018-09-25 10:05 ` chombourger
2018-09-25 17:39 ` Maxim Yu. Osipov
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=1536842780-221-1-git-send-email-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