Changeset d5a89a3 in mainline for uspace/Makefile

Timestamp:

2019-02-11T22:31:04Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

aaf9789c

Parents:

e3272101 (diff), 4805495 (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:

merging with upstream/master

File:

• uspace/Makefile (modified) (4 diffs)

uspace/Makefile

@@ -38 +38 @@
         app/bithenge \
         app/blkdump \
-        app/bnchmark \
         app/contacts \
         app/corecfg \
@@ -51 +50 @@
         app/getterm \
         app/gunzip \
+        app/hbench \
         app/init \
         app/inet \
@@ -68 +68 @@
         app/nterm \
         app/pci \
-        app/perf \
         app/redir \
         app/sbi \
@@ -153 +152 @@
         drv/block/ddisk \
         drv/block/usbmast \
+        drv/block/virtio-blk \
         drv/bus/adb/cuda_adb \
         drv/bus/isa \