diff options
| author | Greg Thelen <gthelen@google.com> | 2019-09-23 15:33:05 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-10-07 18:57:16 +0200 |
| commit | d4a546452dccdbc824635f9649b6aef8b65b25fb (patch) | |
| tree | a64da2ee689cb11468e5de918ab1f29d8e196c96 /usr | |
| parent | d983182d40022445076d531f8d69113d6699a88b (diff) | |
| download | linux-stable-d4a546452dccdbc824635f9649b6aef8b65b25fb.tar.gz linux-stable-d4a546452dccdbc824635f9649b6aef8b65b25fb.tar.bz2 linux-stable-d4a546452dccdbc824635f9649b6aef8b65b25fb.zip | |
kbuild: clean compressed initramfs image
[ Upstream commit 6279eb3dd7946c69346a3b98473ed13d3a44adb5 ]
Since 9e3596b0c653 ("kbuild: initramfs cleanup, set target from Kconfig")
"make clean" leaves behind compressed initramfs images. Example:
$ make defconfig
$ sed -i 's|CONFIG_INITRAMFS_SOURCE=""|CONFIG_INITRAMFS_SOURCE="/tmp/ir.cpio"|' .config
$ make olddefconfig
$ make -s
$ make -s clean
$ git clean -ndxf | grep initramfs
Would remove usr/initramfs_data.cpio.gz
clean rules do not have CONFIG_* context so they do not know which
compression format was used. Thus they don't know which files to delete.
Tell clean to delete all possible compression formats.
Once patched usr/initramfs_data.cpio.gz and friends are deleted by
"make clean".
Link: http://lkml.kernel.org/r/20190722063251.55541-1-gthelen@google.com
Fixes: 9e3596b0c653 ("kbuild: initramfs cleanup, set target from Kconfig")
Signed-off-by: Greg Thelen <gthelen@google.com>
Cc: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'usr')
| -rw-r--r-- | usr/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/usr/Makefile b/usr/Makefile index 748f6a60bb1e..138c18cefb52 100644 --- a/usr/Makefile +++ b/usr/Makefile @@ -11,6 +11,9 @@ datafile_y = initramfs_data.cpio$(suffix_y) datafile_d_y = .$(datafile_y).d AFLAGS_initramfs_data.o += -DINITRAMFS_IMAGE="usr/$(datafile_y)" +# clean rules do not have CONFIG_INITRAMFS_COMPRESSION. So clean up after all +# possible compression formats. +clean-files += initramfs_data.cpio* # Generate builtin.o based on initramfs_data.o obj-$(CONFIG_BLK_DEV_INITRD) := initramfs_data.o |