summaryrefslogtreecommitdiff
path: root/buildstream/data
diff options
context:
space:
mode:
authorCharles Bailey <cbailey32@bloomberg.net>2017-08-23 16:25:20 +0100
committerTristan Van Berkom <tristan.vanberkom@codethink.co.uk>2017-09-05 17:30:20 -0400
commitb4f5f4ce20a486b57e96d15d8a2c2c6586e2ac5a (patch)
tree7075d3df5285baccb3ec10eba18c03ae1130a607 /buildstream/data
parent66574a377a9a86ab64d0c81a5cd4cbecc4a2478b (diff)
downloadbuildstream-b4f5f4ce20a486b57e96d15d8a2c2c6586e2ac5a.tar.gz
source-bundle: don't use a subdirectory of {build_root}
Use {build_root} itself and not a subdirectory of {build_root} for the build area used in the source-bundle generated build scripts. This is consistent with what %{build-root} is expanded to when generating the build scripts. Fixes issue #67
Diffstat (limited to 'buildstream/data')
-rw-r--r--buildstream/data/build-module.sh.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/buildstream/data/build-module.sh.in b/buildstream/data/build-module.sh.in
index 033a84654..d67ee9a9e 100644
--- a/buildstream/data/build-module.sh.in
+++ b/buildstream/data/build-module.sh.in
@@ -23,8 +23,8 @@ fi
mkdir -p '{build_root}'
mkdir -p '{install_root}'
-cp -a "$SRCDIR/{name}" '{build_root}/{name}'
-cd '{build_root}/{name}'
+cp -a "$SRCDIR/{name}/." '{build_root}'
+cd '{build_root}'
export PREFIX='{install_root}'
@@ -33,7 +33,7 @@ export {variables}
# Build the module
{commands}
-rm -rf '{build_root}/{name}'
+rm -rf '{build_root}'
# Install the module
echo 'Installing {name}'