diff options
| author | Stephen Cprek <smcprek@us.ibm.com> | 2014-08-21 17:10:32 -0500 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2014-08-22 13:39:03 -0500 |
| commit | f43f2f5ef9db94c2a565adc913aca02c52459d42 (patch) | |
| tree | 49d1722818d6f3c1dcde9ec1333efd907971d3e9 /src | |
| parent | bc64b357273dba1d79aa6e6fa2b5227fd80aefa1 (diff) | |
| download | talos-hostboot-f43f2f5ef9db94c2a565adc913aca02c52459d42.tar.gz talos-hostboot-f43f2f5ef9db94c2a565adc913aca02c52459d42.zip | |
Fix intermittent hb make error
Change-Id: I606aad6d577307fe090a81bbd8d933a5050086a3
Backport: release-fips820
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/12934
Reviewed-by: Brian H. Horton <brianh@linux.ibm.com>
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/build/mkrules/images.rules.mk | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/build/mkrules/images.rules.mk b/src/build/mkrules/images.rules.mk index d21dc8551..d486baa4d 100644 --- a/src/build/mkrules/images.rules.mk +++ b/src/build/mkrules/images.rules.mk @@ -45,21 +45,20 @@ $$(IMGDIR)/$(1).elf: $$(addprefix $$(OBJDIR)/, $$($(1)_OBJECTS)) \ endef $(foreach img,$(IMGS),$(eval $(call ELF_template,$(img)))) +# Wrap code in bash call $(IMGDIR)/%.bin: $(IMGDIR)/%.elf \ $(wildcard $(IMGDIR)/*.so) $(addprefix $(IMGDIR)/, $($*_DATA_MODULES)) \ $(CUSTOM_LINKER_EXE) $(C2) " LINKER $(notdir $@)" - $(eval TMPFILE = $(shell mktemp)) - $(C1)$(CUSTOM_LINKER) $@ $< \ - $(addprefix $(IMGDIR)/lib, $(addsuffix .so, $($*_MODULES))) \ + $(C1)bash -c 'set -o pipefail && $(CUSTOM_LINKER) $@ $< \ + $(addprefix $(IMGDIR)/lib, $(addsuffix .so, $($*_MODULES))) \ $(if $($*_EXTENDED_MODULES), \ --extended=0x40000 $(IMGDIR)/$*_extended.bin \ $(addprefix $(IMGDIR)/lib, \ $(addsuffix .so, $($*_EXTENDED_MODULES))) \ ) \ - $(addprefix $(IMGDIR)/, $($*_DATA_MODULES)) > $(TMPFILE) && \ - bzip2 -zc > $(IMGDIR)/.$*.lnkout.bz2 < $(TMPFILE) - rm $(TMPFILE) + $(addprefix $(IMGDIR)/, $($*_DATA_MODULES)) \ + | bzip2 -zc > $(IMGDIR)/.$*.lnkout.bz2' $(C1)$(ROOTPATH)/src/build/tools/addimgid $@ $< $(IMGDIR)/%.list.bz2 $(IMGDIR)/%.syms: $(IMGDIR)/%.bin |
