Changes in boot/Makefile.common [a047aaa:619e6d56] 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 = \
@@ -111 +109 @@
         $(USPACE_PATH)/srv/fs/exfat/exfat \
         $(USPACE_PATH)/srv/fs/udf/udf \
+        $(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 \
-        $(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
 
-RD_DRVS_ESSENTIAL = \
-        root/root \
-        root/virt \
-        fb/kfb 
-
-RD_DRVS_NON_ESSENTIAL = \
+RD_DRVS = \
+        infrastructure/root \
+        infrastructure/rootvirt \
+        fb/kfb \
         test/test1 \
         test/test2 \
@@ -138 +130 @@
         nic/e1k \
         nic/rtl8139 \
-        nic/rtl8169 \
         block/ahci
 
@@ -163 +154 @@
         $(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/hdisk/hdisk \
+        $(USPACE_PATH)/app/ext2info/ext2info \
         $(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/sbi/sbi \
         $(USPACE_PATH)/app/sportdmp/sportdmp \
@@ -206 +188 @@
         $(USPACE_PATH)/app/nettest3/nettest3 \
         $(USPACE_PATH)/app/netecho/netecho \
-        $(USPACE_PATH)/app/netspeed/netspeed \
         $(USPACE_PATH)/app/nterm/nterm \
         $(USPACE_PATH)/app/ping/ping \
@@ -212 +193 @@
         $(USPACE_PATH)/app/sysinfo/sysinfo \
         $(USPACE_PATH)/app/top/top \
-        $(USPACE_PATH)/app/untar/untar \
         $(USPACE_PATH)/app/usbinfo/usbinfo \
         $(USPACE_PATH)/app/vuhid/vuh \
@@ -218 +198 @@
         $(USPACE_PATH)/app/websrv/websrv \
         $(USPACE_PATH)/app/date/date \
-        $(USPACE_PATH)/app/vdemo/vdemo \
-        $(USPACE_PATH)/app/viewer/viewer \
-        $(USPACE_PATH)/app/df/df \
-        $(USPACE_PATH)/app/fontviewer/fontviewer
-
-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 = \
@@ -244 +233 @@
 RD_SRVS = $(RD_SRVS_ESSENTIAL)
 RD_APPS = $(RD_APPS_ESSENTIAL)
-RD_DRVS = $(RD_DRVS_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)
 endif