[SCM] applications.git branch, master, updated. 9f5d0a991492763d9867b11592a8390709e3431a

[root (none)]

The following commit has been merged in the master branch:
commit 0a0bca3af8509b9611d87b490f36c8370a9cac2f
Author: root <root at elixir-desktop.(none)>
Date:   Mon Nov 29 01:10:32 2010 +0100

    Improve Makefile

diff --git a/isaacos/Makefile b/isaacos/Makefile
index 567ca1a..ab58abd 100644
--- a/isaacos/Makefile
+++ b/isaacos/Makefile
@@ -2,7 +2,9 @@ TARGET = x86
 OBJ=kernel
 CC=gcc -Wall fno-stack-protector
 
-kernel : boot.o startup.o updateimage
+kernel: boot.o startup.o link updateimage
+  
+link: 
 	ld -Ttext=100000 --entry=_start  boot.o startup.o
 
 boot.o: 
@@ -14,7 +16,8 @@ boot.o:
 
 
 startup.o:
-	lisaacos startup.li -partial -target $(TARGET)
+	lisaac startup.li  -partial  -target $(TARGET)
+	gcc startup.c -o startup.o -c
 
 
 
@@ -22,7 +25,7 @@ image:
 	sh mkimage.sh
 
 updateimage:
-	mount /dev/loop2 ./HdIsaac
+	mount /dev/loop3 ./HdIsaac
 	cp startup ./HdIsaac/IsaacKernel
 
 
@@ -56,5 +59,4 @@ debug: startup.c
 clean:
 	rm -rf *~
 	rm -f  *.o
-	rm startup.sys
 	rm startup.c
diff --git a/isaacos/boot.asm b/isaacos/boot.asm
index 588cf1e..4e25666 100644
--- a/isaacos/boot.asm
+++ b/isaacos/boot.asm
@@ -1,5 +1,5 @@
 global _start, start
-extern kmain
+extern main
     
 %define MULTIBOOT_HEADER_MAGIC  0x1BADB002
 %define MULTIBOOT_HEADER_FLAGS	0x00000003
@@ -21,7 +21,7 @@ dd CHECKSUM
 
 start:
 	push ebx
-	call kmain
+	call main
 
 	cli ; stop interrupts
 	hlt ; halt the CPU
diff --git a/isaacos/mkimage.sh b/isaacos/mkimage.sh
index 3009973..b84978f 100644
--- a/isaacos/mkimage.sh
+++ b/isaacos/mkimage.sh
@@ -1,10 +1,23 @@
 #!/bin/sh
+echo Creating HDD image
 dd if=/dev/zero of=HddIsaac.img bs=512 count=16065
-losetup /dev/loop1 HddIsaac.img
-fdisk /dev/loop1
-losetup -o 32256 /dev/loop2 /dev/loop1
-mkfs /dev/loop2
-mount /dev/loop2 HdIsaac/
+echo Attaching to /dev/loop2
+losetup /dev/loop2 HddIsaac.img
+echo Formating...
+fdisk /dev/loop2 << EOF
+n
+p
+1
+1
+w
+EOF
+losetup -d /dev/loop2
+losetup /dev/loop2 HddIsaac.img
+losetup -o 32256 /dev/loop3 /dev/loop2
+mkfs /dev/loop3
+echo Mounting....
+mount /dev/loop3 HdIsaac/
+echo Installing boot
 mkdir -p ./HdIsaac/boot/grub
 cp -rv /boot/grub/stage* ./HdIsaac/boot/grub
 cat > ./HdIsaac/boot/grub/menu.lst << EOF
@@ -15,11 +28,11 @@ title=IsaacOS
 root (hd0,0)
 kernel /IsaacKernel
 EOF
+echo syncing and unmounting
+umount ./HdIsaac
+sync
 grub --device-map=/dev/null  << EOF
 device (hd0) HdIsaac.img 
 root (hd0,0)
 setup (hd0)
 EOF
-cp startup ./image/IsaacKernel
-sync
-umount ./image

-- 
applications.git