diff options
| author | Artturi <Artturin@artturin.com> | 2023-09-30 10:45:36 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-30 10:45:36 +0300 |
| commit | bf25d8782bc6b488e06636d22dcf2dda6b1d5e3e (patch) | |
| tree | c0533afc566bb3106cb10af30682f43a38adfba6 | |
| parent | 6c681f121f81fa5d2c55181402ace5c317d686c4 (diff) | |
| parent | a97e8fc272782d69d94053bc434b9b6fef399a7b (diff) | |
| download | nixpkgs-bf25d8782bc6b488e06636d22dcf2dda6b1d5e3e.tar nixpkgs-bf25d8782bc6b488e06636d22dcf2dda6b1d5e3e.tar.gz nixpkgs-bf25d8782bc6b488e06636d22dcf2dda6b1d5e3e.tar.bz2 nixpkgs-bf25d8782bc6b488e06636d22dcf2dda6b1d5e3e.tar.lz nixpkgs-bf25d8782bc6b488e06636d22dcf2dda6b1d5e3e.tar.xz nixpkgs-bf25d8782bc6b488e06636d22dcf2dda6b1d5e3e.tar.zst nixpkgs-bf25d8782bc6b488e06636d22dcf2dda6b1d5e3e.zip | |
Merge pull request #249069 from amjoseph-nixpkgs/pr/lib/systems/ubootArch
lib.systems: add ubootArch
| -rw-r--r-- | lib/systems/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/build-support/kernel/make-initrd-ng.nix | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lib/systems/default.nix b/lib/systems/default.nix index 94dd52534aa..2790ea08d97 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -178,6 +178,12 @@ rec { else if final.isLoongArch64 then "loongarch" else final.parsed.cpu.name; + # https://source.denx.de/u-boot/u-boot/-/blob/9bfb567e5f1bfe7de8eb41f8c6d00f49d2b9a426/common/image.c#L81-106 + ubootArch = + if final.isx86_32 then "x86" # not i386 + else if final.isMips64 then "mips64" # uboot *does* distinguish between mips32/mips64 + else final.linuxArch; # other cases appear to agree with linuxArch + qemuArch = if final.isAarch32 then "arm" else if final.isS390 && !final.isS390x then null diff --git a/pkgs/build-support/kernel/make-initrd-ng.nix b/pkgs/build-support/kernel/make-initrd-ng.nix index 2418838176e..f2f7aaa6d1b 100644 --- a/pkgs/build-support/kernel/make-initrd-ng.nix +++ b/pkgs/build-support/kernel/make-initrd-ng.nix @@ -54,7 +54,7 @@ in # guess may not align with u-boot's nomenclature correctly, so it can # be overridden. # See https://gitlab.denx.de/u-boot/u-boot/-/blob/9bfb567e5f1bfe7de8eb41f8c6d00f49d2b9a426/common/image.c#L81-106 for a list. -, uInitrdArch ? stdenvNoCC.hostPlatform.linuxArch +, uInitrdArch ? stdenvNoCC.hostPlatform.ubootArch # The name of the compression, as recognised by u-boot. # See https://gitlab.denx.de/u-boot/u-boot/-/blob/9bfb567e5f1bfe7de8eb41f8c6d00f49d2b9a426/common/image.c#L195-204 for a list. |