Changes in boot/Makefile.grub [1f5c9c96:765678f] in mainline

File:

• boot/Makefile.grub (modified) (1 diff)

boot/Makefile.grub

@@ -31 +31 @@
 include Makefile.common
 
-GRUB = grub.$(GRUB_ARCH)
-BOOT = $(DISTROOT)/boot
-
-ELTORITO = boot/grub/$(GRUB_ARCH).img
-IMAGE = $(DISTROOT)/$(ELTORITO)
-
-ifeq ($(GRUB_ARCH),pc)
-        BOOT_CONFIG = $(BOOT)/grub/i386-pc/grub.cfg
-        MULTIBOOT_CMD = multiboot
-        MODULE_CMD = module
-endif
-ifeq ($(GRUB_ARCH),efi)
-        BOOT_CONFIG = $(BOOT)/grub/grub.cfg
-        MULTIBOOT_CMD = multiboot2
-        MODULE_CMD = module2
-endif
+GRUB2 = grub
+STAGE2 = $(GRUB2)/i386-pc/eltorito.img
+STAGE2_IN = boot/$(STAGE2)
 
 all: $(BOOT_OUTPUT)
 
 $(BOOT_OUTPUT): build_dist
-ifeq ($(GRUB_ARCH),pc)
-        mkisofs -J -r -input-charset utf-8 -V "HelenOS boot ISO" -eltorito-boot $(ELTORITO) -no-emul-boot -boot-load-size 64 -boot-info-table -o $@ $(DISTROOT)/
-endif
-ifeq ($(GRUB_ARCH),efi)
-        mkisofs -J -r -input-charset utf-8 -V "HelenOS boot ISO" -efi-boot $(ELTORITO) -o $@ $(DISTROOT)/
-endif
+        mkisofs -J -r -input-charset utf-8 -b $(STAGE2_IN) -no-emul-boot -boot-load-size 64 -boot-info-table -o $@ $(DISTROOT)/
 
 build_dist: clean
-        mkdir -p $(BOOT)
-        cp -r $(GRUB) $(BOOT)/grub
-ifeq ($(GRUB_ARCH),efi)
-        gunzip $(IMAGE)
-endif
-        
+        mkdir -p $(DISTROOT)/boot
+        cp -r $(GRUB2) $(DISTROOT)/boot
         for module in $(COMPONENTS) ; do \
-                cp "$$module" $(BOOT)/ ; \
+                cp "$$module" $(DISTROOT)/boot/ ; \
         done
         
-        echo "set default=0" > $(BOOT_CONFIG)
-        echo "set timeout=10" >> $(BOOT_CONFIG)
-        echo "" >> $(BOOT_CONFIG)
+        echo "set default=0" > $(DISTROOT)/boot/grub/i386-pc/grub.cfg
+        echo "set timeout=10" >> $(DISTROOT)/boot/grub/i386-pc/grub.cfg
+        echo "" >> $(DISTROOT)/boot/grub/i386-pc/grub.cfg
         
-ifeq ($(GRUB_ARCH),pc)
-        echo "insmod vbe" >> $(BOOT_CONFIG)
-        echo "insmod vga" >> $(BOOT_CONFIG)
-endif
-ifeq ($(GRUB_ARCH),efi)
-        echo "insmod efi_gop" >> $(BOOT_CONFIG)
-        echo "insmod efi_uga" >> $(BOOT_CONFIG)
-endif
-        echo "" >> $(BOOT_CONFIG)
+        echo "menuentry 'HelenOS $(RELEASE)' --class helenos --class os {" >> $(DISTROOT)/boot/grub/i386-pc/grub.cfg
+        echo "  set root='(cd)'" >> $(DISTROOT)/boot/grub/i386-pc/grub.cfg
         
-        echo "menuentry 'HelenOS $(RELEASE)' --class helenos --class os {" >> $(BOOT_CONFIG)
         for module in $(MODULES) ; do \
-                echo "  echo 'Loading $$module'" >> $(BOOT_CONFIG) ; \
+                echo "" >> $(DISTROOT)/boot/grub/i386-pc/grub.cfg ; \
+                echo "  echo 'Loading $$module'" >> $(DISTROOT)/boot/grub/i386-pc/grub.cfg ; \
                 if [ "$$module" = "kernel.bin" ] ; then \
-                        echo "  $(MULTIBOOT_CMD) /boot/$$module" >> $(BOOT_CONFIG) ; \
+                        echo "  multiboot /boot/$$module" >> $(DISTROOT)/boot/grub/i386-pc/grub.cfg ; \
                 else \
-                        echo "  $(MODULE_CMD) /boot/$$module" >> $(BOOT_CONFIG) ; \
+                        echo "  module /boot/$$module" >> $(DISTROOT)/boot/grub/i386-pc/grub.cfg ; \
                 fi \
         done
-        echo "}" >> $(BOOT_CONFIG)
+        
+        echo "}" >> $(DISTROOT)/boot/grub/i386-pc/grub.cfg
 
 clean: