Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d20babd authored by H. Peter Anvin's avatar H. Peter Anvin Committed by Sam Ravnborg
Browse files

kbuild: drop vmlinux dependency from "make install" 



This removes the dependency from vmlinux to install, thus avoiding the
current situation where "make install" has a nasty tendency to leave
root-turds in the working directory.

It also updates x86-64 to be in sync with i386.

Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
parent 63b794bf

arch/i386/Makefile

+2 −3
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ AFLAGS += $(mflags-y) 
boot := arch/i386/boot



.PHONY: zImage bzImage compressed zlilo bzlilo \

	zdisk bzdisk fdimage fdimage144 fdimage288 install kernel_install

	zdisk bzdisk fdimage fdimage144 fdimage288 install



all: bzImage
@@ -125,8 +125,7 @@ zdisk bzdisk: vmlinux 
fdimage fdimage144 fdimage288: vmlinux

	$(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(KBUILD_IMAGE) $@



install: vmlinux

install kernel_install:

install:

	$(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(KBUILD_IMAGE) install



archclean:

arch/i386/boot/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -100,5 +100,5 @@ zlilo: $(BOOTIMAGE) 
	cp System.map $(INSTALL_PATH)/

	if [ -x /sbin/lilo ]; then /sbin/lilo; else /etc/lilo/install; fi



install: $(BOOTIMAGE)

install:

	sh $(srctree)/$(src)/install.sh $(KERNELRELEASE) $< System.map "$(INSTALL_PATH)"

arch/i386/boot/install.sh

+14 −0
Original line number Diff line number Diff line
@@ -19,6 +19,20 @@ 
#   $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/${CROSS_COMPILE}installkernel ]; then exec ~/bin/${CROSS_COMPILE}installkernel "$@"; fi

arch/x86_64/Makefile

+4 −1
Original line number Diff line number Diff line
@@ -80,7 +80,10 @@ bzlilo: vmlinux 
bzdisk: vmlinux

	$(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(BOOTIMAGE) zdisk



install fdimage fdimage144 fdimage288: vmlinux

fdimage fdimage144 fdimage288: vmlinux

	$(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(BOOTIMAGE) $@



install:

	$(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(BOOTIMAGE) $@ 



archclean:

arch/x86_64/boot/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -98,5 +98,5 @@ zlilo: $(BOOTIMAGE) 
	cp System.map $(INSTALL_PATH)/

	if [ -x /sbin/lilo ]; then /sbin/lilo; else /etc/lilo/install; fi



install: $(BOOTIMAGE)

install:

	sh $(srctree)/$(src)/install.sh $(KERNELRELEASE) $(BOOTIMAGE) System.map "$(INSTALL_PATH)"