summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Schröter <adrian@suse.de>2014-10-09 08:39:02 (GMT)
committerAdrian Schröter <adrian@suse.de>2014-10-09 08:39:02 (GMT)
commit7cb8c73770ae8ce154edd68297ec37b88ec17352 (patch)
tree501d673744a0551e652eaeeadc3c1b1c1e151c2c
parentdcfcf896cd913c8f2c067ef97ce5176a5358e5d0 (diff)
parentc237f2e63ab51cce9c4316d76a153f1204df1031 (diff)
downloadobs-build-7cb8c73770ae8ce154edd68297ec37b88ec17352.tar.gz
obs-build-7cb8c73770ae8ce154edd68297ec37b88ec17352.tar.xz
Merge pull request #139 from jblunck/debian_fakeroot
Don't use fakeroot-tcp by default for *.dsc builds
-rw-r--r--build-recipe-dsc5
1 files changed, 3 insertions, 2 deletions
diff --git a/build-recipe-dsc b/build-recipe-dsc
index 2206753..8b9d22e 100644
--- a/build-recipe-dsc
+++ b/build-recipe-dsc
@@ -70,9 +70,10 @@ recipe_build_dsc() {
# if test -n "$BUILD_JOBS" ; then
# DSC_BUILD_JOBS="-j$BUILD_JOBS"
# fi
- DSC_BUILD_CMD="dpkg-buildpackage -us -uc -rfakeroot-tcp $DSC_BUILD_JOBS"
+ DSC_BUILD_CMD="$(queryconfig --dist "$BUILD_DIST" --archpath "$BUILD_ARCH" --configdir "$CONFIG_DIR" substitute dsc:build_cmd)"
+ test -z "$DSC_BUILD_CMD" && DSC_BUILD_CMD="dpkg-buildpackage -us -uc $DSC_BUILD_JOBS"
if test -e $BUILD_ROOT/$TOPDIR/SOURCES/build.script ; then
- echo "Sourcing build.script to build - it should normally run 'dpkg-buildpackage -us -uc -rfakeroot-tcp'"
+ echo "Sourcing build.script to build - it should normally run 'dpkg-buildpackage -us -uc'"
DSC_BUILD_CMD="source $TOPDIR/SOURCES/build.script"
chmod +x $BUILD_ROOT/$TOPDIR/SOURCES/build.script
fi