diff --git a/Makefile b/Makefile index d334eeb..2546a87 100644 --- a/Makefile +++ b/Makefile @@ -58,7 +58,7 @@ PWD := $(shell pwd | sed 's/"/\\\"/g;s/\$$/\\\$$/g') all: $(MULTIBOOT_IMAGE) $(MULTIBOOT_IMAGE): $(KERNEL_LOAD) - ./support/build_image.sh $@ $< + ./support/build_image.sh $@ $< "" $(KERNEL_LOAD): $(KERNEL_OBJ) $(CP) $< $<.strip && $(STRIP) -sx -R .comment $<.strip diff --git a/grub/grub b/grub/grub new file mode 100755 index 0000000..87f6a95 Binary files /dev/null and b/grub/grub differ diff --git a/grub/stage1 b/grub/stage1 new file mode 100644 index 0000000..c10df80 Binary files /dev/null and b/grub/stage1 differ diff --git a/grub/stage2 b/grub/stage2 new file mode 100644 index 0000000..332b104 Binary files /dev/null and b/grub/stage2 differ diff --git a/support/build_image.sh b/support/build_image.sh index 152906c..ab83342 100755 --- a/support/build_image.sh +++ b/support/build_image.sh @@ -49,8 +49,8 @@ print_usage () { exit 1 } -grub_dirs_common="/usr/local/share/grub/i386-freebsd /usr/local/share/grub/i386-pc /usr/share/grub/i386-pc /usr/lib/grub/i386-pc /usr/local/grub /usr/share/grub/i386-redhat /usr/local/src/grub-0.5.94 $HOME/share/grub/i386-pc/ /usr/lib/grub/x86_64-unknown" -sbin_grub_path="/usr/local/sbin /usr/sbin /sbin $HOME/sbin" +grub_dirs_common="$PWD/grub /usr/local/share/grub/i386-freebsd /usr/local/share/grub/i386-pc /usr/share/grub/i386-pc /usr/lib/grub/i386-pc /usr/local/grub /usr/share/grub/i386-redhat /usr/local/src/grub-0.5.94 $HOME/share/grub/i386-pc/ /usr/lib/grub/x86_64-unknown" +sbin_grub_path="/usr/local/sbin /usr/sbin /sbin $HOME/sbin $PWD/grub" PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin export PATH