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.

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

busybox: backport updates and proper sandbox shell configuration #36919

Merged
merged 4 commits into from Mar 14, 2018

Conversation

dtzWill
Copy link
Member

@dtzWill dtzWill commented Mar 13, 2018

  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • 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.

dtzWill and others added 4 commits March 13, 2018 13:02
(cherry picked from commit 329db7b)
Nix will use this shell if the attribute is present,
avoiding duplicating changes in the future.

(cherry picked from commit 6ec60e8)
(cherry picked from commit 65774cb)
(cherry picked from commit 9261c17)
@dtzWill
Copy link
Member Author

dtzWill commented Mar 13, 2018

@GrahamcOfBorg build nixStable2 busybox

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: nixStable2

The following builds were skipped because they don't evaluate on x86_64-darwin: busybox

Partial log (click to expand)

these paths will be fetched (1.24 MiB download, 6.07 MiB unpacked):
  /nix/store/9ygr02kjqjz3j8a293dzvw40csgy1rlp-nix-2.0-man
  /nix/store/sxj75amh3cpwnhczzn9mkggcjjc9x93h-nix-2.0
copying path '/nix/store/9ygr02kjqjz3j8a293dzvw40csgy1rlp-nix-2.0-man' from 'https://cache.nixos.org'...
copying path '/nix/store/sxj75amh3cpwnhczzn9mkggcjjc9x93h-nix-2.0' from 'https://cache.nixos.org'...
/nix/store/sxj75amh3cpwnhczzn9mkggcjjc9x93h-nix-2.0

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: nixStable2, busybox

Partial log (click to expand)

running test tests/fetchMercurial.sh... [SKIP]
running test tests/signing.sh... [PASS]
running test tests/run.sh... [PASS]
running test tests/brotli.sh... [PASS]
running test tests/pure-eval.sh... [PASS]
running test tests/check.sh... [PASS]
running test tests/plugins.sh... [PASS]
All tests succeeded
/nix/store/26gw8hq3881fcy59zpynm0zxc2k8911y-nix-2.0
/nix/store/17fjxw3n80zm72lgkmbvhf50mcrly3mj-busybox-1.28.1

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin

The following builds were skipped because they don't evaluate on x86_64-darwin: busybox, busybox-sandbox-shell

No log is available.

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: busybox, busybox-sandbox-shell

Partial log (click to expand)

/nix/store/3d215z28hvrmhglz35l9fxsg7cd61v7s-busybox-1.28.1
/nix/store/khb205f9s4bipf9lmm7xizg06s4yp2wh-busybox-1.28.1

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: nixStable2, busybox

Partial log (click to expand)

running test tests/fetchMercurial.sh... [SKIP]
running test tests/signing.sh... [PASS]
running test tests/run.sh... [PASS]
running test tests/brotli.sh... [PASS]
running test tests/pure-eval.sh... [PASS]
running test tests/check.sh... [PASS]
running test tests/plugins.sh... [PASS]
All tests succeeded
/nix/store/6fsvrqg8l1gpy43q0rg5v5x17dvwagar-nix-2.0
/nix/store/3d215z28hvrmhglz35l9fxsg7cd61v7s-busybox-1.28.1

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: busybox, busybox-sandbox-shell

Partial log (click to expand)


post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/17fjxw3n80zm72lgkmbvhf50mcrly3mj-busybox-1.28.1
shrinking /nix/store/17fjxw3n80zm72lgkmbvhf50mcrly3mj-busybox-1.28.1/bin/busybox
stripping (with flags -S) in /nix/store/17fjxw3n80zm72lgkmbvhf50mcrly3mj-busybox-1.28.1/bin  /nix/store/17fjxw3n80zm72lgkmbvhf50mcrly3mj-busybox-1.28.1/sbin 
patching script interpreter paths in /nix/store/17fjxw3n80zm72lgkmbvhf50mcrly3mj-busybox-1.28.1
checking for references to /tmp/nix-build-busybox-1.28.1.drv-0 in /nix/store/17fjxw3n80zm72lgkmbvhf50mcrly3mj-busybox-1.28.1...
moving /nix/store/17fjxw3n80zm72lgkmbvhf50mcrly3mj-busybox-1.28.1/sbin/* to /nix/store/17fjxw3n80zm72lgkmbvhf50mcrly3mj-busybox-1.28.1/bin
/nix/store/17fjxw3n80zm72lgkmbvhf50mcrly3mj-busybox-1.28.1
/nix/store/n1s82m1xrbygz99mv42fcz1yib3c2ggv-busybox-1.28.1

@dtzWill dtzWill merged commit d35cbdd into NixOS:release-17.09 Mar 14, 2018
7c6f434c referenced this pull request Mar 15, 2018
Don't default `doCheck` to false,
and use the default set of phases
so the phases list does not need to be overriden
in order to add checkPhase or installCheckPhase.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants