Changeset 038b289 in mainline for boot/Makefile.common

Timestamp:

2011-09-06T23:34:35Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

888207c9, c05642d, c0e53ff

Parents:

7e9fce6 (diff), fb7e5a9a (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 MFS improvements from lp:mfs.

File:

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

boot/Makefile.common

@@ -102 +102 @@
         $(USPACE_PATH)/srv/fs/tmpfs/tmpfs \
         $(USPACE_PATH)/srv/fs/fat/fat \
+        $(USPACE_PATH)/srv/fs/mfs/mfs \
         $(USPACE_PATH)/srv/fs/cdfs/cdfs \
-        $(USPACE_PATH)/srv/fs/minixfs/mfs \
         $(USPACE_PATH)/srv/fs/exfat/exfat \
         $(USPACE_PATH)/srv/fs/ext2fs/ext2fs \
@@ -156 +156 @@
         $(USPACE_PATH)/app/locinfo/locinfo \
         $(USPACE_PATH)/app/mkfat/mkfat \
-        $(USPACE_PATH)/app/mkminix/mkminix \
+        $(USPACE_PATH)/app/mkmfs/mkmfs \
         $(USPACE_PATH)/app/lsusb/lsusb \
         $(USPACE_PATH)/app/sbi/sbi \