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

busybox: 1.28.3 -> 1.28.4, fix fsck exit code #41024

Closed
wants to merge 2 commits into from
Closed

busybox: 1.28.3 -> 1.28.4, fix fsck exit code #41024

wants to merge 2 commits into from

Conversation

dtzWill
Copy link
Member

@dtzWill dtzWill commented May 24, 2018

Update and add fix for #40174 from upstream.

  • 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.

@dtzWill
busybox: 1.28.3 -> 1.28.4
e485b85
@dtzWill
busybox: patch to fix fsck exit code
3e9c74b 
Fixes NixOS#40174

Patch taken from upstream, added local copy
because fetchpatch doesn't work with fetchurlBoot.
@dtzWill
Copy link
Member Author

dtzWill commented May 24, 2018

@nh2 is this something you can test, or otherwise approve/confirm fixes your issue? Thanks!

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

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

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: busybox

Partial log (click to expand)

--------------------------------------------------

post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/zdysm9d6psncg59hibn6g1giydfnifam-busybox-1.28.4
shrinking /nix/store/zdysm9d6psncg59hibn6g1giydfnifam-busybox-1.28.4/bin/busybox
strip is /nix/store/92d2ifxcni4n3zx9s8wnkcjlvnx5ajlc-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/zdysm9d6psncg59hibn6g1giydfnifam-busybox-1.28.4/bin  /nix/store/zdysm9d6psncg59hibn6g1giydfnifam-busybox-1.28.4/sbin
patching script interpreter paths in /nix/store/zdysm9d6psncg59hibn6g1giydfnifam-busybox-1.28.4
checking for references to /build in /nix/store/zdysm9d6psncg59hibn6g1giydfnifam-busybox-1.28.4...
moving /nix/store/zdysm9d6psncg59hibn6g1giydfnifam-busybox-1.28.4/sbin/* to /nix/store/zdysm9d6psncg59hibn6g1giydfnifam-busybox-1.28.4/bin

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: busybox

Partial log (click to expand)


post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/d053gszpdbz82c7h4immw4h8vc5nf3yn-busybox-1.28.4
shrinking /nix/store/d053gszpdbz82c7h4immw4h8vc5nf3yn-busybox-1.28.4/bin/busybox
strip is /nix/store/8yfik687kfccisxnad42j19lfb7ij9b4-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/d053gszpdbz82c7h4immw4h8vc5nf3yn-busybox-1.28.4/bin  /nix/store/d053gszpdbz82c7h4immw4h8vc5nf3yn-busybox-1.28.4/sbin
patching script interpreter paths in /nix/store/d053gszpdbz82c7h4immw4h8vc5nf3yn-busybox-1.28.4
checking for references to /build in /nix/store/d053gszpdbz82c7h4immw4h8vc5nf3yn-busybox-1.28.4...
moving /nix/store/d053gszpdbz82c7h4immw4h8vc5nf3yn-busybox-1.28.4/sbin/* to /nix/store/d053gszpdbz82c7h4immw4h8vc5nf3yn-busybox-1.28.4/bin
/nix/store/d053gszpdbz82c7h4immw4h8vc5nf3yn-busybox-1.28.4

@xeji xeji mentioned this pull request May 25, 2018
Closed
@dtzWill
Copy link
Member Author

dtzWill commented Jun 17, 2018

Staging has the update, closing due to lack of activity-- since patch is already in upstream it'll be included at some point so all this accomplishes is getting it in sooner :).

@dtzWill dtzWill closed this Jun 17, 2018
@nh2
Copy link
Contributor

nh2 commented Jun 24, 2018

@dtzWill I cannot test it super easily: It requires to trigger a fsck that fixes errors (e.g. by shutting down hard at the right time), and I found it on physical hardware (should be reproducible in VMs as well though).

So I'm OK with having this in non-staging only with the next NixOS release.

I have reviewed the upstream patch and it should fix our issue.

@nh2 nh2 mentioned this pull request Aug 7, 2020
Closed
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: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@dtzWill @GrahamcOfBorg @nh2