Changeset 77a194c in mainline for boot/Makefile.common

Timestamp:

2015-11-04T18:55:46Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

44183b98

Parents:

5265eea4 (diff), bfcde8d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge new disk partitioning architecture.

File:

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

boot/Makefile.common

@@ -101 +101 @@
 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 \
@@ -124 +123 @@
         $(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/volsrv/volsrv
 
 RD_DRVS_ESSENTIAL = \
@@ -182 +182 @@
         $(USPACE_PATH)/app/download/download \
         $(USPACE_PATH)/app/edit/edit \
-        $(USPACE_PATH)/app/hdisk/hdisk \
+        $(USPACE_PATH)/app/fdisk/fdisk \
         $(USPACE_PATH)/app/inet/inet \
         $(USPACE_PATH)/app/kill/kill \