Changeset 77a194c in mainline for uspace/Makefile

Timestamp:

2015-11-04T18:55:46Z (9 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:

• uspace/Makefile (modified) (6 diffs)

uspace/Makefile

@@ -45 +45 @@
         app/download \
         app/edit \
+        app/fdisk \
         app/fontviewer \
         app/getterm \
-        app/hdisk \
         app/init \
         app/inet \
@@ -112 +112 @@
         srv/bd/file_bd \
         srv/bd/rd \
-        srv/bd/part/guid_part \
-        srv/bd/part/mbr_part \
+        srv/bd/vbd \
         srv/fs/exfat \
         srv/fs/udf \
@@ -122 +121 @@
         srv/fs/locfs \
         srv/fs/ext4fs \
+        srv/volsrv \
         srv/hid/compositor \
         srv/hid/console \
@@ -217 +217 @@
         lib/crypto \
         lib/clui \
+        lib/fdisk \
         lib/fmtutil \
         lib/scsi \
@@ -229 +230 @@
         lib/softrend \
         lib/draw \
+        lib/label \
         lib/math \
         lib/nettl \
@@ -245 +247 @@
         lib/bithenge \
         lib/posix \
-        lib/mbr \
-        lib/gpt \
         lib/ieee80211