Changeset 0928526 in mainline for boot/arch/amd64/Makefile.inc
- Timestamp:
- 2008-08-04T21:15:13Z (17 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 677f620
- Parents:
- 6e0e8c9
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
boot/arch/amd64/Makefile.inc
r6e0e8c9 r0928526 33 33 $(USPACEDIR)/srv/devmap/devmap \ 34 34 $(USPACEDIR)/srv/rd/rd \ 35 $(USPACEDIR)/srv/vfs/vfs \ 36 $(USPACEDIR)/srv/fs/tmpfs/tmpfs \ 35 $(USPACEDIR)/srv/vfs/vfs 36 ifeq ($(RDFMT),tmpfs) 37 INIT_TASKS += $(USPACEDIR)/srv/fs/tmpfs/tmpfs 38 endif 39 ifeq ($(RDFMT),fat) 40 INIT_TASKS += $(USPACEDIR)/srv/fs/fat/fat 41 endif 37 42 38 43 RD_TASKS = \ … … 41 46 $(USPACEDIR)/srv/kbd/kbd \ 42 47 $(USPACEDIR)/srv/console/console \ 43 $(USPACEDIR)/srv/fs/fat/fat \44 48 $(USPACEDIR)/app/tetris/tetris \ 45 49 $(USPACEDIR)/app/tester/tester \ 46 50 $(USPACEDIR)/app/klog/klog \ 47 51 $(USPACEDIR)/app/cli/cli 52 ifneq ($(RDFMT),tmpfs) 53 RD_TASKS += $(USPACEDIR)/srv/fs/tmpfs/tmpfs 54 endif 55 ifneq ($(RDFMT),fat) 56 RD_TASKS += $(USPACEDIR)/srv/fs/fat/fat 57 endif 48 58 49 59 build: $(BASE)/image.iso … … 52 62 mkdir -p arch/$(ARCH)/iso/boot/grub 53 63 cp arch/$(ARCH)/grub/stage2_eltorito arch/$(ARCH)/iso/boot/grub/ 54 cp arch/$(ARCH)/grub/menu.lst arch/$(ARCH)/iso/boot/grub/ 64 ifneq ($(RDFMT),tmpfs) 65 cat arch/$(ARCH)/grub/menu.lst | grep -v "tmpfs" >arch/$(ARCH)/iso/boot/grub/menu.lst 66 endif 67 ifneq ($(RDFMT),fat) 68 cat arch/$(ARCH)/grub/menu.lst | grep -v "fat" >arch/$(ARCH)/iso/boot/grub/menu.lst 69 endif 55 70 cp $(KERNELDIR)/kernel.bin arch/$(ARCH)/iso/boot/ 56 71 for task in $(INIT_TASKS) ; do \ … … 60 75 cp $$task $(USPACEDIR)/dist/sbin/ ; \ 61 76 done 77 ifeq ($(RDFMT),tmpfs) 62 78 $(BASE)/tools/mktmpfs.py 4096 $(USPACEDIR)/dist/ arch/$(ARCH)/iso/boot/initrd.img 79 endif 80 ifeq ($(RDFMT),fat) 81 $(BASE)/tools/mkfat.sh $(USPACEDIR)/dist/ arch/$(ARCH)/iso/boot/initrd.img 82 endif 63 83 mkisofs -J -r -b boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 -boot-info-table -o $(BASE)/image.iso arch/$(ARCH)/iso/ 64 84
Note:
See TracChangeset
for help on using the changeset viewer.