Changes in boot/Makefile.common [3e67ab1:66a4a640] in mainline

File:

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

boot/Makefile.common

@@ -53 +53 @@
 SANDBOX = pack
 PACK = $(TOOLS_PATH)/pack.py
+MKHORD = $(TOOLS_PATH)/mkhord.py
 MKTMPFS = $(TOOLS_PATH)/mktmpfs.py
 MKFAT = $(TOOLS_PATH)/mkfat.py
@@ -72 +73 @@
         $(USPACE_PATH)/srv/loader/loader \
         $(USPACE_PATH)/app/init/init \
-        $(USPACE_PATH)/srv/locsrv/locsrv \
+        $(USPACE_PATH)/srv/loc/loc \
         $(USPACE_PATH)/srv/bd/rd/rd \
         $(USPACE_PATH)/srv/vfs/vfs
@@ -98 +99 @@
         $(USPACE_PATH)/srv/bd/part/guid_part/g_part \
         $(USPACE_PATH)/srv/bd/part/mbr_part/mbr_part \
-        $(USPACE_PATH)/srv/clipboard/clipboard \
+        $(USPACE_PATH)/srv/clip/clip \
         $(USPACE_PATH)/srv/fs/tmpfs/tmpfs \
         $(USPACE_PATH)/srv/fs/fat/fat \
@@ -105 +106 @@
         $(USPACE_PATH)/srv/fs/exfat/exfat \
         $(USPACE_PATH)/srv/fs/ext2fs/ext2fs \
-        $(USPACE_PATH)/srv/hid/remcons/remcons \
-        $(USPACE_PATH)/srv/net/ethip/ethip \
-        $(USPACE_PATH)/srv/net/inetsrv/inetsrv \
-        $(USPACE_PATH)/srv/net/loopip/loopip \
-        $(USPACE_PATH)/srv/net/tcp/tcp \
-        $(USPACE_PATH)/srv/net/udp/udp \
         $(USPACE_PATH)/srv/taskmon/taskmon \
+        $(USPACE_PATH)/srv/net/nil/eth/eth \
+        $(USPACE_PATH)/srv/net/nil/nildummy/nildummy \
+        $(USPACE_PATH)/srv/net/il/arp/arp \
+        $(USPACE_PATH)/srv/net/il/ip/ip \
+        $(USPACE_PATH)/srv/net/tl/icmp/icmp \
+        $(USPACE_PATH)/srv/net/tl/udp/udp \
+        $(USPACE_PATH)/srv/net/tl/tcp/tcp \
+        $(USPACE_PATH)/srv/net/net/net \
         $(USPACE_PATH)/srv/devman/devman
 
@@ -120 +123 @@
         test/test2 \
         test/test3 \
-        nic/ne2k \
-        nic/e1k \
-        nic/rtl8139
+        nic/lo \
+        nic/ne2k
 
 RD_DRV_CFG =
@@ -155 +157 @@
         $(USPACE_PATH)/app/dltest2/dltest2 \
         $(USPACE_PATH)/app/dload/dload \
+        $(USPACE_PATH)/app/dplay/dplay \
         $(USPACE_PATH)/app/edit/edit \
         $(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/locinfo/locinfo \
+        $(USPACE_PATH)/app/mixerctl/mixerctl \
         $(USPACE_PATH)/app/mkfat/mkfat \
-        $(USPACE_PATH)/app/mkexfat/mkexfat \
         $(USPACE_PATH)/app/mkmfs/mkmfs \
         $(USPACE_PATH)/app/lsusb/lsusb \
@@ -175 +177 @@
         $(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/stats/stats \
@@ -201 +201 @@
 endif
 
+ifneq ($(CONFIG_BAREBONE),y)
+NET_CFG = \
+        $(USPACE_PATH)/srv/net/cfg/general \
+        $(USPACE_PATH)/srv/net/cfg/lo.nic \
+        $(USPACE_PATH)/srv/net/cfg/ne2k.nic
+endif
+
 COMPONENTS = \
         $(KERNEL_PATH)/kernel.bin \