Thomas Huth 0215e8e872 meson.build: Make keyutils independent from keyring ... Commit 0db0fbb5cf ("Add conditional dependency for libkeyutils") tried to provide a possibility for the user to disable keyutils if not required by makeing it depend on the keyring feature. This looked reasonable at a first glance (the unit test in tests/unit/ needs both), but the condition in meson.build fails if the feature is meant to be detected automatically, and there is also another spot in backends/meson.build where keyutils is used independently from keyring. So let's remove the dependency on keyring again and introduce a proper meson build option instead. Cc: qemu-stable@nongnu.org Fixes: 0db0fbb5cf ("Add conditional dependency for libkeyutils") Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1842 Message-ID: <20230824094208.255279-1-thuth@redhat.com> Reviewed-by: "Daniel P. Berrangé" <berrange@redhat.com> Signed-off-by: Thomas Huth <thuth@redhat.com> (cherry picked from commit c64023b0ba) Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>		2023-10-03 02:00:54 +03:00
..
ci	configure: remove --with-git-submodules=	2023-06-06 16:30:01 +02:00
coccinelle	cleanup: Tweak and re-run return_directly.cocci	2022-12-14 16:19:35 +01:00
codeconverter
coverage	scripts/coverage: initial coverage comparison script	2023-04-04 15:16:29 +01:00
coverity-scan	coverity: the definitive COMPONENTS.md update	2023-05-18 08:53:51 +02:00
kvm	vmxcap: add tertiary execution controls	2022-05-12 14:23:19 +02:00
modules
oss-fuzz	scripts/oss-fuzz: add a suppression for keymap	2023-07-03 12:51:21 +01:00
performance
qapi	scripts/qapi: document the tool that generated the file	2023-06-01 11:05:05 -04:00
qemu-guest-agent
qemugdb
qmp	python: rename qemu.aqmp to qemu.qmp	2022-04-21 11:01:00 -04:00
simplebench	python: rename qemu.aqmp to qemu.qmp	2022-04-21 11:01:00 -04:00
tracetool	trace: remove control-vcpu.h	2023-06-01 11:05:05 -04:00
analyse-9p-simpletrace.py
analyse-locks-simpletrace.py
analyze-inclusions	scripts/analyze-inclusions: drop qemu-common.h from analysis	2022-04-21 16:56:55 +04:00
analyze-migration.py
archive-source.sh	meson: subprojects: replace berkeley-{soft,test}float-3 with wraps	2023-06-06 16:30:01 +02:00
block-coroutine-wrapper.py	block-coroutine-wrapper: Take AioContext lock in no_co_wrappers	2023-05-30 17:21:23 +02:00
check_sparse.py
checkpatch.pl	checkpatch: add qemu_bh_new/aio_bh_new checks	2023-04-28 11:31:54 +02:00
clean-header-guards.pl	disas: Remove libvixl disassembler	2022-07-05 10:15:49 +02:00
clean-includes	scripts/clean-includes: Improve --git commit message	2023-02-08 07:16:23 +01:00
cleanup-trace-events.pl
cocci-macro-file.h	compiler.h: replace QEMU_NORETURN with G_NORETURN	2022-04-21 17:03:51 +04:00
cpu-x86-uarch-abi.py	python: rename qemu.aqmp to qemu.qmp	2022-04-21 11:01:00 -04:00
decodetree.py	tests/decode: Suppress "error: " string for expected-failure tests	2023-07-25 10:56:52 +01:00
device-crash-test	tests: Use separate virtual environment for avocado	2023-06-06 16:29:53 +02:00
disas-objdump.pl
dump-guest-memory.py
entitlement.sh
extract-vsssdk-headers
feature_to_c.sh	Add missing include statement for global xml_builtin	2022-11-06 09:48:42 +01:00
fix-multiline-comments.sh
gensyscalls.sh	linux-user: Add LoongArch syscall support	2022-07-04 11:08:57 +05:30
get_maintainer.pl
git-submodule.sh	scripts/git-submodule.sh: Don't rely on non-POSIX 'read' behaviour	2023-07-25 10:56:51 +01:00
git.orderfile	scripts/git.orderfile: Display MAINTAINERS changes first	2023-01-13 16:22:57 +01:00
hxtool
kernel-doc
make-config-poison.sh	exec/poison: Do not poison CONFIG_SOFTMMU	2023-06-05 12:04:29 -07:00
make-release	meson: subprojects: replace berkeley-{soft,test}float-3 with wraps	2023-06-06 16:30:01 +02:00
meson-buildoptions.py	scripts: make sure scripts are invoked via $(PYTHON)	2023-05-19 20:40:29 +02:00
meson-buildoptions.sh	meson.build: Make keyutils independent from keyring	2023-10-03 02:00:54 +03:00
meson.build	scripts: add a XML preprocessor script	2023-06-27 17:08:56 +02:00
minikconf.py
modinfo-collect.py	scripts: make sure scripts are invoked via $(PYTHON)	2023-05-19 20:40:29 +02:00
modinfo-generate.py	scripts: make sure scripts are invoked via $(PYTHON)	2023-05-19 20:40:29 +02:00
mtest2make.py	mtest2make.py: teach suite name that are just "PROJECT"	2023-04-20 11:17:34 +02:00
nsis.py	scripts/nsis.py: Automatically package required DLLs of QEMU executables	2022-10-31 10:06:11 +01:00
probe-gdb-support.py	scripts: make sure scripts are invoked via $(PYTHON)	2023-05-19 20:40:29 +02:00
qapi-gen.py
qemu-binfmt-conf.sh	scripts/qemu-binfmt-conf: Add LoongArch to qemu_get_family()	2022-07-05 16:17:53 +05:30
qemu-gdb.py
qemu-stamp.py	meson, configure: move --with-pkgversion, CONFIG_STAMP to meson	2022-05-07 07:46:58 +02:00
qemu-trace-stap
qemu-version.sh
qom-cast-macro-clean-cocci-gen.py	scripts: Add qom-cast-macro-clean-cocci-gen.py	2023-06-05 20:48:34 +02:00
refresh-pxe-roms.sh
render_block_graph.py	python: rename qemu.aqmp to qemu.qmp	2022-04-21 11:01:00 -04:00
replay-dump.py
shaderinclude.py	build-sys: fix crlf-ending C code	2023-02-02 10:44:23 +00:00
signrom.py
simpletrace.py
symlink-install-tree.py	Add information how to fix common build error on Windows in symlink-install-tree	2023-05-16 09:14:18 +02:00
tracetool.py
u2f-setup-gen.py
undefsym.py
update-linux-headers.sh	update-linux-headers.sh: Add missing kernel headers.	2023-04-28 14:03:52 +02:00
update-mips-syscall-args.sh
update-syscalltbl.sh
userfaultfd-wrlat.py
vmstate-static-checker.py	vmstate-static-checker: Recognize "num" field	2023-04-27 10:18:26 +02:00
xen-detect.c	xen: Drop support for Xen versions below 4.7.1	2023-06-07 15:07:10 +01:00
xml-preprocess-test.py	scripts: add a XML preprocessor script	2023-06-27 17:08:56 +02:00
xml-preprocess.py	scripts: add a XML preprocessor script	2023-06-27 17:08:56 +02:00