commit a61e99abbc7b709923c38489a966d83f85e0125d
author Alanny Lopez <alanny.lopez@ibm.com> Tue Jun 27 14:20:48 2017 -0500
committer Andrew Geissler <geissonator@yahoo.com> Mon Jul 17 13:11:42 2017 +0000
tree dd88d4742bedbf6399ed3b5f62d0898deab1335d
parent 634ce36d1297978728b79dee5cda17d3bd6a1183

Isolated the build directory

The build directory was whatever path the qemudir had. To adjust for
allowing external mounts to be used such as NFS have made it so that the
script will use the qemudir to create an internal copy where the build
will happen so that files in the qemudir will not be affected. The
artifacts for the image will be found in ${WORKSPACE}/arm-softmmu.

Change-Id: I21cfc8c5a7817de0b8641bb4d4f0b635904dd1bc
Signed-off-by: Alanny Lopez <alanny.lopez@ibm.com>

qemu-build.sh

diff --git a/qemu-build.sh b/qemu-build.sh
index 56a7483..5454992 100755
--- a/qemu-build.sh
+++ b/qemu-build.sh
@@ -9,8 +9,11 @@
 # Variables used for in the build:
 #  WORKSPACE    = Path of the workspace directory where some intermediate files
 #                 and the images will be saved to.
-#  qemudir      = Path of the QEMU directory where the build will be done, if
-#                 none exists will clone in the OpenBMC/QEMU repo to WORKSPACE.
+#  qemudir      = Path of the directory that holds the QEMU repo, if none
+#                 exists will clone in the OpenBMC/QEMU repo to WORKSPACE.
+#  builddir     = Path of the directory that is created within the docker
+#                 container where the build is actually done. Done this way to
+#                 allow external volumes to be used for the qemudir.
 #
 # Optional Variables:
 #  launch       = job|pod
@@ -35,6 +38,7 @@
 http_proxy=${http_proxy:-}
 launch=${launch:-}
 qemudir=${qemudir:-${WORKSPACE}/qemu}
+builddir=${builddir:-/tmp/qemu}
 ARCH=$(uname -m)
 imgname=${imgname:-qemu-build:${ARCH}}
 
@@ -77,8 +81,11 @@
 
 set -x
 
-# Go into the source directory (the script will put us in a build subdir)
-cd ${qemudir}
+# create a copy of the qemudir in /qemu to use as the build directory
+cp -a ${qemudir}/. ${builddir}
+
+# Go into the build directory
+cd ${builddir}
 
 gcc --version
 git submodule update --init dtc
@@ -98,6 +105,7 @@
     --disable-vnc-png
 make -j4
 
+cp -a ${builddir}/arm-softmmu/. ${WORKSPACE}/arm-softmmu/
 EOF_SCRIPT
 
 chmod a+x ${WORKSPACE}/build.sh
@@ -125,6 +133,7 @@
 RUN grep -q ${GROUPS} /etc/group || groupadd -g ${GROUPS} ${USER}
 RUN grep -q ${UID} /etc/passwd || useradd -d ${HOME} -m -u ${UID} -g ${GROUPS} ${USER}
 USER ${USER}
+RUN mkdir ${builddir}
 ENV HOME ${HOME}
 EOF
 )