Changeset 25a76ab8 in mainline for boot/Makefile.grub

Timestamp:

2010-05-08T07:53:23Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

051bc69a

Parents:

6c39a907 (diff), 1317380 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• boot/Makefile.grub (moved) (moved from boot/arch/arm32/loader/Makefile ) (2 diffs)

boot/Makefile.grub

@@ -1 +1 @@
 #
-# Copyright (c) 2005 Martin Decky
-# Copyright (c) 2007 Jakub Jermar
+# Copyright (c) 2006 Martin Decky
 # All rights reserved.
 #
@@ -28 +27 @@
 #
 
+.PHONY: all build_dist clean
+
 include Makefile.common
 
-.PHONY: all clean
+STAGE2 = grub/stage2_eltorito
+STAGE2_IN = boot/$(STAGE2)
 
-all: ../../../../version ../../../../Makefile.common ../../../../Makefile.config ../../../../config.h
-        -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
-        $(MAKE) -f Makefile.build PRECHECK=$(PRECHECK)
+all: $(BOOT_OUTPUT)
+
+$(BOOT_OUTPUT): build_dist
+        mkisofs -J -r -b $(STAGE2_IN) -no-emul-boot -boot-load-size 4 -boot-info-table -o $@ $(DISTROOT)/
+
+build_dist: clean
+        mkdir -p $(DISTROOT)/boot/grub
+        cp $(STAGE2) $(DISTROOT)/boot/grub/
+        for module in $(COMPONENTS) ; do \
+                cp "$$module" $(DISTROOT)/boot/ ; \
+        done
+        
+        echo "default 0" > $(DISTROOT)/boot/grub/menu.lst
+        echo "timeout 10" >> $(DISTROOT)/boot/grub/menu.lst
+        echo "" >> $(DISTROOT)/boot/grub/menu.lst
+        echo "title=HelenOS" >> $(DISTROOT)/boot/grub/menu.lst
+        echo "  root (cd)" >> $(DISTROOT)/boot/grub/menu.lst
+        for module in $(MODULES) ; do \
+                if [ "$$module" = "kernel.bin" ] ; then \
+                        echo "  kernel /boot/$$module" >> $(DISTROOT)/boot/grub/menu.lst ; \
+                else \
+                        echo "  module /boot/$$module" >> $(DISTROOT)/boot/grub/menu.lst ; \
+                fi \
+        done
 
 clean:
-        rm -f $(USPACEDIR)/dist/srv/*
-        rm -f $(USPACEDIR)/dist/app/*
-        rm -f $(USPACEDIR)/dist/cfg/net/*
-
-        for file in $(RD_SRVS) ; do \
-                rm -f $(USPACEDIR)/dist/srv/`basename $$file` ; \
-        done
-        for file in $(RD_APPS) ; do \
-                rm -f $(USPACEDIR)/dist/app/`basename $$file` ; \
-        done
-        for file in $(NET_CFG) ; do \
-                rm -f $(USPACEDIR)/dist/cfg/net/`basename $$file` ; \
-        done
-        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(COMPS).h $(COMPS).c $(LINK) $(INITRD).img $(INITRD).fs
-        find . -name '*.o' -follow -exec rm \{\} \;
-        find . -name '*.co' -follow -exec rm \{\} \;
+        rm -fr $(DISTROOT)