Changeset 33c2952 in mainline for boot/Makefile.common

Timestamp:

2012-11-07T21:00:02Z (14 years ago)

Author:

Adam Hraska <adam.hraska+hos@…>

Branches:

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

Children:

dcb0751

Parents:

fc89e32 (diff), 94795812 (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:

Merged with mainline.

File:

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

boot/Makefile.common

@@ -74 +74 @@
         $(USPACE_PATH)/srv/locsrv/locsrv \
         $(USPACE_PATH)/srv/bd/rd/rd \
-        $(USPACE_PATH)/srv/vfs/vfs
+        $(USPACE_PATH)/srv/vfs/vfs \
+        $(USPACE_PATH)/srv/logger/logger
 
 ifeq ($(RDFMT),tmpfs)
@@ -107 +108 @@
         $(USPACE_PATH)/srv/fs/cdfs/cdfs \
         $(USPACE_PATH)/srv/fs/exfat/exfat \
+        $(USPACE_PATH)/srv/fs/udf/udf \
         $(USPACE_PATH)/srv/fs/ext2fs/ext2fs \
         $(USPACE_PATH)/srv/fs/ext4fs/ext4fs \
@@ -157 +159 @@
 
 RD_APPS_NON_ESSENTIAL = \
+        $(USPACE_PATH)/app/bithenge/bithenge \
         $(USPACE_PATH)/app/blkdump/blkdump \
         $(USPACE_PATH)/app/bnchmark/bnchmark \
@@ -169 +172 @@
         $(USPACE_PATH)/app/killall/killall \
         $(USPACE_PATH)/app/loc/loc \
+        $(USPACE_PATH)/app/logset/logset \
         $(USPACE_PATH)/app/mkfat/mkfat \
         $(USPACE_PATH)/app/mkexfat/mkexfat \
         $(USPACE_PATH)/app/mkmfs/mkmfs \
-        $(USPACE_PATH)/app/lsusb/lsusb \
         $(USPACE_PATH)/app/sbi/sbi \
         $(USPACE_PATH)/app/sportdmp/sportdmp \
@@ -195 +198 @@
         $(USPACE_PATH)/app/mkbd/mkbd \
         $(USPACE_PATH)/app/websrv/websrv \
+        $(USPACE_PATH)/app/date/date \
         $(USPACE_PATH)/app/vdemo/vdemo