Changeset 856b5e70 in mainline


Ignore:
Timestamp:
2005-12-18T13:27:20Z (19 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
224dad8
Parents:
7e00430
Message:

Fix paths in ia32 Makefile.
Add userspace binary to ia32 boot image.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • arch/ia32/Makefile

    r7e00430 r856b5e70  
    44BASE=$(shell cd ../../..; pwd)
    55KERNELDIR=$(BASE)/kernel
     6USPACEDIR=$(BASE)/uspace
    67
    7 build: $(KERNELDIR)/kernel.bin
     8build: $(KERNELDIR)/kernel.bin $(USPACEDIR)/init/init
    89        gunzip -c grub/grub.img.gz > image.bin
    9         e2cp $(KERNELDIR)/kernel.bin image.bin:/kernel/kernel.bin
     10        e2cp $(KERNELDIR)/kernel.bin image.bin:/boot/kernel.bin
     11        e2cp $(USPACEDIR)/init/init image.bin:/init
    1012        e2cp grub/README grub/COPYING image.bin:/boot
    1113
    … …  
    1315        $(MAKE) -C $(KERNELDIR)
    1416
     17$(USPACEDIR)/init/init:
     18        $(MAKE) -C $(USPACEDIR)
     19
    1520clean:
    1621        -rm image.bin
Note: See TracChangeset for help on using the changeset viewer.