mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-05 06:39:27 +00:00
parisc: make "make install" not depend on vmlinux
Install targets (install, zinstall, uinstall) on parisc have a dependency to vmlinux. This may cause parts of the kernel to be rebuilt during installation. We must avoid this since this may run as root. Install targets "ABSOLUTELY MUST NOT MODIFY THE SOURCE TREE." as Linus emphasized this in: http://lkml.org/lkml/2013/7/10/600 So on parisc and maybe other archs we need the same as for x86:1648e4f8
x86, kbuild: make "make install" not depend on vmlinux This parisc patch was inspired by:19514fc6
arm, kbuild: make "make install" not depend on vmlinux Signed-off-by: Helge Deller <deller@gmx.de>
This commit is contained in:
parent
527973c840
commit
b0756b5ade
@ -94,7 +94,7 @@ PALOCONF := $(shell if [ -f $(src)/palo.conf ]; then echo $(src)/palo.conf; \
|
||||
else echo $(obj)/palo.conf; \
|
||||
fi)
|
||||
|
||||
palo: vmlinuz
|
||||
palo lifimage: vmlinuz
|
||||
@if test ! -x "$(PALO)"; then \
|
||||
echo 'ERROR: Please install palo first (apt-get install palo)';\
|
||||
echo 'or build it from source and install it somewhere in your $$PATH';\
|
||||
@ -109,16 +109,23 @@ palo: vmlinuz
|
||||
fi
|
||||
$(PALO) -f $(PALOCONF)
|
||||
|
||||
# Shorthands for known targets not supported by parisc, use vmlinux/vmlinuz as default
|
||||
BOOT_TARGETS = zImage Image palo lifimage
|
||||
INSTALL_TARGETS = zinstall install
|
||||
|
||||
PHONY += bzImage $(BOOT_TARGETS) $(INSTALL_TARGETS)
|
||||
|
||||
bzImage zImage: vmlinuz
|
||||
Image: vmlinux
|
||||
zImage bzImage: vmlinuz
|
||||
|
||||
vmlinuz: vmlinux
|
||||
@gzip -cf -9 $< > $@
|
||||
|
||||
install: vmlinuz
|
||||
sh $(src)/arch/parisc/install.sh \
|
||||
$(KERNELRELEASE) $< System.map "$(INSTALL_PATH)"
|
||||
install:
|
||||
$(CONFIG_SHELL) $(src)/arch/parisc/install.sh \
|
||||
$(KERNELRELEASE) vmlinux System.map "$(INSTALL_PATH)"
|
||||
zinstall:
|
||||
$(CONFIG_SHELL) $(src)/arch/parisc/install.sh \
|
||||
$(KERNELRELEASE) vmlinuz System.map "$(INSTALL_PATH)"
|
||||
|
||||
CLEAN_FILES += lifimage
|
||||
MRPROPER_FILES += palo.conf
|
||||
@ -127,10 +134,11 @@ define archhelp
|
||||
@echo '* vmlinux - Uncompressed kernel image (./vmlinux)'
|
||||
@echo ' vmlinuz - Compressed kernel image (./vmlinuz)'
|
||||
@echo ' palo - Bootable image (./lifimage)'
|
||||
@echo ' install - Install kernel using'
|
||||
@echo ' install - Install uncompressed vmlinux kernel using'
|
||||
@echo ' (your) ~/bin/$(INSTALLKERNEL) or'
|
||||
@echo ' (distribution) /sbin/$(INSTALLKERNEL) or'
|
||||
@echo ' copy to $$(INSTALL_PATH)'
|
||||
@echo ' zinstall - Install compressed vmlinuz kernel'
|
||||
endef
|
||||
|
||||
# we require gcc 3.3 or above to compile the kernel
|
||||
|
@ -19,20 +19,48 @@
|
||||
# $4 - default install path (blank if root directory)
|
||||
#
|
||||
|
||||
verify () {
|
||||
if [ ! -f "$1" ]; then
|
||||
echo "" 1>&2
|
||||
echo " *** Missing file: $1" 1>&2
|
||||
echo ' *** You need to run "make" before "make install".' 1>&2
|
||||
echo "" 1>&2
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
|
||||
# Make sure the files actually exist
|
||||
|
||||
verify "$2"
|
||||
verify "$3"
|
||||
|
||||
# User may have a custom install script
|
||||
|
||||
if [ -x ~/bin/${INSTALLKERNEL} ]; then exec ~/bin/${INSTALLKERNEL} "$@"; fi
|
||||
if [ -x /sbin/${INSTALLKERNEL} ]; then exec /sbin/${INSTALLKERNEL} "$@"; fi
|
||||
if [ -n "${INSTALLKERNEL}" ]; then
|
||||
if [ -x ~/bin/${INSTALLKERNEL} ]; then exec ~/bin/${INSTALLKERNEL} "$@"; fi
|
||||
if [ -x /sbin/${INSTALLKERNEL} ]; then exec /sbin/${INSTALLKERNEL} "$@"; fi
|
||||
fi
|
||||
|
||||
# Default install
|
||||
|
||||
if [ -f $4/vmlinuz ]; then
|
||||
mv $4/vmlinuz $4/vmlinuz.old
|
||||
if [ "$(basename $2)" = "zImage" ]; then
|
||||
# Compressed install
|
||||
echo "Installing compressed kernel"
|
||||
base=vmlinuz
|
||||
else
|
||||
# Normal install
|
||||
echo "Installing normal kernel"
|
||||
base=vmlinux
|
||||
fi
|
||||
|
||||
if [ -f $4/System.map ]; then
|
||||
mv $4/System.map $4/System.old
|
||||
if [ -f $4/$base-$1 ]; then
|
||||
mv $4/$base-$1 $4/$base-$1.old
|
||||
fi
|
||||
cat $2 > $4/$base-$1
|
||||
|
||||
# Install system map file
|
||||
if [ -f $4/System.map-$1 ]; then
|
||||
mv $4/System.map-$1 $4/System.map-$1.old
|
||||
fi
|
||||
cp $3 $4/System.map-$1
|
||||
|
||||
cat $2 > $4/vmlinuz
|
||||
cp $3 $4/System.map
|
||||
|
Loading…
Reference in New Issue
Block a user