lol
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

bootstrap-tools-cross: Rename bootstrap file jobs to be more descriptive

Rename files in `bootstrap-files/` to match jobs in `make-bootstrap-tools-cross`.

Should make automating the bootstrap files easier.

```nix
$ nix repl --file ./pkgs/top-level/release-cross.nix
nix-repl> bootstrapTools
{ aarch64-unknown-linux-gnu = { ... }; aarch64-unknown-linux-musl = { ... }; armv5tel-unknown-linux-gnueabi = { ... }; armv6l-unknown-linux-gnueabihf = { ... }; armv6l-unknown-linux-musleabihf = { ... }; armv7l-unknown-linux-gnueabihf = { ... }; mips64el-unknown-linux-gnuabi64 = {... }; mips64el-unknown-linux-gnuabin32 = { ... }; mipsel-unknown-linux-gnu = { ... }; powerpc64le-unknown-linux-gnu = { ... }; riscv64-unknown-linux-gnu = { ... }; x86_64-unknown-linux-musl = { ... }; }
```

Additionally if non-linux bootstrap files are added to
`make-bootstrap-tools-cross` then there won't be any renaming needed.

Artturin 1270ef59 b56f06f3

+27 -27
pkgs/stdenv/linux/bootstrap-files/aarch64-musl.nix pkgs/stdenv/linux/bootstrap-files/aarch64-unknown-linux-musl.nix
pkgs/stdenv/linux/bootstrap-files/aarch64.nix pkgs/stdenv/linux/bootstrap-files/aarch64-unknown-linux-gnu.nix
pkgs/stdenv/linux/bootstrap-files/armv5tel.nix pkgs/stdenv/linux/bootstrap-files/armv5tel-unknown-linux-gnueabi.nix
pkgs/stdenv/linux/bootstrap-files/armv6l-musl.nix pkgs/stdenv/linux/bootstrap-files/armv6l-unknown-linux-musleabihf.nix
pkgs/stdenv/linux/bootstrap-files/armv6l.nix pkgs/stdenv/linux/bootstrap-files/armv6l-unknown-linux-gnueabihf.nix
pkgs/stdenv/linux/bootstrap-files/armv7l.nix pkgs/stdenv/linux/bootstrap-files/armv7l-unknown-linux-gnueabihf.nix
pkgs/stdenv/linux/bootstrap-files/i686.nix pkgs/stdenv/linux/bootstrap-files/i686-unknown-linux-gnu.nix
pkgs/stdenv/linux/bootstrap-files/mips64el-n32.nix pkgs/stdenv/linux/bootstrap-files/mips64el-unknown-linux-gnuabin32.nix
pkgs/stdenv/linux/bootstrap-files/mips64el.nix pkgs/stdenv/linux/bootstrap-files/mips64el-unknown-linux-gnuabi64.nix
pkgs/stdenv/linux/bootstrap-files/mipsel.nix pkgs/stdenv/linux/bootstrap-files/mipsel-unknown-linux-gnu.nix
pkgs/stdenv/linux/bootstrap-files/powerpc64le.nix pkgs/stdenv/linux/bootstrap-files/powerpc64le-unknown-linux-gnu.nix
pkgs/stdenv/linux/bootstrap-files/riscv64.nix pkgs/stdenv/linux/bootstrap-files/riscv64-unknown-linux-gnu.nix
pkgs/stdenv/linux/bootstrap-files/x86_64-musl.nix pkgs/stdenv/linux/bootstrap-files/x86_64-unknown-linux-musl.nix
+1 -1
pkgs/stdenv/linux/bootstrap-files/x86_64.nix pkgs/stdenv/linux/bootstrap-files/x86_64-unknown-linux-gnu.nix
··· 1 1 # Use busybox for i686-linux since it works on x86_64-linux as well. 2 - (import ./i686.nix) // 2 + (import ./i686-unknown-linux-gnu.nix) // 3 3 4 4 { 5 5 bootstrapTools = import <nix/fetchurl.nix> {
+14 -14
pkgs/stdenv/linux/default.nix
··· 59 59 , bootstrapFiles ? 60 60 let table = { 61 61 glibc = { 62 - i686-linux = import ./bootstrap-files/i686.nix; 63 - x86_64-linux = import ./bootstrap-files/x86_64.nix; 64 - armv5tel-linux = import ./bootstrap-files/armv5tel.nix; 65 - armv6l-linux = import ./bootstrap-files/armv6l.nix; 66 - armv7l-linux = import ./bootstrap-files/armv7l.nix; 67 - aarch64-linux = import ./bootstrap-files/aarch64.nix; 68 - mipsel-linux = import ./bootstrap-files/mipsel.nix; 62 + i686-linux = import ./bootstrap-files/i686-unknown-linux-gnu.nix; 63 + x86_64-linux = import ./bootstrap-files/x86_64-unknown-linux-gnu.nix; 64 + armv5tel-linux = import ./bootstrap-files/armv5tel-unknown-linux-gnueabi.nix; 65 + armv6l-linux = import ./bootstrap-files/armv6l-unknown-linux-gnueabihf.nix; 66 + armv7l-linux = import ./bootstrap-files/armv7l-unknown-linux-gnueabihf.nix; 67 + aarch64-linux = import ./bootstrap-files/aarch64-unknown-linux-gnu.nix; 68 + mipsel-linux = import ./bootstrap-files/mipsel-unknown-linux-gnu.nix; 69 69 mips64el-linux = import 70 70 (if localSystem.isMips64n32 71 - then ./bootstrap-files/mips64el-n32.nix 72 - else ./bootstrap-files/mips64el.nix); 73 - powerpc64le-linux = import ./bootstrap-files/powerpc64le.nix; 74 - riscv64-linux = import ./bootstrap-files/riscv64.nix; 71 + then ./bootstrap-files/mips64el-unknown-linux-gnuabin32.nix.nix 72 + else ./bootstrap-files/mips64el-unknown-linux-gnuabi64.nix); 73 + powerpc64le-linux = import ./bootstrap-files/powerpc64le-unknown-linux-gnu.nix; 74 + riscv64-linux = import ./bootstrap-files/riscv64-unknown-linux-gnu.nix; 75 75 }; 76 76 musl = { 77 - aarch64-linux = import ./bootstrap-files/aarch64-musl.nix; 78 - armv6l-linux = import ./bootstrap-files/armv6l-musl.nix; 79 - x86_64-linux = import ./bootstrap-files/x86_64-musl.nix; 77 + aarch64-linux = import ./bootstrap-files/aarch64-unknown-linux-musl.nix; 78 + armv6l-linux = import ./bootstrap-files/armv6l-unknown-linux-musleabihf.nix; 79 + x86_64-linux = import ./bootstrap-files/x86_64-unknown-linux-musl.nix; 80 80 }; 81 81 }; 82 82
+12 -12
pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
··· 15 15 # NOTE: Only add platforms for which there are files in `./bootstrap-files`. 16 16 # Sort following the sorting in `./default.nix` `bootstrapFiles` argument. 17 17 18 - armv5tel = sheevaplug; 19 - armv6l = raspberryPi; 20 - armv7l = armv7l-hf-multiplatform; 21 - aarch64 = aarch64-multiplatform; 22 - mipsel-linux-gnu = mipsel-linux-gnu; 23 - mips64el-linux-gnuabin32 = mips64el-linux-gnuabin32; 24 - mips64el-linux-gnuabi64 = mips64el-linux-gnuabi64; 25 - powerpc64le = powernv; 26 - riscv64 = riscv64; 18 + armv5tel-unknown-linux-gnueabi = sheevaplug; 19 + armv6l-unknown-linux-gnueabihf = raspberryPi; 20 + armv7l-unknown-linux-gnueabihf = armv7l-hf-multiplatform; 21 + aarch64-unknown-linux-gnu = aarch64-multiplatform; 22 + mipsel-unknown-linux-gnu = mipsel-linux-gnu; 23 + mips64el-unknown-linux-gnuabin32 = mips64el-linux-gnuabin32; 24 + mips64el-unknown-linux-gnuabi64 = mips64el-linux-gnuabi64; 25 + powerpc64le-unknown-linux-gnu = powernv; 26 + riscv64-unknown-linux-gnu = riscv64; 27 27 28 28 # musl 29 - aarch64-musl = aarch64-multiplatform-musl; 30 - armv6l-musl = muslpi; 31 - x86_64-musl = musl64; 29 + aarch64-unknown-linux-musl = aarch64-multiplatform-musl; 30 + armv6l-unknown-linux-musleabihf = muslpi; 31 + x86_64-unknown-linux-musl = musl64; 32 32 })