Skip to content

lkl: drop libarchive cptofs dependency - #644

Merged
tavip merged 1 commit into
lkl:masterfrom
ddiss:cptofs_libarchive
Sep 28, 2026
Merged

tavip merged 1 commit into
lkl:masterfrom
ddiss:cptofs_libarchive

Conversation

@ddiss

@ddiss ddiss commented Sep 23, 2026

Copy link
Copy Markdown

Unlike fs2tar, cptofs doesn't appear to use libarchive in any way. The dependency appears to have been added by accident via commit 2030bf6 ("lkl tools: improve the build system").

@github-actions

github-actions Bot commented Sep 23, 2026 •

Copy link
Copy Markdown

Test Results

106 files  ±0  106 suites  ±0   11m 16s ⏱️ + 3m 55s
206 tests ±0  195 ✅ ±0  11 💤 ±0  0 ❌ ±0 
790 runs  ±0  734 ✅ ±0  56 💤 ±0  0 ❌ ±0 

Results for commit af4f4b3. ± Comparison against base commit 00ff347.

♻️ This comment has been updated with latest results.

@ddiss

ddiss commented Sep 23, 2026

Copy link
Copy Markdown
Author

This sees the cptofs build enabled on Windows, which fails with:

[5](https://github.com/lkl/linux/actions/runs/35874529377/job/107226902615?pr=644#step:16:1746)
cptofs.c:7:10: fatal error: argp.h: No such file or directory
    7 | #include <argp.h>

@ddiss
ddiss marked this pull request as draft September 23, 2026 23:26
Unlike fs2tar, cptofs doesn't appear to use libarchive in any way. The
dependency appears to have been added by accident via commit
2030bf6 ("lkl tools: improve the build system").

cptofs depends on argp.h, so add and use a new LKL_HOST_CONFIG_ARGP
config to avoid Windows and Android build failures. We could consider
using https://packages.msys2.org/packages/libargp-devel and / or
https://android.googlesource.com/platform/external/argp-standalone
in future.

Signed-off-by: David Disseldorp <ddiss@suse.de>
@ddiss

ddiss commented Sep 28, 2026

Copy link
Copy Markdown
Author

v2:
- only build cp2fs with LKL_HOST_CONFIG_POSIX
v3:

  • add and use new LKL_HOST_CONFIG_ARGP check for argp.h
    • LKL_HOST_CONFIG_POSIX isn't sufficient, as the Android NDK doesn't carry argp.h

@ddiss
ddiss marked this pull request as ready for review September 28, 2026 08:06

@tavip tavip left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks @ddiss !

@tavip
tavip merged commit d0f76a7 into lkl:master Sep 28, 2026
11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants