From 14bc50bfa1225afa28e9d2da59918939310e2cef Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 29 Oct 2013 14:28:51 +0100 Subject: cleanup the automatic build list --- mk/build.mk | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'mk/build.mk') diff --git a/mk/build.mk b/mk/build.mk index f784c99db..112d53e5b 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -18,13 +18,9 @@ DEFCONFIG= ADK_DEBUG=n \ ADK_SIMPLE_NETWORK_CONFIG=n \ ADK_USE_CCACHE=n \ ADK_TOOLCHAIN_GDB=n \ - ADK_PACKAGE_LIBAU=n \ ADK_PACKAGE_E2FSCK_STATIC=n \ - ADK_PACKAGE_AUFS2_UTIL=n \ ADK_PACKAGE_KEXECINIT=n \ ADK_PACKAGE_INSTALLER=n \ - ADK_PACKAGE_CXXTOOLS_DEV=n \ - ADK_PACKAGE_XORG_SERVER_DEV=n \ ADK_PACKAGE_LM_SENSORS_DETECT=n \ ADK_PACKAGE_PACEMAKER=n \ ADK_PACKAGE_PACEMAKER_MGMTD=n \ @@ -37,20 +33,14 @@ DEFCONFIG= ADK_DEBUG=n \ ADK_PACKAGE_GRUB=n \ ADK_PACKAGE_BASE_FILES=y \ ADK_PACKAGE_CRYPTINIT=n \ - ADK_PACKAGE_HEIMDAL_SERVER=n \ - ADK_PACKAGE_LIBHEIMDAL=n \ ADK_PACKAGE_PAM=n \ - ADK_PACKAGE_PYTHON=n \ ADK_PACKAGE_VIRTINST=n \ ADK_PACKAGE_URLGRABBER=n \ ADK_PACKAGE_PERL=n \ ADK_PACKAGE_LIBSSP=n \ - ADK_PKG_DESKTOP=n \ - ADK_PKG_LAPTOP=n \ + ADK_PKG_XORG=n \ ADK_PKG_MPDBOX=n \ ADK_PKG_DEVELOPMENT=n \ - ADK_PKG_VPN_CLIENT=n \ - ADK_PKG_VPN_SERVER=n \ ADK_TOOLCHAIN_GCC_JAVA=n \ ADK_TOOLCHAIN_GCC_OBJC=n \ ADK_TOOLCHAIN_GCC_USE_SSP=n \ -- cgit v1.2.3 From eee410e8adc42e7a505e0a4903b001caabb3b11f Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 29 Oct 2013 17:19:17 +0100 Subject: break out after the first error --- mk/build.mk | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'mk/build.mk') diff --git a/mk/build.mk b/mk/build.mk index 112d53e5b..aeb6bbce0 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -574,12 +574,14 @@ bulk: echo === building $$arch $$system $$libc on $$(date); \ $(GMAKE) prereq && \ $(GMAKE) ARCH=$$arch SYSTEM=$$system LIBC=$$libc FS=archive defconfig; \ - $(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit;fi; \ + $(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit; exit 1;fi; \ rm .config; \ ) 2>&1 | tee $(TOPDIR)/bin/$${system}_$${arch}_$$libc/build.log; \ + if [ -f .exit ]; break;fi \ done; \ - if [ -f .exit ];then echo "Bulk build failed!"; rm .exit; exit 1;fi \ + if [ -f .exit ]; break;fi \ done <${TOPDIR}/target/arch.lst ;\ + if [ -f .exit ];then echo "Bulk build failed!"; rm .exit; break;fi \ done bulkall: @@ -592,12 +594,14 @@ bulkall: echo === building $$arch $$system $$libc on $$(date); \ $(GMAKE) prereq && \ $(GMAKE) ARCH=$$arch SYSTEM=$$system LIBC=$$libc FS=archive allconfig; \ - $(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit;fi; \ + $(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit; exit 1;fi; \ rm .config; \ ) 2>&1 | tee $(TOPDIR)/bin/$${system}_$${arch}_$$libc/build.log; \ + if [ -f .exit ]; break;fi \ done; \ - if [ -f .exit ];then echo "Bulk build failed!"; rm .exit; exit 1;fi \ + if [ -f .exit ]; break;fi \ done <${TOPDIR}/target/arch.lst ;\ + if [ -f .exit ];then echo "Bulk build failed!"; rm .exit; break;fi \ done bulkallmod: @@ -613,9 +617,11 @@ bulkallmod: $(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then echo $$system-$$libc >.exit; exit 1;fi; \ rm .config; \ ) 2>&1 | tee $(TOPDIR)/bin/$${system}_$${arch}_$$libc/build.log; \ + if [ -f .exit ]; break;fi \ done; \ - if [ -f .exit ];then echo "Bulk build failed!"; cat .exit;rm .exit; exit 1;fi \ + if [ -f .exit ]; break;fi \ done <${TOPDIR}/target/arch.lst ;\ + if [ -f .exit ];then echo "Bulk build failed!"; cat .exit;rm .exit; break;fi \ done ${TOPDIR}/bin/tools/pkgmaker: $(TOPDIR)/tools/adk/pkgmaker.c $(TOPDIR)/tools/adk/sortfile.c $(TOPDIR)/tools/adk/strmap.c -- cgit v1.2.3 From 2beecae063b63fbd52a7e1c4d8ab1595f7b9c4a3 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 29 Oct 2013 18:01:38 +0100 Subject: add missing then --- mk/build.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'mk/build.mk') diff --git a/mk/build.mk b/mk/build.mk index aeb6bbce0..104811819 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -577,9 +577,9 @@ bulk: $(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit; exit 1;fi; \ rm .config; \ ) 2>&1 | tee $(TOPDIR)/bin/$${system}_$${arch}_$$libc/build.log; \ - if [ -f .exit ]; break;fi \ + if [ -f .exit ]; then break;fi \ done; \ - if [ -f .exit ]; break;fi \ + if [ -f .exit ]; then break;fi \ done <${TOPDIR}/target/arch.lst ;\ if [ -f .exit ];then echo "Bulk build failed!"; rm .exit; break;fi \ done @@ -597,9 +597,9 @@ bulkall: $(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit; exit 1;fi; \ rm .config; \ ) 2>&1 | tee $(TOPDIR)/bin/$${system}_$${arch}_$$libc/build.log; \ - if [ -f .exit ]; break;fi \ + if [ -f .exit ]; then break;fi \ done; \ - if [ -f .exit ]; break;fi \ + if [ -f .exit ]; then break;fi \ done <${TOPDIR}/target/arch.lst ;\ if [ -f .exit ];then echo "Bulk build failed!"; rm .exit; break;fi \ done @@ -617,9 +617,9 @@ bulkallmod: $(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then echo $$system-$$libc >.exit; exit 1;fi; \ rm .config; \ ) 2>&1 | tee $(TOPDIR)/bin/$${system}_$${arch}_$$libc/build.log; \ - if [ -f .exit ]; break;fi \ + if [ -f .exit ]; then break;fi \ done; \ - if [ -f .exit ]; break;fi \ + if [ -f .exit ]; then break;fi \ done <${TOPDIR}/target/arch.lst ;\ if [ -f .exit ];then echo "Bulk build failed!"; cat .exit;rm .exit; break;fi \ done -- cgit v1.2.3 From 83c0684ab269fbd83cf1d9e9dc0d771bfeb7d5b0 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 29 Oct 2013 21:24:11 +0100 Subject: use exit 1 for the last for loop, otherwise hudson thinks everything is build fine --- mk/build.mk | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'mk/build.mk') diff --git a/mk/build.mk b/mk/build.mk index 104811819..b44247005 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -559,8 +559,9 @@ bulktoolchain: $(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit;fi; \ rm .config; \ ) 2>&1 | tee $(TOPDIR)/bin/toolchain_$${arch}_$${libc}/build.log; \ - if [ -f .exit ];then echo "Bulk build failed!"; rm .exit; exit 1;fi \ + if [ -f .exit ];then break;fi \ done <${TOPDIR}/target/tarch.lst ;\ + if [ -f .exit ];then echo "Bulk build failed!"; rm .exit; exit 1;fi \ done # build all target architecture, target systems and libc combinations @@ -581,7 +582,7 @@ bulk: done; \ if [ -f .exit ]; then break;fi \ done <${TOPDIR}/target/arch.lst ;\ - if [ -f .exit ];then echo "Bulk build failed!"; rm .exit; break;fi \ + if [ -f .exit ];then echo "Bulk build failed!"; rm .exit; exit 1;fi \ done bulkall: @@ -601,7 +602,7 @@ bulkall: done; \ if [ -f .exit ]; then break;fi \ done <${TOPDIR}/target/arch.lst ;\ - if [ -f .exit ];then echo "Bulk build failed!"; rm .exit; break;fi \ + if [ -f .exit ];then echo "Bulk build failed!"; rm .exit; exit 1;fi \ done bulkallmod: @@ -621,7 +622,7 @@ bulkallmod: done; \ if [ -f .exit ]; then break;fi \ done <${TOPDIR}/target/arch.lst ;\ - if [ -f .exit ];then echo "Bulk build failed!"; cat .exit;rm .exit; break;fi \ + if [ -f .exit ];then echo "Bulk build failed!"; cat .exit;rm .exit; exit 1;fi \ done ${TOPDIR}/bin/tools/pkgmaker: $(TOPDIR)/tools/adk/pkgmaker.c $(TOPDIR)/tools/adk/sortfile.c $(TOPDIR)/tools/adk/strmap.c -- cgit v1.2.3