xen: documentation and build fixes #331867
Conversation
SigmaSquadron
force-pushed
the
xen-post-merge
branch
from
37928dd to
fcb614c
Compare
This comment was marked as outdated.
This comment was marked as outdated.
ofborg
bot
added
11.by: package-maintainer
SigmaSquadron
force-pushed
the
xen-post-merge
branch
2 times, most recently
from
f0c8857 to
558983d
Compare
|
Looks like some meta attributes were broken too. |
SigmaSquadron
force-pushed
the
xen-post-merge
branch
3 times, most recently
from
549c54e to
5109ab2
Compare
|
Split the PR into three commits for ease of review. Let me know if they need to be squashed. |
|
According to the staging-next 4.19 build (which wasn't complete when this PR was posted), the fig2dev issue stems from the fact {Image,Graphics}Magick wasn't in the buildInputs. /nix/store/cjy42fdjf6flll933b4vz27sximn6fa7-fig2dev-3.2.9/bin/fig2dev -L png network-bridge.fig >network-bridge.png.tmp
/nix/store/cjy42fdjf6flll933b4vz27sximn6fa7-fig2dev-3.2.9/bin/fig2dev -L png network-basic.fig >network-basic.png.tmp
sh: convert: not found
sh: gm: not found
make[2]: *** [Makefile:11: network-basic.png] Error 141
make[2]: *** Waiting for unfinished jobs....Again, I have no idea how to reproduce this, but I have a feeling that just adding GraphicsMagick will do the trick. |
|
Well, it doesn't fail when I add ImageMagick, and it does build the HTML documentation, which it didn't before. I see this as a good sign! |
Minor changes to comments, examples and the README. Signed-off-by: Fernando Rodrigues <[email protected]>
Xen not only has manual pages, but also a full documentation written in HTML files. By adding ImageMagick, the `fig2dev` build doesn't fail, so we can have the docs build in the $doc output. This also fixes the Hydra build, but who cares about that? We have good Xen docs now! Signed-off-by: Fernando Rodrigues <[email protected]>
The description was mangled in search.nixos.org. It recommended using qemu_xen with a Xen that already included QEMU, and there were edge cases where there wouldn't be enough newlines to properly display the full description. Signed-off-by: Fernando Rodrigues <[email protected]>
SigmaSquadron
force-pushed
the
xen-post-merge
branch
from
5109ab2 to
13b41a1
Compare
|
Result of 2 packages marked as broken and skipped:
53 packages built:
|
|
I cannot reproduce this issue. |
|
People who originally built PR #324693 couldn't reproduce this either, and OfBorg compiled it successfully. I have no idea why the problem is in Hydra. I know there shouldn't be anything different between Hydra and a simple The error is 141, a SIGPIPE. The problematic code is in the Figs Makefile: %.png: %.fig
$(FIG2DEV) -L png $< >[email protected]
mv -f [email protected] $@When running fig2dev -L png network-bridge.fig >network-bridge.png.tmp
mv -f network-bridge.png.tmp network-bridge.pngIf it's relevant, on the following Hydra builders, the build succeeded:
On this last run, the build only failed on the following builder:
|
|
Yeah, ran the command by hand too without issues. Maybe an abort somewhere in ImageMagick. |
|
Second time's the charm. #333764 |
Description of changes
ImageMagickto the build dependencies, in order to build the full HTML docs in the$docoutput, thus fixing the Hydra build.meta.longDescriptionlogic so it no longer tells people to useqemu_xenfor a Xen that was built with the internal QEMU.Things done
pkg-configtest passes successfully.nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"../result/bin/)Add a 👍 reaction to pull requests you find important.