Changeset 903bac0a in mainline for boot/Makefile.common

Timestamp:

2011-08-19T09:00:38Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e2ab36f1

Parents:

d894fbd (diff), 42a619b (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 mainline changes.

File:

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

boot/Makefile.common

@@ -73 +73 @@
         $(USPACE_PATH)/srv/loader/loader \
         $(USPACE_PATH)/app/init/init \
-        $(USPACE_PATH)/srv/devmap/devmap \
+        $(USPACE_PATH)/srv/loc/loc \
         $(USPACE_PATH)/srv/bd/rd/rd \
         $(USPACE_PATH)/srv/vfs/vfs
@@ -93 +93 @@
         $(USPACE_PATH)/srv/hid/input/input \
         $(USPACE_PATH)/srv/hid/console/console \
-        $(USPACE_PATH)/srv/fs/devfs/devfs
+        $(USPACE_PATH)/srv/fs/locfs/locfs
 
 RD_SRVS_NON_ESSENTIAL = \
@@ -150 +150 @@
         $(USPACE_PATH)/app/kill/kill \
         $(USPACE_PATH)/app/killall/killall \
+        $(USPACE_PATH)/app/locinfo/locinfo \
         $(USPACE_PATH)/app/mkfat/mkfat \
         $(USPACE_PATH)/app/lsusb/lsusb \