Changes in boot/Makefile.common [6d5e378:f66ca57f] in mainline

File:

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

boot/Makefile.common

@@ -55 +55 @@
 MKTMPFS = $(TOOLS_PATH)/mktmpfs.py
 MKFAT = $(TOOLS_PATH)/mkfat.py
-MKEXT4 = $(TOOLS_PATH)/mkext4.py
+MKEXT2 = $(TOOLS_PATH)/mkext2.py
 MKUIMAGE = $(TOOLS_PATH)/mkuimage.py
 
@@ -84 +84 @@
 endif
 
-ifeq ($(RDFMT),ext4fs)
-        INIT_TASKS += $(USPACE_PATH)/srv/fs/ext4fs/ext4fs
+ifeq ($(RDFMT),ext2fs)
+        INIT_TASKS += $(USPACE_PATH)/srv/fs/ext2fs/ext2fs
 endif
 
 RD_SRVS_ESSENTIAL = \
+        $(USPACE_PATH)/srv/hid/fb/fb \
         $(USPACE_PATH)/srv/hid/input/input \
-        $(USPACE_PATH)/srv/hid/output/output \
         $(USPACE_PATH)/srv/hid/console/console \
-        $(USPACE_PATH)/srv/devman/devman \
-        $(USPACE_PATH)/srv/fs/locfs/locfs \
-        $(USPACE_PATH)/srv/hid/compositor/compositor
+        $(USPACE_PATH)/srv/fs/locfs/locfs
 
 RD_SRVS_NON_ESSENTIAL = \
@@ -108 +106 @@
         $(USPACE_PATH)/srv/fs/exfat/exfat \
         $(USPACE_PATH)/srv/fs/ext2fs/ext2fs \
-        $(USPACE_PATH)/srv/fs/ext4fs/ext4fs \
         $(USPACE_PATH)/srv/hid/remcons/remcons \
         $(USPACE_PATH)/srv/hid/isdv4_tablet/isdv4_tablet \
@@ -116 +113 @@
         $(USPACE_PATH)/srv/net/tcp/tcp \
         $(USPACE_PATH)/srv/net/udp/udp \
-        $(USPACE_PATH)/srv/taskmon/taskmon
+        $(USPACE_PATH)/srv/taskmon/taskmon \
+        $(USPACE_PATH)/srv/devman/devman
 
 RD_DRVS = \
         infrastructure/root \
         infrastructure/rootvirt \
-        fb/kfb \
         test/test1 \
         test/test2 \
@@ -177 +174 @@
         $(USPACE_PATH)/app/tester/tester \
         $(USPACE_PATH)/app/testread/testread \
-        $(USPACE_PATH)/app/testwrit/testwrit \
         $(USPACE_PATH)/app/tetris/tetris \
         $(USPACE_PATH)/app/trace/trace \
@@ -192 +188 @@
         $(USPACE_PATH)/app/vuhid/vuh \
         $(USPACE_PATH)/app/mkbd/mkbd \
-        $(USPACE_PATH)/app/websrv/websrv \
-        $(USPACE_PATH)/app/vdemo/vdemo \
-        $(USPACE_PATH)/app/vlaunch/vlaunch \
-        $(USPACE_PATH)/app/vterm/vterm
+        $(USPACE_PATH)/app/websrv/websrv
 
 ifeq ($(CONFIG_PCC),y)