Changeset 246 for trunk/Makefile

Timestamp:

Jul 20, 2017, 12:55:23 PM (8 years ago)

Author:

alain

Message:

Fix a major bug in FATFS : miss handling in the FAT mapper.

File:

• trunk/Makefile (modified) (6 diffs)

trunk/Makefile

@@ -222 +222 @@
 MTOOLS_SKIP_CHECK := 1
 
-# Rule to compile boot.elf, kernel.elf, and update virtual disk.
-compile: dirs                               \
-                 hard_config.h              \
-                 build/boot/boot.elf        \
-         build/kernel/kernel.elf    \
+# Rule to generate compile boot.elf, kernel.elf, init.elf and update virtual disk.
+compile: dirs                     \
+         hard_config.h            \
+                 build/boot/boot.elf      \
+         build/kernel/kernel.elf  \
+         build/user/init/init.elf \
          list
 
@@ -241 +242 @@
         @mkdir -p build/kernel/vfs
         @mkdir -p build/kernel/syscalls
+        @mkdir -p build/user
+        @mkdir -p build/user/init
+        @mkdir -p build/user/ksh
         @mkdir -p hdd
 
@@ -246 +250 @@
 list:
         mdir -/ -w -i $(DISK_IMAGE) ::/
-
-# Rule to make a file system check for the virtual disk.
-fsck:
-        fsck.msdos $(DISK_IMAGE)
 
 ##############################################################
@@ -263 +263 @@
         rm -f hard_config.h arch_info.xml arch_info.bin
         rm -rf build
+        cd user/init   &&  $(MAKE) clean  &&  cd ../..
 
 ####################################################    
 # Rule for building a new virtual disk from scratch.
-# It creates the bin / home directories.
+# It creates the bin, bin/kernel, bin/init, and home directories.
 # This requires the generic Linux/MacOS 'create_dmg' script, that should be
 # placed in the same directory as this Makefile.
@@ -276 +277 @@
         mmd                     -o -i $(DISK_IMAGE) ::/bin         || true
         mmd                     -o -i $(DISK_IMAGE) ::/bin/kernel  || true
+        mmd                     -o -i $(DISK_IMAGE) ::/bin/init    || true
         mmd                     -o -i $(DISK_IMAGE) ::/home        || true
         mdir             -/ -b -i $(DISK_IMAGE) ::/
@@ -488 +490 @@
         mcopy -o -i $(DISK_IMAGE) build/kernel/kernel.elf ::/bin/kernel
 
+############################################################
+# Rule to generate the init.elf and place it on virtual disk
+build/user/init/init.elf : user/init/init.c 
+        $(MAKE) -C user/init 
+        mcopy -o -i $(DISK_IMAGE) user/init/init.elf ::/bin/init 
+  
+