diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 08:21:33 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 08:21:33 -0800 |
commit | ab396e91bfe953db26fa1083d9c3e7a4fbe0334a (patch) | |
tree | 81db9e5f919b84dcb4284ca8cdf675e13716c191 /arch/i386/boot | |
parent | 9979ead5d1eb23191a00453559927c5abf9087e2 (diff) | |
parent | 4f0210b9c4889eede9f8f379f93570c01998ccb9 (diff) | |
download | kernel_samsung_tuna-ab396e91bfe953db26fa1083d9c3e7a4fbe0334a.zip kernel_samsung_tuna-ab396e91bfe953db26fa1083d9c3e7a4fbe0334a.tar.gz kernel_samsung_tuna-ab396e91bfe953db26fa1083d9c3e7a4fbe0334a.tar.bz2 |
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/i386/boot')
-rw-r--r-- | arch/i386/boot/Makefile | 2 | ||||
-rw-r--r-- | arch/i386/boot/install.sh | 14 |
2 files changed, 15 insertions, 1 deletions
diff --git a/arch/i386/boot/Makefile b/arch/i386/boot/Makefile index 1e71382..0fea75d 100644 --- a/arch/i386/boot/Makefile +++ b/arch/i386/boot/Makefile @@ -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)" diff --git a/arch/i386/boot/install.sh b/arch/i386/boot/install.sh index f17b40d..5e44c73 100644 --- a/arch/i386/boot/install.sh +++ b/arch/i386/boot/install.sh @@ -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 |