diff options
author | H. Peter Anvin <hpa@zytor.com> | 2009-01-04 15:10:40 -0800 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2009-01-04 15:53:35 -0800 |
commit | 0f5e2d2484ccd3062bb1f63083bafa37041bc868 (patch) | |
tree | 3e8f0e74112f6bc11765b8d532e2b27f6c183c93 | |
parent | ae03c49964af5033534e518eebe439c3b90f43a7 (diff) | |
download | linux-3.10-0f5e2d2484ccd3062bb1f63083bafa37041bc868.tar.gz linux-3.10-0f5e2d2484ccd3062bb1f63083bafa37041bc868.tar.bz2 linux-3.10-0f5e2d2484ccd3062bb1f63083bafa37041bc868.zip |
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>
-rw-r--r-- | scripts/Makefile.lib | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 70b4676e3b9..3b949a35447 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -193,10 +193,10 @@ cmd_gzip = gzip -f -9 < $< > $@ size_append=$(CONFIG_SHELL) $(srctree)/scripts/bin_size quiet_cmd_bzip2 = BZIP2 $@ -cmd_bzip2 = (bzip2 -9 < $< ; $(size_append) $<) > $@ || (rm -f $@ ; false) +cmd_bzip2 = (bzip2 -9 < $< && $(size_append) $<) > $@ || (rm -f $@ ; false) # Lzma # --------------------------------------------------------------------------- quiet_cmd_lzma = LZMA $@ -cmd_lzma = (lzma -9 -c $< ; $(size_append) $<) >$@ || (rm -f $@ ; false) +cmd_lzma = (lzma -9 -c $< && $(size_append) $<) >$@ || (rm -f $@ ; false) |