criu: 2.0 -> 2.12.1 #30408
Closed
criu: 2.0 -> 2.12.1 #30408
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
joachifm
reviewed
Oct 20, 2017
| substituteInPlace ./criu/Makefile --replace "-I/usr/include/libnl3" "-I${libnl.dev}/include/libnl3" | ||
| substituteInPlace ./Makefile --replace "tar-name := $(shell git tag -l v$(CRIU_VERSION))" "tar-name = 2.0" # --replace "-Werror" "" | ||
| substituteInPlace ./Makefile --replace "head-name := \$(shell git tag -l v\$(CRIU_VERSION))" "head-name = ${version}.0" # --replace "-Werror" "" |
There was a problem hiding this comment.
I wonder, why not hard-code this to ${version} instead?
|
Needs rebasing |
rycee
reviewed
Nov 1, 2017
| }; | ||
|
|
||
| enableParallelBuilding = true; | ||
| nativeBuildInputs = [ pkgconfig docbook_xsl ]; | ||
| buildInputs = [ protobuf protobufc asciidoc xmlto libpaper libnl libcap python ]; | ||
| buildInputs = [ protobuf protobufc asciidoc xmlto libpaper libnl libcap libnet python git ]; |
There was a problem hiding this comment.
As far as I can tell the git here is not actually used, presumably because of the substitution in the patch phase… At least I was able to build it OK without git and
nix-store -q --references /nix/store/609y5nypwvwmm48ivj3lq7vrpp3px7fm-criu-2.12.1
doesn't show any reference to the git package.
There was a problem hiding this comment.
Ah, I see now, I do actually substituteInPlace the git call from Makefile so it's not needed. Will patch that.
|
Thanks! Rebased to master in 22beeea. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
criu: 2.0 -> 2.12.1
No luck with upgrading to 3.x
cc @thoughtpolice
Things done
build-use-sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)