summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2019-05-06 18:27:27 +0200
committerChristian Poessinger <christian@poessinger.com>2019-05-06 18:27:27 +0200
commitef7e354035cc526eb88f43b48eb5c615997d24da (patch)
tree1b45c74d3cdbfdde60495e94bb7b5b3da8db6e62 /Makefile
parentb889549e517953a8ce208389d5b485dadd1af387 (diff)
parent5b1411721f808cf1a779bb3807a3f249b1ac045b (diff)
downloadvyos-build-ef7e354035cc526eb88f43b48eb5c615997d24da.tar.gz
vyos-build-ef7e354035cc526eb88f43b48eb5c615997d24da.zip
Merge branch 'current' of github.com:vyos/vyos-build into equuleus
* 'current' of github.com:vyos/vyos-build: Jenkins: adjust artifacts to archive Jenkins: remove dbg packages before assembling ISO to reduce size hooks: initramfs: add option to update an existing initramfs Revert "hooks: initramfs: add option to remove an existing initramfs" T1366: Update Linux Kernel to v4.19.40 hooks: initramfs: add option to remove an existing initramfs Jenkins: list build packages Packages: add vyos-replace package to build procedure intel: remove debhelper depencendy on linux-image intel: set debhelper compat level to 9 Packages: add keepalived 2.0.10 to build procedure Docker: add additional dependencies for Debian keepalived repo Revert "Makefile: proper handle 'make iso' error codes" Revert "use bash as the shell for make" use bash as the shell for make add reprepro deploy script Packages: add net-snmp package to build procedure Packages: remove duplicate '-j' statement when building Kernel
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 0 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 628574e2..3bfa9597 100644
--- a/Makefile
+++ b/Makefile
@@ -28,13 +28,9 @@ prepare:
.ONESHELL:
iso: check_build_config clean prepare
@set -e
- @set -o pipefail
@echo "It's not like I'm building this specially for you or anything!"
cd $(build_dir)
lb build 2>&1 | tee build.log
- if [ "$?" != "0" ]; then
- exit 1
- fi
cd ..
@scripts/copy-image