Changes in boot/Makefile.common [bdfdc51c:1d24ad3] in mainline

File:

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

boot/Makefile.common

@@ -48 +48 @@
 USPACE_PATH = $(ROOT_PATH)/uspace
 DIST_PATH = $(USPACE_PATH)/dist
-DIST_OVERLAY_PATH = $(USPACE_PATH)/overlay
 TOOLS_PATH = $(ROOT_PATH)/tools
 DRVS_PATH = drv
@@ -96 +95 @@
         $(USPACE_PATH)/srv/devman/devman \
         $(USPACE_PATH)/srv/fs/locfs/locfs \
-        $(USPACE_PATH)/srv/hid/compositor/compositor \
-        $(USPACE_PATH)/srv/klog/klog
+        $(USPACE_PATH)/srv/hid/compositor/compositor
 
 RD_SRVS_NON_ESSENTIAL = \
         $(USPACE_PATH)/srv/bd/file_bd/file_bd \
+        $(USPACE_PATH)/srv/bd/part/guid_part/g_part \
+        $(USPACE_PATH)/srv/bd/part/mbr_part/mbr_part \
         $(USPACE_PATH)/srv/bd/sata_bd/sata_bd \
-        $(USPACE_PATH)/srv/bd/vbd/vbd \
         $(USPACE_PATH)/srv/clipboard/clipboard \
         $(USPACE_PATH)/srv/fs/tmpfs/tmpfs \
@@ -113 +112 @@
         $(USPACE_PATH)/srv/hid/remcons/remcons \
         $(USPACE_PATH)/srv/hid/isdv4_tablet/isdv4_tablet \
-        $(USPACE_PATH)/srv/hid/rfb/rfb \
-        $(USPACE_PATH)/srv/net/dhcp/dhcp \
         $(USPACE_PATH)/srv/net/dnsrsrv/dnsrsrv \
         $(USPACE_PATH)/srv/net/ethip/ethip \
         $(USPACE_PATH)/srv/net/inetsrv/inetsrv \
         $(USPACE_PATH)/srv/net/loopip/loopip \
-        $(USPACE_PATH)/srv/net/nconfsrv/nconfsrv \
         $(USPACE_PATH)/srv/net/slip/slip \
         $(USPACE_PATH)/srv/net/tcp/tcp \
         $(USPACE_PATH)/srv/net/udp/udp \
-        $(USPACE_PATH)/srv/taskmon/taskmon \
-        $(USPACE_PATH)/srv/volsrv/volsrv
-
-RD_DRVS_ESSENTIAL = \
-        root/root \
-        root/virt \
-        fb/kfb 
-
-RD_DRVS_NON_ESSENTIAL = \
+        $(USPACE_PATH)/srv/taskmon/taskmon
+
+RD_DRVS = \
+        infrastructure/root \
+        infrastructure/rootvirt \
+        fb/kfb \
         test/test1 \
         test/test2 \
@@ -138 +131 @@
         nic/e1k \
         nic/rtl8139 \
-        nic/rtl8169 \
-        nic/ar9271 \
         block/ahci
 
 RD_DRV_CFG =
-
-RD_DRVS_FW_NON_ESSENTIAL = \
-        nic/ar9271
 
 RD_LIBS =
@@ -158 +146 @@
 ifeq ($(CONFIG_BUILD_SHARED_LIBS), y)
         RD_LIBS += \
-                $(USPACE_PATH)/lib/c/libc.so.0 \
-                $(USPACE_PATH)/lib/softint/libsoftint.so.0 \
-                $(USPACE_PATH)/lib/math/libmath.so.0 \
-                $(USPACE_PATH)/lib/dltest/libdltest.so.0
+                $(USPACE_PATH)/lib/c/libc.so0 \
+                $(USPACE_PATH)/lib/softint/libsofti.so0
+        RD_APPS += \
+                $(USPACE_PATH)/app/dltest/dltest
 endif
 
@@ -167 +155 @@
         $(USPACE_PATH)/app/bdsh/bdsh \
         $(USPACE_PATH)/app/getterm/getterm \
-        $(USPACE_PATH)/app/kio/kio \
+        $(USPACE_PATH)/app/klog/klog \
         $(USPACE_PATH)/app/vlaunch/vlaunch \
         $(USPACE_PATH)/app/vterm/vterm
 
 RD_APPS_NON_ESSENTIAL = \
-        $(USPACE_PATH)/app/barber/barber \
         $(USPACE_PATH)/app/bithenge/bithenge \
         $(USPACE_PATH)/app/blkdump/blkdump \
         $(USPACE_PATH)/app/bnchmark/bnchmark \
-        $(USPACE_PATH)/app/corecfg/corecfg \
         $(USPACE_PATH)/app/devctl/devctl \
+        $(USPACE_PATH)/app/dltest/dltest \
+        $(USPACE_PATH)/app/dltest2/dltest2 \
+        $(USPACE_PATH)/app/dload/dload \
         $(USPACE_PATH)/app/dnscfg/dnscfg \
         $(USPACE_PATH)/app/dnsres/dnsres \
