Changeset 3e828ea in mainline for uspace/srv/fs

Timestamp:

2019-09-23T12:49:29Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

9be2358

Parents:

9259d20 (diff), 1a4ec93f (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.

git-author:

Jiri Svoboda <jiri@…> (2019-09-22 12:49:07)

git-committer:

Jiri Svoboda <jiri@…> (2019-09-23 12:49:29)

Message:

Merge changes from master, especially Meson build

Location:

uspace/srv/fs

Files:

• cdfs/Makefile (deleted)
• cdfs/meson.build (added)
• exfat/Makefile (deleted)
• exfat/meson.build (added)
• ext4fs/meson.build (added)
• fat/Makefile (deleted)
• fat/meson.build (moved) (moved from uspace/app/edit/Makefile ) (1 diff)
• locfs/Makefile (deleted)
• locfs/meson.build (added)
• mfs/Makefile (deleted)
• mfs/meson.build (moved) (moved from uspace/app/init/Makefile ) (1 diff)
• tmpfs/Makefile (deleted)
• tmpfs/meson.build (added)
• udf/meson.build (added)

uspace/srv/fs/fat/meson.build

@@ -28 +28 @@
 #
 
-USPACE_PREFIX = ../..
-BINARY = edit
-
-SOURCES = \
-        edit.c \
-        sheet.c \
-        search.c
-
-include $(USPACE_PREFIX)/Makefile.common
+deps = [ 'block', 'fs' ]
+src = files(
+        'fat.c',
+        'fat_ops.c',
+        'fat_idx.c',
+        'fat_dentry.c',
+        'fat_directory.c',
+        'fat_fat.c',
+)

uspace/srv/fs/mfs/meson.build

@@ -28 +28 @@
 #
 
-USPACE_PREFIX = ../..
-BINARY = init
-STATIC_NEEDED = y
-
-LIBS = untar block
-
-SOURCES = \
-        init.c \
-        untar.c
-
-include $(USPACE_PREFIX)/Makefile.common
+deps = [ 'block', 'fs', 'minix' ]
+src = files(
+        'mfs.c',
+        'mfs_ops.c',
+        'mfs_inode.c',
+        'mfs_rw.c',
+        'mfs_dentry.c',
+        'mfs_balloc.c',
+        'mfs_utils.c',
+)