Changeset c8d7cd0 in mainline


Ignore:
Timestamp:
2006-05-08T11:13:56Z (19 years ago)
Author:
Jakub Vana <jakub.vana@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
2b89416
Parents:
a9d5a77
Message:

Move grub.conf outside the image

Location:
arch
Files:
2 added
4 edited

Legend:

Unmodified
Added
Removed

  • arch/amd64/Makefile.inc

    ra9d5a77 rc8d7cd0  
    3131image.boot: kernel uspace
    3232        gunzip -c arch/$(ARCH)/grub/grub.img.gz > image.boot
     33        e2cp arch/$(ARCH)/grub/grub.conf image.boot:/boot/grub/grub.conf
    3334        e2cp $(KERNELDIR)/kernel.bin image.boot:/boot/kernel.bin
    3435        e2cp $(USPACEDIR)/init/init image.boot:/init
    35         e2cp $(USPACEDIR)/ns/ns image.boot:/ns
    36         e2cp $(USPACEDIR)/pci/pci image.boot:/pci
     36        e2cp $(USPACEDIR)/ns/ns image.boot:/ns
     37        e2cp $(USPACEDIR)/pci/pci image.boot:/pci
     38        e2cp $(USPACEDIR)/fb/fb image.boot:/fb
    3739
    3840clean: clean_kernel clean_uspace

  • arch/ia32/Makefile.inc

    ra9d5a77 rc8d7cd0  
    3131image.boot: kernel uspace
    3232        gunzip -c arch/$(ARCH)/grub/grub.img.gz > image.boot
     33        e2cp arch/$(ARCH)/grub/grub.conf image.boot:/boot/grub/grub.conf
    3334        e2cp $(KERNELDIR)/kernel.bin image.boot:/boot/kernel.bin
    3435        e2cp $(USPACEDIR)/init/init image.boot:/init
    3536        e2cp $(USPACEDIR)/ns/ns image.boot:/ns
    3637        e2cp $(USPACEDIR)/pci/pci image.boot:/pci
     38        e2cp $(USPACEDIR)/fb/fb image.boot:/fb
    3739
    3840clean: clean_kernel clean_uspace
Note: See TracChangeset for help on using the changeset viewer.