-        $(USPACE_PATH)/app/download/download \
         $(USPACE_PATH)/app/edit/edit \
-        $(USPACE_PATH)/app/fdisk/fdisk \
         $(USPACE_PATH)/app/inet/inet \
         $(USPACE_PATH)/app/kill/kill \
         $(USPACE_PATH)/app/killall/killall \
         $(USPACE_PATH)/app/loc/loc \
-        $(USPACE_PATH)/app/mixerctl/mixerctl \
-        $(USPACE_PATH)/app/modplay/modplay \
         $(USPACE_PATH)/app/logset/logset \
         $(USPACE_PATH)/app/mkfat/mkfat \
         $(USPACE_PATH)/app/mkexfat/mkexfat \
         $(USPACE_PATH)/app/mkmfs/mkmfs \
-        $(USPACE_PATH)/app/nic/nic \
-        $(USPACE_PATH)/app/rcutest/rcutest \
-        $(USPACE_PATH)/app/rcubench/rcubench \
         $(USPACE_PATH)/app/sbi/sbi \
         $(USPACE_PATH)/app/sportdmp/sportdmp \
@@ -205 +187 @@
         $(USPACE_PATH)/app/tetris/tetris \
         $(USPACE_PATH)/app/trace/trace \
+        $(USPACE_PATH)/app/nettest1/nettest1 \
+        $(USPACE_PATH)/app/nettest2/nettest2 \
+        $(USPACE_PATH)/app/nettest3/nettest3 \
         $(USPACE_PATH)/app/netecho/netecho \
         $(USPACE_PATH)/app/nterm/nterm \
         $(USPACE_PATH)/app/ping/ping \
+        $(USPACE_PATH)/app/ping6/ping6 \
         $(USPACE_PATH)/app/stats/stats \
         $(USPACE_PATH)/app/sysinfo/sysinfo \
-        $(USPACE_PATH)/app/sysinst/sysinst \
         $(USPACE_PATH)/app/top/top \
-        $(USPACE_PATH)/app/untar/untar \
         $(USPACE_PATH)/app/usbinfo/usbinfo \
         $(USPACE_PATH)/app/vuhid/vuh \
@@ -218 +202 @@
         $(USPACE_PATH)/app/websrv/websrv \
         $(USPACE_PATH)/app/date/date \
-        $(USPACE_PATH)/app/vcalc/vcalc \
-        $(USPACE_PATH)/app/vdemo/vdemo \
-        $(USPACE_PATH)/app/viewer/viewer \
-        $(USPACE_PATH)/app/df/df \
-        $(USPACE_PATH)/app/fontviewer/fontviewer \
-        $(USPACE_PATH)/app/wifi_supplicant/wifi_supplicant
-
-ifeq ($(CONFIG_BUILD_SHARED_LIBS), y)
-        RD_APPS_NON_ESSENTIAL += \
-                $(USPACE_PATH)/app/dltest/dltest \
-                $(USPACE_PATH)/app/dltests/dltests
-endif
-
-RD_TESTS = \
-        $(USPACE_PATH)/lib/c/test-libc \
-        $(USPACE_PATH)/lib/posix/test-libposix \
-        $(USPACE_PATH)/lib/uri/test-liburi \
-        $(USPACE_PATH)/app/bdsh/test-bdsh
-
+        $(USPACE_PATH)/app/vdemo/vdemo
+
+ifeq ($(CONFIG_PCC),y)
+RD_APPS_NON_ESSENTIAL += \
+        $(USPACE_PATH)/app/cc/cc \
+        $(USPACE_PATH)/app/ccom/ccom \
+        $(USPACE_PATH)/app/ccom/mkext/cc_mkext \
+        $(USPACE_PATH)/app/cpp/cpp
+endif
+
+ifeq ($(CONFIG_BINUTILS),y)
+RD_APPS_NON_ESSENTIAL += \
+        $(USPACE_PATH)/app/binutils/bin/as \
+        $(USPACE_PATH)/app/binutils/bin/ld
+endif
+
+ifeq ($(CONFIG_MSIM),y)
+RD_APPS_NON_ESSENTIAL += \
+        $(USPACE_PATH)/app/msim/msim
+endif
 
 COMPONENTS = \
@@ -252 +237 @@
 RD_SRVS = $(RD_SRVS_ESSENTIAL)
 RD_APPS = $(RD_APPS_ESSENTIAL)
-RD_DRVS = $(RD_DRVS_ESSENTIAL)
-RD_DRVS_FW = $(RD_DRVS_FW_ESSENTIAL)
 else
 RD_SRVS = $(RD_SRVS_ESSENTIAL) $(RD_SRVS_NON_ESSENTIAL)
 RD_APPS = $(RD_APPS_ESSENTIAL) $(RD_APPS_NON_ESSENTIAL)
-RD_DRVS = $(RD_DRVS_ESSENTIAL) $(RD_DRVS_NON_ESSENTIAL)
-RD_DRVS_FW = $(RD_DRVS_FW_ESSENTIAL) $(RD_DRVS_FW_NON_ESSENTIAL)
 endif