Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 25a76ab8 in mainline for boot/Makefile.yaboot


Ignore:
Timestamp:
2010-05-08T07:53:23Z (12 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master
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:
1 moved

Legend:

Unmodified
Added
Removed
  • boot/Makefile.yaboot

    r6c39a907 r25a76ab8  
    2727#
    2828
     29.PHONY: all build_dist clean
     30
    2931include Makefile.common
    3032
    31 build: $(BASE)/image.boot
     33OFBOOT = yaboot/ofboot.b
     34BOOTINFO = yaboot/bootinfo.txt
     35YABOOT = yaboot/yaboot
     36YABOOT_CONF = yaboot/yaboot.conf
     37MAPS = yaboot/maps
    3238
    33 $(BASE)/image.boot: $(COMPONENTS) $(INIT_TASKS) $(RD_SRVS) $(RD_APPS) $(CFG)
    34         $(MAKE) -C arch/$(BARCH)/loader PRECHECK=$(PRECHECK)
    35         cp arch/$(BARCH)/loader/image.boot $@
     39all: $(POST_OUTPUT)
     40
     41$(POST_OUTPUT): build_dist
     42        mkisofs -hfs -part -map $(MAPS) -no-desktop -hfs-volid "HelenOS" -hfs-bless $(DISTROOT)/boot -r -o $@ $(DISTROOT)/
     43
     44build_dist: clean
     45        mkdir -p $(DISTROOT)/boot
     46        mkdir -p $(DISTROOT)/ppc
     47        cp $(BOOT_OUTPUT) $(DISTROOT)/boot/
     48        cp $(OFBOOT) $(DISTROOT)/boot/
     49        cp $(BOOTINFO) $(DISTROOT)/ppc/
     50        cp $(YABOOT) $(DISTROOT)/boot/
     51        cp $(YABOOT_CONF) $(DISTROOT)/boot/
    3652
    3753clean:
    38         $(MAKE) -C arch/$(BARCH)/loader clean
    39         rm -f $(BASE)/image.boot $(BASE)/hello.efi $(BASE)/image.bin
     54        rm -fr $(DISTROOT)
Note: See TracChangeset for help on using the changeset viewer.