From 8b2041c98b2a9baab95174dc4b34711e8817d2c7 Mon Sep 17 00:00:00 2001 From: Alexander Couzens Date: Sat, 30 Jul 2016 21:53:50 +0200 Subject: Revert "reproducible/openwrt|lede: fixup node_wrapper usage" This reverts commit 8d586d5c9968778c934996aa59626635fc20b99f. Signed-off-by: Holger Levsen --- bin/reproducible_openwrt_common.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'bin/reproducible_openwrt_common.sh') diff --git a/bin/reproducible_openwrt_common.sh b/bin/reproducible_openwrt_common.sh index 32a814eb..b3f4e314 100644 --- a/bin/reproducible_openwrt_common.sh +++ b/bin/reproducible_openwrt_common.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2014-2016 Holger Levsen +# Copyright 2014-2015 Holger Levsen # © 2015 Reiner Herrmann # 2016 Alexander Couzens # released under the GPLv=2 @@ -258,20 +258,21 @@ build_two_times() { TMPDIR_B1=$(ssh $HOST_B1 mktemp --tmpdir=/srv/workspace/chroots/ -d -t rbuild-lede-build-XXXXXXXX) # TODO check tmpdir exist - ssh $HOST_B1 $0 openwrt_build $TYPE $RUN $TARGET $CONFIG $TMPDIR_B1 + SCRIPT="$0 slave" + ssh $HOST_B1 $SCRIPT openwrt_build $TYPE $RUN $TARGET $CONFIG $TMPDIR_B1 # rsync back # copy logs and images rsync -a $HOST_B1:$TMPDIR_B1/$RUN/ $TMPDIR/$RUN/ - ssh $HOST_B1 $0 openwrt_get_banner $TMPDIR_B1 $TYPE > $BANNER_HTML - ssh $HOST_B1 $0 openwrt_cleanup_tmpdirs $TMPDIR_B1 + ssh $HOST_B1 $SCRIPT openwrt_get_banner $TMPDIR_B1 $TYPE > $BANNER_HTML + ssh $HOST_B1 $SCRIPT openwrt_cleanup_tmpdirs $TMPDIR_B1 ## HOST_B2 RUN=b2 TMPDIR_B2=$(ssh $HOST_A mktemp --tmpdir=/srv/workspace/chroots/ -d -t rbuild-lede-build-XXXXXXXX) - ssh $HOST_B2 $0 openwrt_build $TYPE $RUN $TARGET $CONFIG $TMPDIR_B2 + ssh $HOST_B2 $SCRIPT openwrt_build $TYPE $RUN $TARGET $CONFIG $TMPDIR_B2 rsync -a $HOST_B2:$TMPDIR_B2/$RUN/ $TMPDIR/$RUN/ - ssh $HOST_B2 $0 openwrt_cleanup_tmpdirs $TMPDIR_B2 + ssh $HOST_B2 $SCRIPT openwrt_cleanup_tmpdirs $TMPDIR_B2 } -- cgit v1.2.3-70-g09d2