From 1270ef59e9aa2a2161c1e84779687a2c7a10c815 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sun, 1 Oct 2023 02:42:49 +0300 Subject: [PATCH] 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. --- ...ch64.nix => aarch64-unknown-linux-gnu.nix} | 0 ...usl.nix => aarch64-unknown-linux-musl.nix} | 0 ...nix => armv5tel-unknown-linux-gnueabi.nix} | 0 ...nix => armv6l-unknown-linux-gnueabihf.nix} | 0 ...ix => armv6l-unknown-linux-musleabihf.nix} | 0 ...nix => armv7l-unknown-linux-gnueabihf.nix} | 0 .../{i686.nix => i686-unknown-linux-gnu.nix} | 0 ...ix => mips64el-unknown-linux-gnuabi64.nix} | 0 ...x => mips64el-unknown-linux-gnuabin32.nix} | 0 ...ipsel.nix => mipsel-unknown-linux-gnu.nix} | 0 ....nix => powerpc64le-unknown-linux-gnu.nix} | 0 ...cv64.nix => riscv64-unknown-linux-gnu.nix} | 0 ...86_64.nix => x86_64-unknown-linux-gnu.nix} | 2 +- ...musl.nix => x86_64-unknown-linux-musl.nix} | 0 pkgs/stdenv/linux/default.nix | 28 +++++++++---------- .../linux/make-bootstrap-tools-cross.nix | 24 ++++++++-------- 16 files changed, 27 insertions(+), 27 deletions(-) rename pkgs/stdenv/linux/bootstrap-files/{aarch64.nix => aarch64-unknown-linux-gnu.nix} (100%) rename pkgs/stdenv/linux/bootstrap-files/{aarch64-musl.nix => aarch64-unknown-linux-musl.nix} (100%) rename pkgs/stdenv/linux/bootstrap-files/{armv5tel.nix => armv5tel-unknown-linux-gnueabi.nix} (100%) rename pkgs/stdenv/linux/bootstrap-files/{armv6l.nix => armv6l-unknown-linux-gnueabihf.nix} (100%) rename pkgs/stdenv/linux/bootstrap-files/{armv6l-musl.nix => armv6l-unknown-linux-musleabihf.nix} (100%) rename pkgs/stdenv/linux/bootstrap-files/{armv7l.nix => armv7l-unknown-linux-gnueabihf.nix} (100%) rename pkgs/stdenv/linux/bootstrap-files/{i686.nix => i686-unknown-linux-gnu.nix} (100%) rename pkgs/stdenv/linux/bootstrap-files/{mips64el.nix => mips64el-unknown-linux-gnuabi64.nix} (100%) rename pkgs/stdenv/linux/bootstrap-files/{mips64el-n32.nix => mips64el-unknown-linux-gnuabin32.nix} (100%) rename pkgs/stdenv/linux/bootstrap-files/{mipsel.nix => mipsel-unknown-linux-gnu.nix} (100%) rename pkgs/stdenv/linux/bootstrap-files/{powerpc64le.nix => powerpc64le-unknown-linux-gnu.nix} (100%) rename pkgs/stdenv/linux/bootstrap-files/{riscv64.nix => riscv64-unknown-linux-gnu.nix} (100%) rename pkgs/stdenv/linux/bootstrap-files/{x86_64.nix => x86_64-unknown-linux-gnu.nix} (88%) rename pkgs/stdenv/linux/bootstrap-files/{x86_64-musl.nix => x86_64-unknown-linux-musl.nix} (100%) diff --git a/pkgs/stdenv/linux/bootstrap-files/aarch64.nix b/pkgs/stdenv/linux/bootstrap-files/aarch64-unknown-linux-gnu.nix similarity index 100% rename from pkgs/stdenv/linux/bootstrap-files/aarch64.nix rename to pkgs/stdenv/linux/bootstrap-files/aarch64-unknown-linux-gnu.nix diff --git a/pkgs/stdenv/linux/bootstrap-files/aarch64-musl.nix b/pkgs/stdenv/linux/bootstrap-files/aarch64-unknown-linux-musl.nix similarity index 100% rename from pkgs/stdenv/linux/bootstrap-files/aarch64-musl.nix rename to pkgs/stdenv/linux/bootstrap-files/aarch64-unknown-linux-musl.nix diff --git a/pkgs/stdenv/linux/bootstrap-files/armv5tel.nix b/pkgs/stdenv/linux/bootstrap-files/armv5tel-unknown-linux-gnueabi.nix similarity index 100% rename from pkgs/stdenv/linux/bootstrap-files/armv5tel.nix rename to pkgs/stdenv/linux/bootstrap-files/armv5tel-unknown-linux-gnueabi.nix diff --git a/pkgs/stdenv/linux/bootstrap-files/armv6l.nix b/pkgs/stdenv/linux/bootstrap-files/armv6l-unknown-linux-gnueabihf.nix similarity index 100% rename from pkgs/stdenv/linux/bootstrap-files/armv6l.nix rename to pkgs/stdenv/linux/bootstrap-files/armv6l-unknown-linux-gnueabihf.nix diff --git a/pkgs/stdenv/linux/bootstrap-files/armv6l-musl.nix b/pkgs/stdenv/linux/bootstrap-files/armv6l-unknown-linux-musleabihf.nix similarity index 100% rename from pkgs/stdenv/linux/bootstrap-files/armv6l-musl.nix rename to pkgs/stdenv/linux/bootstrap-files/armv6l-unknown-linux-musleabihf.nix diff --git a/pkgs/stdenv/linux/bootstrap-files/armv7l.nix b/pkgs/stdenv/linux/bootstrap-files/armv7l-unknown-linux-gnueabihf.nix similarity index 100% rename from pkgs/stdenv/linux/bootstrap-files/armv7l.nix rename to pkgs/stdenv/linux/bootstrap-files/armv7l-unknown-linux-gnueabihf.nix diff --git a/pkgs/stdenv/linux/bootstrap-files/i686.nix b/pkgs/stdenv/linux/bootstrap-files/i686-unknown-linux-gnu.nix similarity index 100% rename from pkgs/stdenv/linux/bootstrap-files/i686.nix rename to pkgs/stdenv/linux/bootstrap-files/i686-unknown-linux-gnu.nix diff --git a/pkgs/stdenv/linux/bootstrap-files/mips64el.nix b/pkgs/stdenv/linux/bootstrap-files/mips64el-unknown-linux-gnuabi64.nix similarity index 100% rename from pkgs/stdenv/linux/bootstrap-files/mips64el.nix rename to pkgs/stdenv/linux/bootstrap-files/mips64el-unknown-linux-gnuabi64.nix diff --git a/pkgs/stdenv/linux/bootstrap-files/mips64el-n32.nix b/pkgs/stdenv/linux/bootstrap-files/mips64el-unknown-linux-gnuabin32.nix similarity index 100% rename from pkgs/stdenv/linux/bootstrap-files/mips64el-n32.nix rename to pkgs/stdenv/linux/bootstrap-files/mips64el-unknown-linux-gnuabin32.nix diff --git a/pkgs/stdenv/linux/bootstrap-files/mipsel.nix b/pkgs/stdenv/linux/bootstrap-files/mipsel-unknown-linux-gnu.nix similarity index 100% rename from pkgs/stdenv/linux/bootstrap-files/mipsel.nix rename to pkgs/stdenv/linux/bootstrap-files/mipsel-unknown-linux-gnu.nix diff --git a/pkgs/stdenv/linux/bootstrap-files/powerpc64le.nix b/pkgs/stdenv/linux/bootstrap-files/powerpc64le-unknown-linux-gnu.nix similarity index 100% rename from pkgs/stdenv/linux/bootstrap-files/powerpc64le.nix rename to pkgs/stdenv/linux/bootstrap-files/powerpc64le-unknown-linux-gnu.nix diff --git a/pkgs/stdenv/linux/bootstrap-files/riscv64.nix b/pkgs/stdenv/linux/bootstrap-files/riscv64-unknown-linux-gnu.nix similarity index 100% rename from pkgs/stdenv/linux/bootstrap-files/riscv64.nix rename to pkgs/stdenv/linux/bootstrap-files/riscv64-unknown-linux-gnu.nix diff --git a/pkgs/stdenv/linux/bootstrap-files/x86_64.nix b/pkgs/stdenv/linux/bootstrap-files/x86_64-unknown-linux-gnu.nix similarity index 88% rename from pkgs/stdenv/linux/bootstrap-files/x86_64.nix rename to pkgs/stdenv/linux/bootstrap-files/x86_64-unknown-linux-gnu.nix index bdfa98c89cb..1eefa4f3d6d 100644 --- a/pkgs/stdenv/linux/bootstrap-files/x86_64.nix +++ b/pkgs/stdenv/linux/bootstrap-files/x86_64-unknown-linux-gnu.nix @@ -1,5 +1,5 @@ # Use busybox for i686-linux since it works on x86_64-linux as well. -(import ./i686.nix) // +(import ./i686-unknown-linux-gnu.nix) // { bootstrapTools = import { diff --git a/pkgs/stdenv/linux/bootstrap-files/x86_64-musl.nix b/pkgs/stdenv/linux/bootstrap-files/x86_64-unknown-linux-musl.nix similarity index 100% rename from pkgs/stdenv/linux/bootstrap-files/x86_64-musl.nix rename to pkgs/stdenv/linux/bootstrap-files/x86_64-unknown-linux-musl.nix diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 34fffd36aa6..5c03312cc75 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -59,24 +59,24 @@ , bootstrapFiles ? let table = { glibc = { - i686-linux = import ./bootstrap-files/i686.nix; - x86_64-linux = import ./bootstrap-files/x86_64.nix; - armv5tel-linux = import ./bootstrap-files/armv5tel.nix; - armv6l-linux = import ./bootstrap-files/armv6l.nix; - armv7l-linux = import ./bootstrap-files/armv7l.nix; - aarch64-linux = import ./bootstrap-files/aarch64.nix; - mipsel-linux = import ./bootstrap-files/mipsel.nix; + i686-linux = import ./bootstrap-files/i686-unknown-linux-gnu.nix; + x86_64-linux = import ./bootstrap-files/x86_64-unknown-linux-gnu.nix; + armv5tel-linux = import ./bootstrap-files/armv5tel-unknown-linux-gnueabi.nix; + armv6l-linux = import ./bootstrap-files/armv6l-unknown-linux-gnueabihf.nix; + armv7l-linux = import ./bootstrap-files/armv7l-unknown-linux-gnueabihf.nix; + aarch64-linux = import ./bootstrap-files/aarch64-unknown-linux-gnu.nix; + mipsel-linux = import ./bootstrap-files/mipsel-unknown-linux-gnu.nix; mips64el-linux = import (if localSystem.isMips64n32 - then ./bootstrap-files/mips64el-n32.nix - else ./bootstrap-files/mips64el.nix); - powerpc64le-linux = import ./bootstrap-files/powerpc64le.nix; - riscv64-linux = import ./bootstrap-files/riscv64.nix; + then ./bootstrap-files/mips64el-unknown-linux-gnuabin32.nix.nix + else ./bootstrap-files/mips64el-unknown-linux-gnuabi64.nix); + powerpc64le-linux = import ./bootstrap-files/powerpc64le-unknown-linux-gnu.nix; + riscv64-linux = import ./bootstrap-files/riscv64-unknown-linux-gnu.nix; }; musl = { - aarch64-linux = import ./bootstrap-files/aarch64-musl.nix; - armv6l-linux = import ./bootstrap-files/armv6l-musl.nix; - x86_64-linux = import ./bootstrap-files/x86_64-musl.nix; + aarch64-linux = import ./bootstrap-files/aarch64-unknown-linux-musl.nix; + armv6l-linux = import ./bootstrap-files/armv6l-unknown-linux-musleabihf.nix; + x86_64-linux = import ./bootstrap-files/x86_64-unknown-linux-musl.nix; }; }; diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix index b5e1b6c7a47..124575af688 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix @@ -15,18 +15,18 @@ in lib.mapAttrs (n: make) (with lib.systems.examples; { # NOTE: Only add platforms for which there are files in `./bootstrap-files`. # Sort following the sorting in `./default.nix` `bootstrapFiles` argument. - armv5tel = sheevaplug; - armv6l = raspberryPi; - armv7l = armv7l-hf-multiplatform; - aarch64 = aarch64-multiplatform; - mipsel-linux-gnu = mipsel-linux-gnu; - mips64el-linux-gnuabin32 = mips64el-linux-gnuabin32; - mips64el-linux-gnuabi64 = mips64el-linux-gnuabi64; - powerpc64le = powernv; - riscv64 = riscv64; + armv5tel-unknown-linux-gnueabi = sheevaplug; + armv6l-unknown-linux-gnueabihf = raspberryPi; + armv7l-unknown-linux-gnueabihf = armv7l-hf-multiplatform; + aarch64-unknown-linux-gnu = aarch64-multiplatform; + mipsel-unknown-linux-gnu = mipsel-linux-gnu; + mips64el-unknown-linux-gnuabin32 = mips64el-linux-gnuabin32; + mips64el-unknown-linux-gnuabi64 = mips64el-linux-gnuabi64; + powerpc64le-unknown-linux-gnu = powernv; + riscv64-unknown-linux-gnu = riscv64; # musl - aarch64-musl = aarch64-multiplatform-musl; - armv6l-musl = muslpi; - x86_64-musl = musl64; + aarch64-unknown-linux-musl = aarch64-multiplatform-musl; + armv6l-unknown-linux-musleabihf = muslpi; + x86_64-unknown-linux-musl = musl64; })