Skip to content
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

Jump to bottom

ppp: fix build with newer kernel headers #38002

Merged
merged 1 commit into from Mar 28, 2018
Merged

ppp: fix build with newer kernel headers #38002

merged 1 commit into from Mar 28, 2018

Conversation

pbogdan
Copy link
Member

@pbogdan pbogdan commented Mar 28, 2018

Motivation for this change

The package would build but with some components missing, see #37926 and https://hydra.nixos.org/build/70939248/nixlog/1 -> CTRL-F error:

Not sure how to test this beyond checking the missing .so now exists.

Hopefully fixes #37926 /cc @TvoroG.

/cc @dtzWill as I had to regenerate the musl patch + there was some strip weirdness in the install phase when I tried to build for musl.

Should probably be backported to 18.03 as well as it seems to have the same issue.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@pbogdan
ppp: fix build with newer kernel headers
1e6b44a 
The package would build but with some components missing, see
#37926 and
https://hydra.nixos.org/build/70939248/nixlog/1 -> CTRL-F error:
@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: ppp

Partial log (click to expand)

gzipping man pages under /nix/store/krzz001p43vfysvz3imyhzm25pspfn4x-ppp-2.4.7/share/man/
strip is /nix/store/fzcs0fn6bb04m82frhlb78nc03ny3w55-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/krzz001p43vfysvz3imyhzm25pspfn4x-ppp-2.4.7/lib  /nix/store/krzz001p43vfysvz3imyhzm25pspfn4x-ppp-2.4.7/bin  /nix/store/krzz001p43vfysvz3imyhzm25pspfn4x-ppp-2.4.7/sbin
patching script interpreter paths in /nix/store/krzz001p43vfysvz3imyhzm25pspfn4x-ppp-2.4.7
/nix/store/krzz001p43vfysvz3imyhzm25pspfn4x-ppp-2.4.7/bin/plog: interpreter directive changed from "/bin/sh" to "/nix/store/q1g0rl8zfmz7r371fp5p42p4acmv297d-bash-4.4-p19/bin/sh"
/nix/store/krzz001p43vfysvz3imyhzm25pspfn4x-ppp-2.4.7/bin/poff: interpreter directive changed from "/bin/sh" to "/nix/store/q1g0rl8zfmz7r371fp5p42p4acmv297d-bash-4.4-p19/bin/sh"
/nix/store/krzz001p43vfysvz3imyhzm25pspfn4x-ppp-2.4.7/bin/pon: interpreter directive changed from "/bin/sh" to "/nix/store/q1g0rl8zfmz7r371fp5p42p4acmv297d-bash-4.4-p19/bin/sh"
checking for references to /tmp/nix-build-ppp-2.4.7.drv-0 in /nix/store/krzz001p43vfysvz3imyhzm25pspfn4x-ppp-2.4.7...
moving /nix/store/krzz001p43vfysvz3imyhzm25pspfn4x-ppp-2.4.7/sbin/* to /nix/store/krzz001p43vfysvz3imyhzm25pspfn4x-ppp-2.4.7/bin
/nix/store/krzz001p43vfysvz3imyhzm25pspfn4x-ppp-2.4.7

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: ppp

Partial log (click to expand)

gzipping man pages under /nix/store/m1i4333y0304fzzsknw3wdx8d3gb66pp-ppp-2.4.7/share/man/
strip is /nix/store/3zq400fri5dv7d30lpxlqm2v9y1iis6j-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/m1i4333y0304fzzsknw3wdx8d3gb66pp-ppp-2.4.7/lib  /nix/store/m1i4333y0304fzzsknw3wdx8d3gb66pp-ppp-2.4.7/bin  /nix/store/m1i4333y0304fzzsknw3wdx8d3gb66pp-ppp-2.4.7/sbin
patching script interpreter paths in /nix/store/m1i4333y0304fzzsknw3wdx8d3gb66pp-ppp-2.4.7
/nix/store/m1i4333y0304fzzsknw3wdx8d3gb66pp-ppp-2.4.7/bin/plog: interpreter directive changed from "/bin/sh" to "/nix/store/3gg2p6n4kv2f0lsxd41f5iz1ivkbzyzr-bash-4.4-p19/bin/sh"
/nix/store/m1i4333y0304fzzsknw3wdx8d3gb66pp-ppp-2.4.7/bin/poff: interpreter directive changed from "/bin/sh" to "/nix/store/3gg2p6n4kv2f0lsxd41f5iz1ivkbzyzr-bash-4.4-p19/bin/sh"
/nix/store/m1i4333y0304fzzsknw3wdx8d3gb66pp-ppp-2.4.7/bin/pon: interpreter directive changed from "/bin/sh" to "/nix/store/3gg2p6n4kv2f0lsxd41f5iz1ivkbzyzr-bash-4.4-p19/bin/sh"
checking for references to /build in /nix/store/m1i4333y0304fzzsknw3wdx8d3gb66pp-ppp-2.4.7...
moving /nix/store/m1i4333y0304fzzsknw3wdx8d3gb66pp-ppp-2.4.7/sbin/* to /nix/store/m1i4333y0304fzzsknw3wdx8d3gb66pp-ppp-2.4.7/bin
/nix/store/m1i4333y0304fzzsknw3wdx8d3gb66pp-ppp-2.4.7

@obadz obadz changed the base branch from master to staging March 28, 2018 22:49
@obadz obadz merged commit da9b564 into NixOS:staging Mar 28, 2018
@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: ppp

Partial log (click to expand)

gzipping man pages under /nix/store/nl65xvvb70pfvvlca4176ljmrgzn1pmd-ppp-2.4.7/share/man/
strip is /nix/store/j75dgadrff2d1fyc4fczmcgqkid2imdx-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/nl65xvvb70pfvvlca4176ljmrgzn1pmd-ppp-2.4.7/lib  /nix/store/nl65xvvb70pfvvlca4176ljmrgzn1pmd-ppp-2.4.7/bin  /nix/store/nl65xvvb70pfvvlca4176ljmrgzn1pmd-ppp-2.4.7/sbin
patching script interpreter paths in /nix/store/nl65xvvb70pfvvlca4176ljmrgzn1pmd-ppp-2.4.7
/nix/store/nl65xvvb70pfvvlca4176ljmrgzn1pmd-ppp-2.4.7/bin/plog: interpreter directive changed from "/bin/sh" to "/nix/store/xn5gv3lpfy91yvfy9b0i7klfcxh9xskz-bash-4.4-p19/bin/sh"
/nix/store/nl65xvvb70pfvvlca4176ljmrgzn1pmd-ppp-2.4.7/bin/poff: interpreter directive changed from "/bin/sh" to "/nix/store/xn5gv3lpfy91yvfy9b0i7klfcxh9xskz-bash-4.4-p19/bin/sh"
/nix/store/nl65xvvb70pfvvlca4176ljmrgzn1pmd-ppp-2.4.7/bin/pon: interpreter directive changed from "/bin/sh" to "/nix/store/xn5gv3lpfy91yvfy9b0i7klfcxh9xskz-bash-4.4-p19/bin/sh"
checking for references to /tmp/nix-build-ppp-2.4.7.drv-0 in /nix/store/nl65xvvb70pfvvlca4176ljmrgzn1pmd-ppp-2.4.7...
moving /nix/store/nl65xvvb70pfvvlca4176ljmrgzn1pmd-ppp-2.4.7/sbin/* to /nix/store/nl65xvvb70pfvvlca4176ljmrgzn1pmd-ppp-2.4.7/bin
/nix/store/nl65xvvb70pfvvlca4176ljmrgzn1pmd-ppp-2.4.7

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: ppp

Partial log (click to expand)

gzipping man pages under /nix/store/iazx26mfnz002xns1p9di23nmxzbwlvq-ppp-2.4.7/share/man/
strip is /nix/store/j7d4mr0ikv974ig7yzhknpsq288js4bs-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/iazx26mfnz002xns1p9di23nmxzbwlvq-ppp-2.4.7/lib  /nix/store/iazx26mfnz002xns1p9di23nmxzbwlvq-ppp-2.4.7/bin  /nix/store/iazx26mfnz002xns1p9di23nmxzbwlvq-ppp-2.4.7/sbin
patching script interpreter paths in /nix/store/iazx26mfnz002xns1p9di23nmxzbwlvq-ppp-2.4.7
/nix/store/iazx26mfnz002xns1p9di23nmxzbwlvq-ppp-2.4.7/bin/plog: interpreter directive changed from "/bin/sh" to "/nix/store/adw9jx59wnrh5659wz43nbjya3m4b3gl-bash-4.4-p19/bin/sh"
/nix/store/iazx26mfnz002xns1p9di23nmxzbwlvq-ppp-2.4.7/bin/poff: interpreter directive changed from "/bin/sh" to "/nix/store/adw9jx59wnrh5659wz43nbjya3m4b3gl-bash-4.4-p19/bin/sh"
/nix/store/iazx26mfnz002xns1p9di23nmxzbwlvq-ppp-2.4.7/bin/pon: interpreter directive changed from "/bin/sh" to "/nix/store/adw9jx59wnrh5659wz43nbjya3m4b3gl-bash-4.4-p19/bin/sh"
checking for references to /build in /nix/store/iazx26mfnz002xns1p9di23nmxzbwlvq-ppp-2.4.7...
moving /nix/store/iazx26mfnz002xns1p9di23nmxzbwlvq-ppp-2.4.7/sbin/* to /nix/store/iazx26mfnz002xns1p9di23nmxzbwlvq-ppp-2.4.7/bin
/nix/store/iazx26mfnz002xns1p9di23nmxzbwlvq-ppp-2.4.7

@pbogdan pbogdan mentioned this pull request Mar 29, 2018
Closed
@pbogdan pbogdan deleted the ppp branch December 3, 2019 17:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 101-500
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@pbogdan @GrahamcOfBorg @obadz