Changeset 5c96b2a in mainline for boot/Makefile.common

Timestamp:

2011-06-02T21:26:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ff4f073

Parents:

4a06045 (diff), 21300a2 (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 from ​http://ho.st.dcs.fmph.uniba.sk/~mato/bzr/helenos-ext2.

Changes made against the ext2 branch parent:

• removed .bzrignore
• removed all traces of pipefs

File:

• boot/Makefile.common (modified) (3 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 \
@@ -135 +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 \
@@ -146 +150 @@
         $(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 \