Skip to content

Merge upstream branch 'main' #40

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.

Sign up for GitHub

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

Merged
DreamConnected merged 14 commits into from
Dec 18, 2025
Merged

Merge upstream branch 'main' #40

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
5d160e2
meson: add meson option for running doxygen in build
chackoj-1204 Nov 29, 2025
1090d85
added "--rbduser" option in "lxc-create -B rbd"
Rahik-Sikder Dec 9, 2025
9799eba
added doc for --rbduser
Rahik-Sikder Dec 11, 2025
46ae4ef
Merge pull request #4622 from Rahik-Sikder/lxc_create_rbd_user_option
stgraber Dec 12, 2025
f085a8c
Added documentation on unprivileged LXC containers
chackoj-1204 Dec 2, 2025
af691a1
build(deps): bump actions/upload-artifact from 5 to 6
dependabot[bot] Dec 15, 2025
16891f1
Merge pull request #4625 from lxc/dependabot/github_actions/actions/u…
stgraber Dec 15, 2025
5cd13aa
Merge pull request #4615 from chackoj-1204/meson-build-enable-api-docs
stgraber Dec 15, 2025
e6ad17a
start: Remove outdated comment about group dropping
Filiprogrammer Dec 15, 2025
9e6caea
start: Respect lxc.init.groups also in new user namespace
Filiprogrammer Dec 15, 2025
49c34b1
copy_rdepends: Don't fail on missing source file
Dec 14, 2025
e59aea2
Merge pull request #4624 from James-Featherston/issue-4514
stgraber Dec 16, 2025
27e8823
Merge pull request #4626 from Filiprogrammer/fix-init-groups-in-userns
stgraber Dec 16, 2025
1311e1b
Merge pull request #4616 from chackoj-1204/doc/unprivileged-container…
stgraber Dec 16, 2025
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
Next Next commit
meson: add meson option for running doxygen in build 
Co-developed-by: Jake Chacko <[email protected]>
Co-developed-by: Rahik Sikder <[email protected]>
Signed-off-by: Jake Chacko <[email protected]>
  • Loading branch information
@chackoj-1204
chackoj-1204 committed Dec 2, 2025
commit 5d160e2a5a71f3ba7426c68271810e1e697ff4a8
13 changes: 13 additions & 0 deletions doc/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,16 @@ if want_mans
install_dir: join_paths(mandir, 'man' + page[1]))
endforeach
endif

# API Docs (Doxygen)
if want_api_docs
doxygen = find_program('doxygen', required: true)

api_docs = custom_target(
'api-docs',
input: files('api/Doxyfile'),
output: 'api-docs.stamp',
command: [doxygen, '@INPUT@'],
build_by_default: true
)
endif
7 changes: 7 additions & 0 deletions meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ want_install_init = get_option('install-init-files')
want_io_uring = get_option('io-uring-event-loop')
want_pam_cgroup = get_option('pam-cgroup')
want_mans = get_option('man')
want_api_docs = get_option('api-docs')
want_tests = get_option('tests')
want_tools = get_option('tools')
want_tools_multicall = get_option('tools-multicall')
Expand Down Expand Up @@ -341,6 +342,12 @@ if not sgml2man.found()
endif
endif

## API Docs.
doxygen = find_program('doxygen', required: false)
if not doxygen.found() and want_api_docs
error('missing required doxygen dependency')
endif

## Threads.
threads = dependency('threads')
liblxc_dependencies += threads
Expand Down
4 changes: 4 additions & 0 deletions meson_options.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ option('io-uring-event-loop', type: 'boolean', value: false,
option('man', type: 'boolean', value: true,
description: 'build and install manpages')

# was --{disable,enable}-api-docs in autotools
option('api-docs', type: 'boolean', value: false,
description: 'build and install API documentation (Doxygen)')

# was --{disable,enable}-pam in autotools
option('pam-cgroup', type: 'boolean', value: false,
description: 'build and install the pam cgroup module')
Expand Down