Changeset 25a76ab8 in mainline for boot/Makefile.yaboot

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.yaboot (moved) (moved from boot/arch/ia64/Makefile.inc ) (1 diff)

boot/Makefile.yaboot

@@ -27 +27 @@
 #
 
+.PHONY: all build_dist clean
+
 include Makefile.common
 
-build: $(BASE)/image.boot
+OFBOOT = yaboot/ofboot.b
+BOOTINFO = yaboot/bootinfo.txt
+YABOOT = yaboot/yaboot
+YABOOT_CONF = yaboot/yaboot.conf
+MAPS = yaboot/maps
 
-$(BASE)/image.boot: $(COMPONENTS) $(INIT_TASKS) $(RD_SRVS) $(RD_APPS) $(CFG)
-        $(MAKE) -C arch/$(BARCH)/loader PRECHECK=$(PRECHECK)
-        cp arch/$(BARCH)/loader/image.boot $@
+all: $(POST_OUTPUT)
+
+$(POST_OUTPUT): build_dist
+        mkisofs -hfs -part -map $(MAPS) -no-desktop -hfs-volid "HelenOS" -hfs-bless $(DISTROOT)/boot -r -o $@ $(DISTROOT)/
+
+build_dist: clean
+        mkdir -p $(DISTROOT)/boot
+        mkdir -p $(DISTROOT)/ppc
+        cp $(BOOT_OUTPUT) $(DISTROOT)/boot/
+        cp $(OFBOOT) $(DISTROOT)/boot/
+        cp $(BOOTINFO) $(DISTROOT)/ppc/
+        cp $(YABOOT) $(DISTROOT)/boot/
+        cp $(YABOOT_CONF) $(DISTROOT)/boot/
 
 clean:
-        $(MAKE) -C arch/$(BARCH)/loader clean
-        rm -f $(BASE)/image.boot $(BASE)/hello.efi $(BASE)/image.bin
+        rm -fr $(DISTROOT)