Changeset 9dbf5587 in mainline

Timestamp:

2011-09-05T20:01:35Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

16cc9a6

Parents:

a26895d (diff), e03d545 (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 minixfs support from lp:mfs.

Files:

• boot/Makefile.common (modified) (2 diffs)
• uspace/Makefile (modified) (2 diffs)
• uspace/Makefile.common (modified) (1 diff)
• uspace/app/mkminix/Makefile (added)
• uspace/app/mkminix/mkminix.c (added)
• uspace/lib/minix/minix.h (added)
• uspace/srv/fs/minixfs/Makefile (added)
• uspace/srv/fs/minixfs/mfs.c (added)
• uspace/srv/fs/minixfs/mfs.h (added)
• uspace/srv/fs/minixfs/mfs_balloc.c (added)
• uspace/srv/fs/minixfs/mfs_dentry.c (added)
• uspace/srv/fs/minixfs/mfs_inode.c (added)
• uspace/srv/fs/minixfs/mfs_ops.c (added)
• uspace/srv/fs/minixfs/mfs_rw.c (added)
• uspace/srv/fs/minixfs/mfs_utils.c (added)

boot/Makefile.common

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

uspace/Makefile

@@ -48 +48 @@
         app/lsusb \
         app/mkfat \
+        app/mkminix \
         app/redir \
         app/sbi \
@@ -83 +84 @@
         srv/fs/cdfs \
         srv/fs/tmpfs \
+        srv/fs/minixfs \
         srv/fs/locfs \
         srv/fs/ext2fs \

uspace/Makefile.common

@@ -121 +121 @@
 LIBPACKET_PREFIX = $(LIB_PREFIX)/packet
 LIBNET_PREFIX = $(LIB_PREFIX)/net
-
+LIBMINIX_PREFIX = $(LIB_PREFIX)/minix
 LIBSCSI_PREFIX = $(LIB_PREFIX)/scsi