Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

composefs: Bump composefs max version to 1 #3149

Merged
merged 2 commits into from
Jan 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composefs
Submodule composefs updated 66 files
+2 −0 .github/workflows/test.yaml
+1 −0 .gitignore
+8 −0 BSD-2-Clause.txt
+165 −0 COPYING.LESSERv3
+674 −0 COPYINGv3
+202 −0 LICENSE.Apache-2.0
+32 −4 Makefile.am
+2 −8 README.md
+36 −7 composefs.spec.in
+50 −43 configure.ac
+1 −1 hacking/installdeps.sh
+1 −1 libcomposefs/Makefile-lib.am
+2 −1 libcomposefs/lcfs-erofs.h
+3 −3 libcomposefs/lcfs-fsverity.c
+60 −32 libcomposefs/lcfs-internal.h
+211 −142 libcomposefs/lcfs-mount.c
+0 −1 libcomposefs/lcfs-mount.h
+53 −0 libcomposefs/lcfs-utils.h
+61 −39 libcomposefs/lcfs-writer-erofs.c
+209 −47 libcomposefs/lcfs-writer.c
+16 −2 libcomposefs/lcfs-writer.h
+1 −0 man/.gitignore
+121 −0 man/composefs-dump.md
+49 −0 man/composefs-info.md
+76 −8 man/mkcomposefs.md
+44 −9 man/mount.composefs.md
+22 −7 tests/Makefile.am
+ tests/assets/config-with-hard-link.dump.gz
+0 −0 tests/assets/config-with-hard-link.dump.gz.sha256
+ tests/assets/config-with-hard-link.json.gz
+ tests/assets/config.dump.gz
+0 −0 tests/assets/config.dump.gz.sha256
+ tests/assets/config.json.gz
+ tests/assets/cs9-x86_64-developer.dump.gz
+0 −0 tests/assets/cs9-x86_64-developer.dump.gz.sha256
+ tests/assets/cs9-x86_64-developer.json.gz
+ tests/assets/cs9-x86_64-minimal.dump.gz
+0 −0 tests/assets/cs9-x86_64-minimal.dump.gz.sha256
+ tests/assets/cs9-x86_64-minimal.json.gz
+ tests/assets/f36-x86_64-silverblue.dump.gz
+0 −0 tests/assets/f36-x86_64-silverblue.dump.gz.sha256
+ tests/assets/f36-x86_64-silverblue.json.gz
+10 −0 tests/assets/special.dump
+1 −1 tests/assets/special.dump.sha256
+1 −0 tests/assets/special.dump.version
+0 −139 tests/assets/special.json
+1 −0 tests/assets/special_v1.dump
+1 −0 tests/assets/special_v1.dump.sha256
+1 −0 tests/assets/special_v1.dump.version
+48 −5 tests/dumpdir
+201 −0 tests/gendir
+35 −24 tests/integration.sh
+22 −9 tests/test-checksums.sh
+70 −0 tests/test-lib.sh
+96 −0 tests/test-random-fuse.sh
+28 −5 tests/test-units.sh
+4 −1 tools/.gitignore
+0 −7 tools/Makefile.am
+109 −70 tools/cfs-fuse.c
+9 −4 tools/composefs-dump.c
+0 −789 tools/composefs-from-json.c
+223 −55 tools/composefs-info.c
+607 −157 tools/mkcomposefs.c
+47 −44 tools/mountcomposefs.c
+0 −130 tools/read-file.c
+0 −27 tools/read-file.h
2 changes: 2 additions & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,8 @@ AS_IF([test x$have_gpgme = xyes],
AM_CONDITIONAL(USE_GPGME, test "x$have_gpgme" = xyes)

dnl composefs won't work at all without this
AC_CHECK_HEADERS([endian.h sys/endian.h machine/endian.h])
AC_CHECK_FUNCS([reallocarray])
AC_MSG_CHECKING([for MOUNT_ATTR_IDMAP])
AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM([
Expand Down
3 changes: 3 additions & 0 deletions src/libostree/ostree-repo-composefs.c
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,9 @@ ostree_composefs_target_write (OstreeComposefsTarget *target, int fd, guchar **o
options.file_write_cb = _composefs_write_cb;
}

options.version = 0;
options.max_version = 1; /* Support new whiteout xattr if required */

if (lcfs_write_to (root, &options) != 0)
return glnx_throw_errno_prefix (error, "lcfs_write_to");

Expand Down
Loading