Changeset 66be0288 in mainline for boot/Makefile.common

Timestamp:

2014-01-17T17:02:59Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

476f62c, facc34d

Parents:

2e80321 (diff), 61b5b73d (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:

Mainline changes

File:

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

boot/Makefile.common

@@ -96 +96 @@
         $(USPACE_PATH)/srv/devman/devman \
         $(USPACE_PATH)/srv/fs/locfs/locfs \
-        $(USPACE_PATH)/srv/hid/compositor/compositor
+        $(USPACE_PATH)/srv/hid/compositor/compositor \
+        $(USPACE_PATH)/srv/klog/klog
 
 RD_SRVS_NON_ESSENTIAL = \
@@ -161 +162 @@
         $(USPACE_PATH)/app/bdsh/bdsh \
         $(USPACE_PATH)/app/getterm/getterm \
-        $(USPACE_PATH)/app/klog/klog \
+        $(USPACE_PATH)/app/kio/kio \
         $(USPACE_PATH)/app/vlaunch/vlaunch \
         $(USPACE_PATH)/app/vterm/vterm