Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 9dbf5587 in mainline


Ignore:
Timestamp:
2011-09-05T20:01:35Z (10 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master
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:
12 added
3 edited

Legend:

Unmodified
Added
Removed
  • boot/Makefile.common

    ra26895d r9dbf5587  
    103103        $(USPACE_PATH)/srv/fs/fat/fat \
    104104        $(USPACE_PATH)/srv/fs/cdfs/cdfs \
     105        $(USPACE_PATH)/srv/fs/minixfs/mfs \
    105106        $(USPACE_PATH)/srv/fs/exfat/exfat \
    106107        $(USPACE_PATH)/srv/fs/ext2fs/ext2fs \
     
    155156        $(USPACE_PATH)/app/locinfo/locinfo \
    156157        $(USPACE_PATH)/app/mkfat/mkfat \
     158        $(USPACE_PATH)/app/mkminix/mkminix \
    157159        $(USPACE_PATH)/app/lsusb/lsusb \
    158160        $(USPACE_PATH)/app/sbi/sbi \
  • uspace/Makefile

    ra26895d r9dbf5587  
    4848        app/lsusb \
    4949        app/mkfat \
     50        app/mkminix \
    5051        app/redir \
    5152        app/sbi \
     
    8384        srv/fs/cdfs \
    8485        srv/fs/tmpfs \
     86        srv/fs/minixfs \
    8587        srv/fs/locfs \
    8688        srv/fs/ext2fs \
  • uspace/Makefile.common

    ra26895d r9dbf5587  
    121121LIBPACKET_PREFIX = $(LIB_PREFIX)/packet
    122122LIBNET_PREFIX = $(LIB_PREFIX)/net
    123 
     123LIBMINIX_PREFIX = $(LIB_PREFIX)/minix
    124124LIBSCSI_PREFIX = $(LIB_PREFIX)/scsi
    125125
Note: See TracChangeset for help on using the changeset viewer.