aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2009-01-04 18:10:40 -0500
committerH. Peter Anvin <hpa@zytor.com>2009-01-04 18:53:35 -0500
commit0f5e2d2484ccd3062bb1f63083bafa37041bc868 (patch)
tree3e8f0e74112f6bc11765b8d532e2b27f6c183c93 /scripts
parentae03c49964af5033534e518eebe439c3b90f43a7 (diff)
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. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/Makefile.lib4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 70b4676e3b99..3b949a354470 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -193,10 +193,10 @@ cmd_gzip = gzip -f -9 < $< > $@
193size_append=$(CONFIG_SHELL) $(srctree)/scripts/bin_size 193size_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# Lzma 198# 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)