From 6ed21c2be208ebdaf38a3a4dda19417d67c93fb2 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Mon, 6 Jan 2014 09:47:43 -0600
Subject: [PATCH] copy .project file to tempdir so chroot script can use it
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
chroot_script/beagleboard.org.sh | 2 +-
scripts/chroot.sh | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/chroot_script/beagleboard.org.sh b/chroot_script/beagleboard.org.sh
index 211d60108..1881eab0b 100755
--- a/chroot_script/beagleboard.org.sh
+++ b/chroot_script/beagleboard.org.sh
@@ -7,7 +7,7 @@ export LC_ALL=C
chroot_node_release="v0.10.24"
chroot_node_build_options="--without-snapshot --shared-cares --shared-openssl --shared-zlib --prefix=/usr/local/"
-user_name="debian"
+. /.project
qemu_warning () {
if [ "${warn_qemu_will_fail}" ] ; then
diff --git a/scripts/chroot.sh b/scripts/chroot.sh
index b4beea403..9c285b2de 100755
--- a/scripts/chroot.sh
+++ b/scripts/chroot.sh
@@ -711,8 +711,11 @@ fi
if [ -n "${chroot_script}" -a -r "${DIR}/chroot_script/${chroot_script}" ] ; then
report_size
echo "Calling chroot_script script: ${chroot_script}"
+ sudo cp -v ${DIR}/.project ${tempdir}/.project
sudo cp -v ${DIR}/chroot_script/${chroot_script} ${tempdir}/final.sh
sudo chroot ${tempdir} /bin/sh final.sh
+ sudo rm -f ${tempdir}/final.sh || true
+ sudo rm -f ${tempdir}/.project || true
chroot_script=""
fi
--
GitLab