aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2015-07-07 14:26:07 -0400
committerMichal Marek <mmarek@suse.com>2015-07-22 11:47:12 -0400
commit3d1450d54a4fc277fc4598acf2335f74b66b08fc (patch)
tree831ea50e99c1b1a7c96e4d1c75209c2c97df8b9c
parent6dd3f13e4239a8c2b1e60687d7321bc0df614f33 (diff)
Makefile: Force gzip and xz on module install
Running `make modules_install` ordinarily will overwrite existing modules. This is the desired behavior, and is how pretty much every other `make install` target works. However, if CONFIG_MODULE_COMPRESS is enabled, modules are passed through gzip and xz which then do the file writing. Both gzip and xz will error out if the file already exists, unless -f is passed. This patch adds -f so that the behavior is uniform. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> Signed-off-by: Michal Marek <mmarek@suse.com>
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index dc868bcdaf45..c5234fe6adb3 100644
--- a/Makefile
+++ b/Makefile
@@ -852,10 +852,10 @@ export mod_strip_cmd
852mod_compress_cmd = true 852mod_compress_cmd = true
853ifdef CONFIG_MODULE_COMPRESS 853ifdef CONFIG_MODULE_COMPRESS
854 ifdef CONFIG_MODULE_COMPRESS_GZIP 854 ifdef CONFIG_MODULE_COMPRESS_GZIP
855 mod_compress_cmd = gzip -n 855 mod_compress_cmd = gzip -n -f
856 endif # CONFIG_MODULE_COMPRESS_GZIP 856 endif # CONFIG_MODULE_COMPRESS_GZIP
857 ifdef CONFIG_MODULE_COMPRESS_XZ 857 ifdef CONFIG_MODULE_COMPRESS_XZ
858 mod_compress_cmd = xz 858 mod_compress_cmd = xz -f
859 endif # CONFIG_MODULE_COMPRESS_XZ 859 endif # CONFIG_MODULE_COMPRESS_XZ
860endif # CONFIG_MODULE_COMPRESS 860endif # CONFIG_MODULE_COMPRESS
861export mod_compress_cmd 861export mod_compress_cmd