Merge remote-tracking branch 'upstream/master' into HEAD

2017-08-17 18:34:17 +02:00
parent 9289365627 31eea73f99
commit 8f2ea38f8f
67 changed files with 1727 additions and 731 deletions
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -21,8 +21,8 @@ rec {
    enableMinimal = true;
    extraConfig = ''
      CONFIG_ASH y
-      CONFIG_ASH_BUILTIN_ECHO y
-      CONFIG_ASH_BUILTIN_TEST y
+      CONFIG_ASH_ECHO y
+      CONFIG_ASH_TEST y
      CONFIG_ASH_OPTIMIZE_FOR_SIZE y
      CONFIG_MKDIR y
      CONFIG_TAR y