[Lunar-commits] <lunar-iso> stage2: abort properly on module errors

[Stefan Wold]

commit df968eecb91367a42eaedcd3de6807f59b5de5b3
Author: Stefan Wold <ratler at lunar-linux.org>
Date: Tue, 19 Aug 2014 22:20:08 +0200
URL: https://github.com/lunar-linux/lunar-iso/commit/df968eecb91367a42eaedcd3de6807f59b5de5b3

stage2: abort properly on module errors

xargs will just ignore module errors and continue on to the next thus
making it really hard to find the actual problem.

Lend resolv.conf from the host, since a couple of modules clear ithe download cache
after lin, to allow re-downloade from within the chroot.
---
  mkfiles/stage2.mk | +3/-1     
  1 file changed, 3 insertions(+), 1 deletion(-)

--- a/mkfiles/stage2.mk
+++ b/mkfiles/stage2.mk
@@ -103,7 +103,9 @@ stage2-toolchain: $(ISO_TARGET)/.stage2-toolchain
 
 $(ISO_TARGET)/.stage2: stage2-toolchain
 	@echo stage2-build
-	@ASK_FOR_REBUILDS=n PROMPT_DELAY=0 $(ISO_SOURCE)/scripts/chroot-build bash -c 'echo `lsh sort_by_dependency $(filter-out $(KERNEL_MODULES) $(STAGE2_MODULES) $(EXCLUDE_MODULES),$(ALL_MODULES))` | xargs -n 1 lin -c'
+	@cp /etc/resolv.conf $(ISO_TARGET)/etc/resolv.conf
+	@ASK_FOR_REBUILDS=n PROMPT_DELAY=0 $(ISO_SOURCE)/scripts/chroot-build bash -c 'for mod in `lsh sort_by_dependency $(filter-out $(KERNEL_MODULES) $(STAGE2_MODULES) $(EXCLUDE_MODULES),$(ALL_MODULES))`; do lin -c $$mod || exit 1; done'
+	@rm -f $(ISO_TARGET)/etc/resolv.conf
 	@touch $@
 
 stage2-build: $(ISO_TARGET)/.stage2