History

bzip2/lzma: handle failures from bzip2 and lzma correctly

Impact: Bug fix If bzip2 or lzma fails (for example, if they aren't installed on the system), we need to propagate the failure out to "make". However, they were masked by being followed by a semicolon.

H. Peter Anvin committed 17 years ago

Commit 0f5e2d21 parent ae03c491 file · +2 −2Browse files

Unified · Split

scripts/Makefile.lib+2−2
@@ -193,10 +193,10 @@ cmd_gzip = gzip -f -9 < $< > $@ · 192 unmodified lines
193size_append=$(CONFIG_SHELL) $(srctree)/scripts/bin_size193size_append=$(CONFIG_SHELL) $(srctree)/scripts/bin_size
194 194
195quiet_cmd_bzip2 = BZIP2 $@195quiet_cmd_bzip2 = BZIP2 $@
196cmd_bzip2 = (bzip2 -9 < $< ; $(size_append) $<) > $@ || (rm -f $@ ; false)196cmd_bzip2 = (bzip2 -9 < $< && $(size_append) $<) > $@ || (rm -f $@ ; false)
197 197
198# Lzma198# Lzma
199# ---------------------------------------------------------------------------199# ---------------------------------------------------------------------------
200 200
201quiet_cmd_lzma = LZMA $@201quiet_cmd_lzma = LZMA $@
202cmd_lzma = (lzma -9 -c $< ; $(size_append) $<) >$@ || (rm -f $@ ; false)202cmd_lzma = (lzma -9 -c $< && $(size_append) $<) >$@ || (rm -f $@ ; false)