Changeset 41811af in mainline for boot/Makefile.common

Timestamp:

2011-06-10T10:14:26Z (14 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

ab547063

Parents:

9536e6e (diff), 390d80d (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

File:

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

boot/Makefile.common

@@ -97 +97 @@
         $(USPACE_PATH)/srv/fs/tmpfs/tmpfs \
         $(USPACE_PATH)/srv/fs/fat/fat \
+        $(USPACE_PATH)/srv/fs/ext2fs/ext2fs \
         $(USPACE_PATH)/srv/taskmon/taskmon \
         $(USPACE_PATH)/srv/hw/netif/ne2000/ne2000 \
@@ -114 +115 @@
         rootvirt \
         test1 \
-        test2
+        test2 \
+        test3
 
 RD_DRV_CFG = 
@@ -134 +136 @@
 
 RD_APPS_NON_ESSENTIAL = \
+        $(USPACE_PATH)/app/blkdump/blkdump \
+        $(USPACE_PATH)/app/bnchmark/bnchmark \
         $(USPACE_PATH)/app/dltest/dltest \
         $(USPACE_PATH)/app/dltest2/dltest2 \
         $(USPACE_PATH)/app/dload/dload \
         $(USPACE_PATH)/app/edit/edit \
+        $(USPACE_PATH)/app/ext2info/ext2info \
         $(USPACE_PATH)/app/kill/kill \
         $(USPACE_PATH)/app/killall/killall \
         $(USPACE_PATH)/app/mkfat/mkfat \
+        $(USPACE_PATH)/app/lsusb/lsusb \
         $(USPACE_PATH)/app/sbi/sbi \
         $(USPACE_PATH)/app/redir/redir \
         $(USPACE_PATH)/app/taskdump/taskdump \
         $(USPACE_PATH)/app/tester/tester \
+        $(USPACE_PATH)/app/testread/testread \
         $(USPACE_PATH)/app/tetris/tetris \
         $(USPACE_PATH)/app/trace/trace \
@@ -152 +159 @@
         $(USPACE_PATH)/app/ping/ping \
         $(USPACE_PATH)/app/stats/stats \
+        $(USPACE_PATH)/app/sysinfo/sysinfo \
         $(USPACE_PATH)/app/top/top \
-        $(USPACE_PATH)/app/sysinfo/sysinfo \
+        $(USPACE_PATH)/app/usbinfo/usbinfo \
+        $(USPACE_PATH)/app/vuhid/vuh \
+        $(USPACE_PATH)/app/mkbd/mkbd \
         $(USPACE_PATH)/app/websrv/websrv