2023-01-13 16:38:21

by Alexander Larsson

[permalink] [raw]
Subject: [PATCH v2 6/6] composefs: Add kconfig and build support

This commit adds Makefile and Kconfig for composefs, and
updates Makefile and Kconfig files in the fs directory

Signed-off-by: Alexander Larsson <[email protected]>
---
fs/Kconfig | 1 +
fs/Makefile | 1 +
fs/composefs/Kconfig | 18 ++++++++++++++++++
fs/composefs/Makefile | 5 +++++
4 files changed, 25 insertions(+)
create mode 100644 fs/composefs/Kconfig
create mode 100644 fs/composefs/Makefile

diff --git a/fs/Kconfig b/fs/Kconfig
index 2685a4d0d353..de8493fc2b1e 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -127,6 +127,7 @@ source "fs/quota/Kconfig"
source "fs/autofs/Kconfig"
source "fs/fuse/Kconfig"
source "fs/overlayfs/Kconfig"
+source "fs/composefs/Kconfig"

menu "Caches"

diff --git a/fs/Makefile b/fs/Makefile
index 4dea17840761..d16974e02468 100644
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -137,3 +137,4 @@ obj-$(CONFIG_EFIVAR_FS) += efivarfs/
obj-$(CONFIG_EROFS_FS) += erofs/
obj-$(CONFIG_VBOXSF_FS) += vboxsf/
obj-$(CONFIG_ZONEFS_FS) += zonefs/
+obj-$(CONFIG_COMPOSEFS_FS) += composefs/
diff --git a/fs/composefs/Kconfig b/fs/composefs/Kconfig
new file mode 100644
index 000000000000..88c5b55380e6
--- /dev/null
+++ b/fs/composefs/Kconfig
@@ -0,0 +1,18 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+config COMPOSEFS_FS
+ tristate "Composefs filesystem support"
+ select EXPORTFS
+ help
+ Composefs is a filesystem that allows combining file content from
+ existing regular files with a metadata directory structure from
+ a separate binary file. This is useful to share file content between
+ many different directory trees, such as in a local container image store.
+
+ Composefs also allows using fs-verity to validate the content of the
+ content-files as well as the metadata file which allows dm-verity
+ like validation with the flexibility of regular files.
+
+ For more information see Documentation/filesystems/composefs.rst
+
+ If unsure, say N.
diff --git a/fs/composefs/Makefile b/fs/composefs/Makefile
new file mode 100644
index 000000000000..eac8445e7d25
--- /dev/null
+++ b/fs/composefs/Makefile
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+obj-$(CONFIG_COMPOSEFS_FS) += composefs.o
+
+composefs-objs += cfs-reader.o cfs.o
--
2.39.0