← Back to branch summary

~martin-decky/helenos/rcu

« back to all changes in this revision

Viewing changes to boot/arch/amd64/Makefile.inc

  • Committer: Pavel Rimsky
  • Date: 2010-02-20 20:54:53 UTC
  • mfrom: (292 head)
  • mto: This revision was merged to the branch mainline in revision 296.
  • Revision ID: pavel@pavel-laptop-20100220205453-70sim280j709dgp3
Synchronize with head.

Show diffs side-by-side

added added

removed removed

Lines of Context:
boot/arch/amd64/Makefile.inc
38
38
 
39
39
build: $(BASE)/image.iso
40
40
 
41
 
$(BASE)/image.iso: arch/$(BARCH)/grub/stage2_eltorito $(KERNELDIR)/kernel.bin $(INIT_TASKS) $(RD_SRVS) $(RD_APPS)
 
41
$(BASE)/image.iso: arch/$(BARCH)/grub/stage2_eltorito $(KERNELDIR)/kernel.bin $(INIT_TASKS) $(RD_SRVS) $(RD_APPS) $(CFG)
42
42
        mkdir -p $(TMP)/boot/grub
43
43
        cp arch/$(BARCH)/grub/stage2_eltorito $(TMP)/boot/grub/
44
44
        
55
55
                fi \
56
56
        done
57
57
        
 
58
        rm -f $(USPACEDIR)/dist/srv/*
 
59
        rm -f $(USPACEDIR)/dist/app/*
 
60
        rm -f $(USPACEDIR)/dist/cfg/net/*
 
61
        
58
62
        cp $(KERNELDIR)/kernel.bin $(TMP)/boot/
59
63
        for task in $(INIT_TASKS) ; do \
60
64
                cp $$task $(TMP)/boot/ ; \
65
69
        for file in $(RD_APPS) ; do \
66
70
                cp $$file $(USPACEDIR)/dist/app/ ; \
67
71
        done
 
72
        for file in $(NET_CFG) ; do \
 
73
                cp $$file $(USPACEDIR)/dist/cfg/net/ ; \
 
74
        done
68
75
        
69
76
ifeq ($(RDFMT),tmpfs)
70
77
        $(BASE)/tools/mktmpfs.py $(USPACEDIR)/dist/ $(TMP)/boot/$(INITRD).fs
77
84
        mkisofs -J -r -b boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 -boot-info-table -o $@ $(TMP)/
78
85
 
79
86
clean:
 
87
        rm -f $(USPACEDIR)/dist/srv/*
 
88
        rm -f $(USPACEDIR)/dist/app/*
 
89
        rm -f $(USPACEDIR)/dist/cfg/net/*
 
90
 
80
91
        for file in $(RD_SRVS) ; do \
81
92
                rm -f $(USPACEDIR)/dist/srv/`basename $$file` ; \
82
93
        done
83
94
        for file in $(RD_APPS) ; do \
84
95
                rm -f $(USPACEDIR)/dist/app/`basename $$file` ; \
85
96
        done
 
97
        for file in $(NET_CFG) ; do \
 
98
                rm -f $(USPACEDIR)/dist/cfg/net/`basename $$file` ; \
 
99
        done
86
100
        rm -fr $(TMP)
87
101
        rm -f $(BASE)/image.iso