busybox: bump copybuf, disable utmp/wtmp when not supported (musl) #34207

dtzWill · 2018-01-23T22:09:23Z

64 is the value debian uses.
utmp/wtmp are used by who and last, and are currently misleading or broken
when building busybox with musl. Disabling is cleaner (and smaller).

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.

Ericson2314 · 2018-01-23T23:33:51Z

pkgs/os-specific/linux/busybox/default.nix

@@ -24,6 +24,10 @@ let
    }
  '';

+  libcConfig = lib.optionalString (useMusl || stdenv.cc.libc == "musl") ''


Can do useMusl ? stdenv.hostPlatform.libc == "musl" in the arguments and assert stdenv.hostPlatform.libc == "musl" -> useMusl; down below?

Oh and that needs to be stdenv.hostPlatform.libc. stdenv.cc.libc is the actual derivation.

d'oh! Changed is last minute--locally I have stdenv.isMusl O:) which is slated to at least become hostPlatform.isMusl (and similar) but I haven't done so yet O:).

Will fix, thank you!

(FWIW some form of isMusl and isGlibc would prevent this sort of mistake, since it would fail to evaluate if typo or whatnot O:))

But that's not what this PR is about!

dtzWill · 2018-01-24T00:43:09Z

Fixed, sorry about that. Noticed too that this only matters when building bootstrapTools using useMusl but not using enableMinimal, which I don't think is currently used in nixpkgs. Might as well do things right, though! :)

Ericson2314 · 2018-01-24T16:28:49Z

Probably best for someone else to review too for the not cross/stdenv-related bits? But looks good to me. Eventually, when we've committed all your musl-cross stuff, I soon as well just get rid of useMusl and rely on that, but this is the right first step. Thanks!

grahamc · 2018-01-24T18:03:24Z

@GrahamcOfBorg build busybox

GrahamcOfBorg

Failure for system: x86_64-darwin

Package ‘busybox-1.28.0’ in /Users/graham/nix-borg/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-zoidberg/pkgs/os-specific/linux/busybox/default.nix:100 is not supported on ‘x86_64-darwin’, refusing to evaluate.

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

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

GrahamcOfBorg

Success for system: x86_64-linux


