diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-10-20 16:01:32 +0300 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.com> | 2016-01-28 13:40:32 +0300 |
| commit | 5399eb9b39081d6d2fc1a13d4ea85f1ceb2c8b44 (patch) | |
| tree | 30813082f38d46bc77ec895cba8325f42f820b12 | |
| parent | 92e963f50fc74041b5e9e744c330dca48e04f08d (diff) | |
| download | linux-5399eb9b39081d6d2fc1a13d4ea85f1ceb2c8b44.tar.xz | |
dtbsinstall: don't move target directory out of the way
No other kernel installation target moves the target directory out of
the way, even deleting an old version of it. These are destructive
operations, ones which the kernel build system should not be making.
This behaviour prevents being able to do:
make install INSTALL_PATH=/some/path/boot
make dtbs_install INSTALL_DTBS_PATH=/some/path/boot
As it causes the boot directory containing the kernel installed in
step 1 to be moved to /some/path/boot.old. Things get even more fun
if you do:
make install dtbs_install INSTALL_PATH=/some/path/boot INSTALL_DTBS_PATH=/some/path/boot
The kernel gets installed into /some/path/boot, then the directory gets
renamed to /some/path/boot.old, and a new directory created to hold the
dtbs. Even more fun if you supply -j2 when we end up with races in
make.
Remove this behaviour.
If this behaviour is required at installation time, this should be
done by the installation external to the kernel makefiles, just like
it would be done for 'make modules_install'.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Acked-by: Jason Cooper <jason@lakedaemon.net>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Michal Marek <mmarek@suse.com>
| -rw-r--r-- | scripts/Makefile.dtbinst | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/scripts/Makefile.dtbinst b/scripts/Makefile.dtbinst index 1c15717e0d56..a1be75d0a5fd 100644 --- a/scripts/Makefile.dtbinst +++ b/scripts/Makefile.dtbinst @@ -23,8 +23,6 @@ include $(src)/Makefile PHONY += __dtbs_install_prep __dtbs_install_prep: ifeq ("$(dtbinst-root)", "$(obj)") - $(Q)if [ -d $(INSTALL_DTBS_PATH).old ]; then rm -rf $(INSTALL_DTBS_PATH).old; fi - $(Q)if [ -d $(INSTALL_DTBS_PATH) ]; then mv $(INSTALL_DTBS_PATH) $(INSTALL_DTBS_PATH).old; fi $(Q)mkdir -p $(INSTALL_DTBS_PATH) endif |