vyos/vyos-build
1
0
Fork 0
mirror of https://github.com/vyos/vyos-build.git synced 2025-10-01 20:28:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

build-submodules: change VERBOSE logic

Browse Source
This commit is contained in:
Christian Poessinger 2019-01-27 16:19:19 +01:00
parent 9210522425
commit 000cd8b2d9
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
scripts/build-submodules
View File

@ -24,6 +24,7 @@ print_help() {
} }
BUILDLIST="" BUILDLIST=""
VERBOSE=0
while test $# -gt 0 while test $# -gt 0
do do
@ -70,6 +71,19 @@ status_skip() {
error_msg() { error_msg() {
echo -ne " $1\n" echo -ne " $1\n"
} }
verbose_msg() {
if [ $VERBOSE -ne 0 ]; then
echo "Current Environment:"
env
if [ ! -z "$1" ]; then
echo "Logfile:"
cat $1
fi
fi
}
ROOTDIR="$(pwd)" ROOTDIR="$(pwd)"
PKGDIR="$ROOTDIR/packages" PKGDIR="$ROOTDIR/packages"
SCRIPTDIR="$ROOTDIR/scripts" SCRIPTDIR="$ROOTDIR/scripts"
@ -104,9 +118,7 @@ build_package() {
) >>$PKGDIR/$PKG.buildlog 2>&1 ) >>$PKGDIR/$PKG.buildlog 2>&1
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
status_fail status_fail
if [ $VERBOSE -eq 1 ]; then verbose_msg "$PKGDIR/$PKG.buildlog"
cat $PKGDIR/$PKG.buildlog
fi
error_msg "Failed to build package $PKG, look in $PKG.buildlog to examine the fault\n" error_msg "Failed to build package $PKG, look in $PKG.buildlog to examine the fault\n"
return 2 return 2
fi fi
@ -131,9 +143,7 @@ initialize_packages() {
) >>$PKGDIR/init-packages.buildlog 2>&1 ) >>$PKGDIR/init-packages.buildlog 2>&1
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
status_fail status_fail
if [ $VERBOSE -eq 1 ]; then verbose_msg "$PKGDIR/init-packages.buildlog"
cat $PKGDIR/init-packages.buildlog
fi
error_msg "Failed to update all package, look in init-packages.buildlog to examine the fault\n" error_msg "Failed to update all package, look in init-packages.buildlog to examine the fault\n"
return 1 return 1
fi fi
@ -311,9 +321,7 @@ build_kernel() {
) >>$PKGDIR/vyos-kernel.buildlog 2>&1 ) >>$PKGDIR/vyos-kernel.buildlog 2>&1
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
status_fail status_fail
if [ $VERBOSE -eq 1 ]; then verbose_msg "$PKGDIR/vyos-kernel.buildlog"
cat $PKGDIR/vyos-kernel.buildlog
fi
error_msg "Failed to build package vyos-kernel, look in vyos-kernel.buildlog to examine the fault\n" error_msg "Failed to build package vyos-kernel, look in vyos-kernel.buildlog to examine the fault\n"
return 1 return 1
fi fi
@ -370,9 +378,7 @@ build_wireguard() {
) >>$PKGDIR/vyos-wireguard.buildlog 2>&1 ) >>$PKGDIR/vyos-wireguard.buildlog 2>&1
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
status_fail status_fail
if [ $VERBOSE -eq 1 ]; then verbose_msg "$PKGDIR/vyos-wireguard.buildlog"
cat $PKGDIR/vyos-wireguard.buildlog
fi
error_msg "Failed to build package vyos-wireguard, look in vyos-wireguard.buildlog to examine the fault\n" error_msg "Failed to build package vyos-wireguard, look in vyos-wireguard.buildlog to examine the fault\n"
return 2 return 2
fi fi
@ -421,9 +427,7 @@ build_accel-ppp() {
) >>$PKGDIR/vyos-accel-ppp.buildlog 2>&1 ) >>$PKGDIR/vyos-accel-ppp.buildlog 2>&1
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
status_fail status_fail
if [ $VERBOSE -eq 1 ]; then verbose_msg "$PKGDIR/vyos-accel-ppp.buildlog"
cat $PKGDIR/vyos-accel-ppp.buildlog
fi
error_msg "Failed to build package vyos-accel-ppp, look in vyos-accel-ppp.buildlog to examine the fault\n" error_msg "Failed to build package vyos-accel-ppp, look in vyos-accel-ppp.buildlog to examine the fault\n"
return 1 return 1
fi fi