Skip to content

Commit be6c40f

Browse files
author
Christoph Willing
committed
fix selection from wildcard
Signed-off-by: Christoph Willing <chris.willing@iinet.net.au>
1 parent fbd7253 commit be6c40f

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

spbuilder

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -230,8 +230,6 @@ lxc.mount.entry = $SPBUILDER_SLACKBUILDS mnt/slackbuilds none bind,ro,create=dir
230230
lxc.mount.entry = $SPBUILDER_BASE var/cache/spbuilder none bind,create=dir 0 0\n\
231231
&:" ${lxc_base_dir}/${SPBUILDER_MASTER_NAME}/config
232232

233-
echo "lxc.hook.stop = /usr/share/spbuilder/spbuilder.stop" >> ${lxc_base_dir}/${SPBUILDER_MASTER_NAME}/config
234-
235233
# Setup hoorex
236234
SPB_WRAPPER=$(tempfile)
237235
sed -e "s/%SPB_SHUTDOWN%/$SPB_SHUTDOWN/" ${SPBUILDER_DATA_DIR}/spbuilder.create.in >$SPB_WRAPPER
@@ -498,7 +496,6 @@ for action_to_run in $action; do
498496
build)
499497
mkdir -p $BUILD_LOGDIR
500498
logfile=${BUILD_LOGDIR}/build-$(date +"%Y%m%d-%H%M%S")
501-
#build_package 2>&1 |tee $logfile
502499
build_package
503500
;;
504501
clean)

spbuilder.build

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ done
2727

2828

2929
BUILD_LOC="$1"
30+
LOGFILE="$2"
3031
BUILD_JOBNAME=$(basename $BUILD_LOC)
3132
BUILD_DIR=$SPBUILDER_BASE/build
3233

spbuilder.wrapper.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
. /root/.spbuilderrc
33
export SPB_SHUTDOWN=%SPB_SHUTDOWN%
44
export TAG=_SBo
5-
LOGFILE=/var/cache/spbuilder/log/build-$(date +"%Y%m%d-%H%M%S")
5+
LOGFILE=/var/cache/spbuilder/log/build-$(date +"%Y%m%d-%H%M%S")-$(basename $1)
66
echo "Logging to: $LOGFILE"
77
sleep 5
8-
exec /usr/bin/spbuilder.build "$@" 2>&1 |tee $LOGFILE
8+
exec /usr/bin/spbuilder.build "$@" "$LOGFILE" 2>&1 |tee $LOGFILE

0 commit comments

Comments
 (0)