diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 11:21:33 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 11:21:33 -0500 |
commit | ab396e91bfe953db26fa1083d9c3e7a4fbe0334a (patch) | |
tree | 81db9e5f919b84dcb4284ca8cdf675e13716c191 /arch/x86_64 | |
parent | 9979ead5d1eb23191a00453559927c5abf9087e2 (diff) | |
parent | 4f0210b9c4889eede9f8f379f93570c01998ccb9 (diff) |
Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
Fix up some trivial conflicts in {i386|ia64}/Makefile
Diffstat (limited to 'arch/x86_64')
-rw-r--r-- | arch/x86_64/Makefile | 5 | ||||
-rw-r--r-- | arch/x86_64/boot/Makefile | 2 | ||||
-rw-r--r-- | arch/x86_64/boot/install.sh | 40 |
3 files changed, 6 insertions, 41 deletions
diff --git a/arch/x86_64/Makefile b/arch/x86_64/Makefile index a9cd42e61828..51d83288d62b 100644 --- a/arch/x86_64/Makefile +++ b/arch/x86_64/Makefile | |||
@@ -80,9 +80,12 @@ bzlilo: vmlinux | |||
80 | bzdisk: vmlinux | 80 | bzdisk: vmlinux |
81 | $(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(BOOTIMAGE) zdisk | 81 | $(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(BOOTIMAGE) zdisk |
82 | 82 | ||
83 | install fdimage fdimage144 fdimage288: vmlinux | 83 | fdimage fdimage144 fdimage288: vmlinux |
84 | $(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(BOOTIMAGE) $@ | 84 | $(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(BOOTIMAGE) $@ |
85 | 85 | ||
86 | install: | ||
87 | $(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(BOOTIMAGE) $@ | ||
88 | |||
86 | archclean: | 89 | archclean: |
87 | $(Q)$(MAKE) $(clean)=$(boot) | 90 | $(Q)$(MAKE) $(clean)=$(boot) |
88 | 91 | ||
diff --git a/arch/x86_64/boot/Makefile b/arch/x86_64/boot/Makefile index 18c6e915d69b..29f8396ed151 100644 --- a/arch/x86_64/boot/Makefile +++ b/arch/x86_64/boot/Makefile | |||
@@ -98,5 +98,5 @@ zlilo: $(BOOTIMAGE) | |||
98 | cp System.map $(INSTALL_PATH)/ | 98 | cp System.map $(INSTALL_PATH)/ |
99 | if [ -x /sbin/lilo ]; then /sbin/lilo; else /etc/lilo/install; fi | 99 | if [ -x /sbin/lilo ]; then /sbin/lilo; else /etc/lilo/install; fi |
100 | 100 | ||
101 | install: $(BOOTIMAGE) | 101 | install: |
102 | sh $(srctree)/$(src)/install.sh $(KERNELRELEASE) $(BOOTIMAGE) System.map "$(INSTALL_PATH)" | 102 | sh $(srctree)/$(src)/install.sh $(KERNELRELEASE) $(BOOTIMAGE) System.map "$(INSTALL_PATH)" |
diff --git a/arch/x86_64/boot/install.sh b/arch/x86_64/boot/install.sh index 198af15a7758..baaa2369bdb8 100644 --- a/arch/x86_64/boot/install.sh +++ b/arch/x86_64/boot/install.sh | |||
@@ -1,40 +1,2 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | # | 2 | . $srctree/arch/i386/boot/install.sh |
3 | # arch/x86_64/boot/install.sh | ||
4 | # | ||
5 | # This file is subject to the terms and conditions of the GNU General Public | ||
6 | # License. See the file "COPYING" in the main directory of this archive | ||
7 | # for more details. | ||
8 | # | ||
9 | # Copyright (C) 1995 by Linus Torvalds | ||
10 | # | ||
11 | # Adapted from code in arch/i386/boot/Makefile by H. Peter Anvin | ||
12 | # | ||
13 | # "make install" script for i386 architecture | ||
14 | # | ||
15 | # Arguments: | ||
16 | # $1 - kernel version | ||
17 | # $2 - kernel image file | ||
18 | # $3 - kernel map file | ||
19 | # $4 - default install path (blank if root directory) | ||
20 | # | ||
21 | |||
22 | # User may have a custom install script | ||
23 | |||
24 | if [ -x ~/bin/${CROSS_COMPILE}installkernel ]; then exec ~/bin/${CROSS_COMPILE}installkernel "$@"; fi | ||
25 | if [ -x /sbin/${CROSS_COMPILE}installkernel ]; then exec /sbin/${CROSS_COMPILE}installkernel "$@"; fi | ||
26 | |||
27 | # Default install - same as make zlilo | ||
28 | |||
29 | if [ -f $4/vmlinuz ]; then | ||
30 | mv $4/vmlinuz $4/vmlinuz.old | ||
31 | fi | ||
32 | |||
33 | if [ -f $4/System.map ]; then | ||
34 | mv $4/System.map $4/System.old | ||
35 | fi | ||
36 | |||
37 | cat $2 > $4/vmlinuz | ||
38 | cp $3 $4/System.map | ||
39 | |||
40 | if [ -x /sbin/lilo ]; then /sbin/lilo; else /etc/lilo/install; fi | ||