post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/wjb94grmm51f4yz697bjg6xm2nlr50fg-busybox-1.28.0
shrinking /nix/store/wjb94grmm51f4yz697bjg6xm2nlr50fg-busybox-1.28.0/bin/busybox
strip is /nix/store/vi79f177brsaqgiarjldil74cbryy3hn-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/wjb94grmm51f4yz697bjg6xm2nlr50fg-busybox-1.28.0/bin  /nix/store/wjb94grmm51f4yz697bjg6xm2nlr50fg-busybox-1.28.0/sbin 
patching script interpreter paths in /nix/store/wjb94grmm51f4yz697bjg6xm2nlr50fg-busybox-1.28.0
checking for references to /tmp/nix-build-busybox-1.28.0.drv-0 in /nix/store/wjb94grmm51f4yz697bjg6xm2nlr50fg-busybox-1.28.0...
moving /nix/store/wjb94grmm51f4yz697bjg6xm2nlr50fg-busybox-1.28.0/sbin/* to /nix/store/wjb94grmm51f4yz697bjg6xm2nlr50fg-busybox-1.28.0/bin
/nix/store/wjb94grmm51f4yz697bjg6xm2nlr50fg-busybox-1.28.0

dtzWill · 2018-01-24T19:22:55Z

@Ericson2314 yeah it's not very cross-related IMO :).

Mostly saw the copybuf thing and figured I'd make sure we weren't getting unnecessarily poor performance in scenarios where the tools were used.

Not a huge priority either, even on musl--it still builds it just creates bad tools :).

GrahamcOfBorg

Success for system: aarch64-linux

/nix/store/phcvaw2p525izw6g0iqp36lr2p9p868p-busybox-1.28.0

Ericson2314 · 2018-01-25T22:27:30Z

Anyone else gonna review this? Or should I just merge?

https://wiki.musl-libc.org/faq.html#Q:-Why-is-the-utmp/wtmp-functionality-only-implemented-as-stubs?

dtzWill · 2018-02-01T15:25:02Z

(rebased and fixed typo in setting copybuf value (!))

Mic92 · 2018-02-10T13:31:06Z

@GrahamcOfBorg build busybox

GrahamcOfBorg · 2018-02-10T13:31:24Z

Failure on x86_64-darwin (full log)

Partial log (click to expand)

Package ‘busybox-1.28.0’ in /Users/graham/nix-borg/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-ndnd/pkgs/os-specific/linux/busybox/default.nix:100 is not supported on ‘x86_64-darwin’, refusing to evaluate.

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

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

GrahamcOfBorg · 2018-02-10T13:31:52Z

Failure on aarch64-linux (full log)

Partial log (click to expand)

make: *** [Makefile:857: include/config/MARKER] Error 2
make: *** Waiting for unfinished jobs....
  GEN     include/usage_compressed.h
  GEN     include/applet_tables.h include/NUM_APPLETS.h
  GEN     include/applet_tables.h include/NUM_APPLETS.h
  HOSTCC  applets/usage_pod
  CC      applets/applets.o
  LD      applets/built-in.o
builder for '/nix/store/cp273ax3g7kalqlpij6i85glfjg982ns-busybox-1.28.0.drv' failed with exit code 2
error: build of '/nix/store/cp273ax3g7kalqlpij6i85glfjg982ns-busybox-1.28.0.drv' failed

GrahamcOfBorg · 2018-02-10T13:33:25Z

Success on x86_64-linux (full log)

Partial log (click to expand)


post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/pmyl82gqggp1d63x9nxjds7117p27v62-busybox-1.28.0
shrinking /nix/store/pmyl82gqggp1d63x9nxjds7117p27v62-busybox-1.28.0/bin/busybox
strip is /nix/store/5qj61lcvzlap87rf6blvf8p577d482bv-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/pmyl82gqggp1d63x9nxjds7117p27v62-busybox-1.28.0/bin  /nix/store/pmyl82gqggp1d63x9nxjds7117p27v62-busybox-1.28.0/sbin 
patching script interpreter paths in /nix/store/pmyl82gqggp1d63x9nxjds7117p27v62-busybox-1.28.0
checking for references to /tmp/nix-build-busybox-1.28.0.drv-0 in /nix/store/pmyl82gqggp1d63x9nxjds7117p27v62-busybox-1.28.0...
moving /nix/store/pmyl82gqggp1d63x9nxjds7117p27v62-busybox-1.28.0/sbin/* to /nix/store/pmyl82gqggp1d63x9nxjds7117p27v62-busybox-1.28.0/bin
/nix/store/pmyl82gqggp1d63x9nxjds7117p27v62-busybox-1.28.0

GrahamcOfBorg added 10.rebuild-darwin: 1-10 10.rebuild-linux: 11-100 labels Jan 23, 2018

Ericson2314 reviewed Jan 23, 2018

View reviewed changes

dtzWill force-pushed the fix/busybox-misc branch from 1d072ca to d668e61 Compare January 24, 2018 00:40

Ericson2314 approved these changes Jan 24, 2018

View reviewed changes

GrahamcOfBorg reviewed Jan 24, 2018

View reviewed changes

dtzWill added 2 commits February 1, 2018 08:51

busybox: don't use utmp/wtmp on musl since they won't work anyway

b780255

https://wiki.musl-libc.org/faq.html#Q:-Why-is-the-utmp/wtmp-functionality-only-implemented-as-stubs?

busybox: bump copybuf 4kB -> 64kB

329db7b

dtzWill force-pushed the fix/busybox-misc branch from d668e61 to 329db7b Compare February 1, 2018 14:57

Mic92 merged commit c69686e into NixOS:staging Feb 10, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

busybox: bump copybuf, disable utmp/wtmp when not supported (musl) #34207

busybox: bump copybuf, disable utmp/wtmp when not supported (musl) #34207

dtzWill commented Jan 23, 2018

Ericson2314 Jan 23, 2018 •

edited

Ericson2314 Jan 23, 2018

dtzWill Jan 24, 2018

dtzWill commented Jan 24, 2018

Ericson2314 commented Jan 24, 2018 •

edited

grahamc commented Jan 24, 2018

GrahamcOfBorg left a comment

GrahamcOfBorg left a comment

dtzWill commented Jan 24, 2018

GrahamcOfBorg left a comment

Ericson2314 commented Jan 25, 2018

dtzWill commented Feb 1, 2018

Mic92 commented Feb 10, 2018

GrahamcOfBorg commented Feb 10, 2018

GrahamcOfBorg commented Feb 10, 2018

GrahamcOfBorg commented Feb 10, 2018

busybox: bump copybuf, disable utmp/wtmp when not supported (musl) #34207

busybox: bump copybuf, disable utmp/wtmp when not supported (musl) #34207

Conversation

dtzWill commented Jan 23, 2018

Ericson2314 Jan 23, 2018 • edited

Choose a reason for hiding this comment

Ericson2314 Jan 23, 2018

Choose a reason for hiding this comment

dtzWill Jan 24, 2018

Choose a reason for hiding this comment

dtzWill commented Jan 24, 2018

Ericson2314 commented Jan 24, 2018 • edited

grahamc commented Jan 24, 2018

GrahamcOfBorg left a comment

Choose a reason for hiding this comment

GrahamcOfBorg left a comment

Choose a reason for hiding this comment

dtzWill commented Jan 24, 2018

GrahamcOfBorg left a comment

Choose a reason for hiding this comment

Ericson2314 commented Jan 25, 2018

dtzWill commented Feb 1, 2018

Mic92 commented Feb 10, 2018

GrahamcOfBorg commented Feb 10, 2018

GrahamcOfBorg commented Feb 10, 2018

GrahamcOfBorg commented Feb 10, 2018

Ericson2314 Jan 23, 2018 •

edited

Ericson2314 commented Jan 24, 2018 •

edited