-
-
Notifications
You must be signed in to change notification settings - Fork 14.1k
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
libvirt: 6.6.0 -> 6.8.0 #103309
libvirt: 6.6.0 -> 6.8.0 #103309
Conversation
apparently, libvirt checks for the presence of dbus/dubs.h (
so maybe our dbus package needs ajustments too |
That is correct The error actually comes from https://gitlab.com/libvirt/libvirt/-/blob/v6.7.0/meson.build#L1558 which should be found easily https://gitlab.com/libvirt/libvirt/-/blob/v6.7.0/meson.build#L1027-1028 as long |
] ++ optionals stdenv.isDarwin [ | ||
"--with-init-script=none" | ||
"-Dinit_script=none" | ||
]; | ||
|
||
installFlags = [ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
installFlags
will not do anything – ninja does not allow install time configuration.
''; | ||
|
||
configureScript = "../configure"; | ||
|
||
dontAddDisableDepTrack = true; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
dontAddDisableDepTrack
is useless with Meson and enableParallelBuilding
is redundant.
"-Dauto_features=disabled" | ||
"-Drunstatedir=/run" | ||
"-Dlocalstatedir=/var" | ||
"-Dsysconfdir=/var/lib" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is weird, --sysconfdir
should typically be /etc
. Also note that you might need a patch like this one since ninja does not allow configuring variables at installation time.
"-Ddriver_esx=enabled" | ||
"-Ddriver_remote=enabled" | ||
"-Dpolkit=enabled" | ||
"-Dbus=enabled" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmm, your issue might something to do with
Dependency dbus-1 skipped: feature dbus disabled
Likely this typo is causing it.
Thanks for the review, it is very helpful. |
some more progress, yet still some problematic paths:
networkmanager use
in its mesonFlags so I tried to do the same, but not sure that's correct. |
Meson supports both CMake-style and Autotools style options for GNU directory paths, so either will work. Unfortunately, you are experiencing the issue that we want software to load sysconfig, localstate, etc. from |
the meson build system looks complex (too much for me to patch at least) so instead I've just patched our current libvirtd to fix my current issue:
feel free to pickup. |
Seems to be relevant for CVE-2020-25637. (see #100306, #100308) |
I ran into the issue you did too, @teto. Since this PR seems to have stalled out, I tried to carry it forward over here: #109332. I think I got everything to work on that one. Thanks for the initial PR to work from, I didn't have to make many changes at all to get it working! Thanks as well for the pointers about meson, @jtojnar, they were immensely helpful! |
The previous commit updates to a newer libvirt with a newer build setup. This commit carries forward that work into a mergeable state. Based on the suggestion in NixOS#103309 (comment), I did a fwupd-like patch for the various meson.build files.
very happy you could get a working build ! closing this one then |
The previous commit updates to a newer libvirt with a newer build setup. This commit carries forward that work into a mergeable state. Based on the suggestion in #103309 (comment), I did a fwupd-like patch for the various meson.build files.
Motivation for this change
I suffer from https://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg1764171.html / https://gitlab.com/libvirt/libvirt/-/issues/73 with 6.6 so I tried to bump it but they changed the buildsystem to meson (which is my first time playing with).
I've made some good progress until
meson.build:1561:2: ERROR: Problem encountered: You must install dbus to compile libvirt with polkit-1
it doesn't seem to detect dbus. I am a bit short on time to look into it right now will try later but I will welcome hints. Looks like it is looking for headers from dbus.dev
Related PRs:
changelog https://libvirt.org/news.html
Things done
sandbox
innix.conf
on non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
./result/bin/
)nix path-info -S
before and after)