Changes in boot/Makefile.common [c0e53ff:5f88293] in mainline

File:

• boot/Makefile.common (modified) (8 diffs)

boot/Makefile.common

@@ -56 +56 @@
 MKTMPFS = $(TOOLS_PATH)/mktmpfs.py
 MKFAT = $(TOOLS_PATH)/mkfat.py
-MKEXT2 = $(TOOLS_PATH)/mkext2.py
 MKUIMAGE = $(TOOLS_PATH)/mkuimage.py
 
@@ -73 +72 @@
         $(USPACE_PATH)/srv/loader/loader \
         $(USPACE_PATH)/app/init/init \
-        $(USPACE_PATH)/srv/loc/loc \
+        $(USPACE_PATH)/srv/devmap/devmap \
         $(USPACE_PATH)/srv/bd/rd/rd \
         $(USPACE_PATH)/srv/vfs/vfs
@@ -83 +82 @@
 ifeq ($(RDFMT),fat)
         INIT_TASKS += $(USPACE_PATH)/srv/fs/fat/fat
-endif
-
-ifeq ($(RDFMT),ext2fs)
-        INIT_TASKS += $(USPACE_PATH)/srv/fs/ext2fs/ext2fs
 endif
 
@@ -93 +88 @@
         $(USPACE_PATH)/srv/hid/input/input \
         $(USPACE_PATH)/srv/hid/console/console \
-        $(USPACE_PATH)/srv/fs/locfs/locfs
+        $(USPACE_PATH)/srv/fs/devfs/devfs
 
 RD_SRVS_NON_ESSENTIAL = \
@@ -102 +97 @@
         $(USPACE_PATH)/srv/fs/tmpfs/tmpfs \
         $(USPACE_PATH)/srv/fs/fat/fat \
-        $(USPACE_PATH)/srv/fs/mfs/mfs \
-        $(USPACE_PATH)/srv/fs/cdfs/cdfs \
-        $(USPACE_PATH)/srv/fs/exfat/exfat \
         $(USPACE_PATH)/srv/fs/ext2fs/ext2fs \
         $(USPACE_PATH)/srv/taskmon/taskmon \
@@ -118 +110 @@
         $(USPACE_PATH)/srv/net/net/net \
         $(USPACE_PATH)/srv/devman/devman
-
+        
 RD_DRVS = \
-        infrastructure/root \
-        infrastructure/rootvirt \
-        test/test1 \
-        test/test2 \
-        test/test3
-
-RD_DRV_CFG =
+        root \
+        rootvirt \
+        test1 \
+        test2 \
+        test3
+
+RD_DRV_CFG = 
 
 RD_LIBS =
@@ -146 +138 @@
         $(USPACE_PATH)/app/blkdump/blkdump \
         $(USPACE_PATH)/app/bnchmark/bnchmark \
-        $(USPACE_PATH)/app/devctl/devctl \
         $(USPACE_PATH)/app/dltest/dltest \
         $(USPACE_PATH)/app/dltest2/dltest2 \
@@ -154 +145 @@
         $(USPACE_PATH)/app/kill/kill \
         $(USPACE_PATH)/app/killall/killall \
-        $(USPACE_PATH)/app/locinfo/locinfo \
         $(USPACE_PATH)/app/mkfat/mkfat \
-        $(USPACE_PATH)/app/mkmfs/mkmfs \
         $(USPACE_PATH)/app/lsusb/lsusb \
         $(USPACE_PATH)/app/sbi/sbi \
-        $(USPACE_PATH)/app/sportdmp/sportdmp \
         $(USPACE_PATH)/app/redir/redir \
         $(USPACE_PATH)/app/taskdump/taskdump \