Subversion Repositories HelenOS-historic

Compare Revisions

No changes between revisions

Ignore whitespace Rev 1456 → Rev 1455

/boot/trunk/arch/amd64/grub/stage2_eltorito
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property
/boot/trunk/arch/amd64/grub/menu.lst
File deleted
/boot/trunk/arch/amd64/grub/grub.conf
0,0 → 1,16
default 0
timeout 10
 
title=HelenOS
root (fd0)
kernel /boot/kernel.bin
 
title=HelenOS (w/ uspace)
root (fd0)
kernel /boot/kernel.bin
module /ns
module /init
module /pci
module /fb
module /kbd
module /console
/boot/trunk/arch/amd64/grub/grub.img.gz
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property
/boot/trunk/arch/amd64/Makefile.inc
26,23 → 26,20
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
 
build: image.iso
build: image.boot
 
image.iso: kernel uspace
mkdir -p arch/$(ARCH)/iso/boot/grub
cp arch/$(ARCH)/grub/stage2_eltorito arch/$(ARCH)/iso/boot/grub/
cp arch/$(ARCH)/grub/menu.lst arch/$(ARCH)/iso/boot/grub/
cp $(KERNELDIR)/kernel.bin arch/$(ARCH)/iso/boot/
cp $(USPACEDIR)/init/init arch/$(ARCH)/iso/boot/
cp $(USPACEDIR)/ns/ns arch/$(ARCH)/iso/boot/
cp $(USPACEDIR)/pci/pci arch/$(ARCH)/iso/boot/
cp $(USPACEDIR)/fb/fb arch/$(ARCH)/iso/boot/
cp $(USPACEDIR)/kbd/kbd arch/$(ARCH)/iso/boot/
cp $(USPACEDIR)/console/console arch/$(ARCH)/iso/boot/
mkisofs -J -r -b boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 -boot-info-table -o image.iso arch/$(ARCH)/iso/
image.boot: kernel uspace
gunzip -c arch/$(ARCH)/grub/grub.img.gz > image.boot
e2cp arch/$(ARCH)/grub/grub.conf image.boot:/boot/grub/grub.conf
e2cp $(KERNELDIR)/kernel.bin image.boot:/boot/kernel.bin
e2cp $(USPACEDIR)/init/init image.boot:/init
e2cp $(USPACEDIR)/ns/ns image.boot:/ns
e2cp $(USPACEDIR)/pci/pci image.boot:/pci
e2cp $(USPACEDIR)/fb/fb image.boot:/fb
e2cp $(USPACEDIR)/kbd/kbd image.boot:/kbd
e2cp $(USPACEDIR)/console/console image.boot:/console
 
clean: clean_kernel clean_uspace
-rm -fr arch/$(ARCH)/iso
-rm -f image.iso
-rm -f image.boot
 
arch_distclean: distclean_kernel distclean_uspace