diff options
| author | Linus Heckemann <git@sphalerite.org> | 2020-09-03 14:17:07 +0200 |
|---|---|---|
| committer | Linus Heckemann <git@sphalerite.org> | 2020-12-17 11:10:37 +0100 |
| commit | 85e0ae78276bf7259d75888df89386f4a04214b3 (patch) | |
| tree | e7eecc968db581dc9933177dfd0ebef2924127a2 /pkgs/build-support | |
| parent | a343ff7e1433130ac293e96bb04ea5dbe363fff1 (diff) | |
| download | nixlib-85e0ae78276bf7259d75888df89386f4a04214b3.tar nixlib-85e0ae78276bf7259d75888df89386f4a04214b3.tar.gz nixlib-85e0ae78276bf7259d75888df89386f4a04214b3.tar.bz2 nixlib-85e0ae78276bf7259d75888df89386f4a04214b3.tar.lz nixlib-85e0ae78276bf7259d75888df89386f4a04214b3.tar.xz nixlib-85e0ae78276bf7259d75888df89386f4a04214b3.tar.zst nixlib-85e0ae78276bf7259d75888df89386f4a04214b3.zip | |
makeInitrd: don't assume uImage => arm
mips for example might use uImages too
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/kernel/make-initrd.nix | 3 | ||||
| -rw-r--r-- | pkgs/build-support/kernel/make-initrd.sh | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/build-support/kernel/make-initrd.nix b/pkgs/build-support/kernel/make-initrd.nix index 3915335b8da8..f0a61d3476e8 100644 --- a/pkgs/build-support/kernel/make-initrd.nix +++ b/pkgs/build-support/kernel/make-initrd.nix @@ -18,6 +18,7 @@ , prepend ? [] , lib , makeUInitrd ? stdenvNoCC.hostPlatform.platform.kernelTarget == "uImage" +, uInitrdArch ? stdenvNoCC.hostPlatform.parsed.cpu.family }: let # !!! Move this into a public lib function, it is probably useful for others @@ -25,7 +26,7 @@ let lib.concatStringsSep "-" (filter (x: !(isList x)) (split "[^a-zA-Z0-9_=.?-]+" x)); in stdenvNoCC.mkDerivation rec { - inherit name makeUInitrd; + inherit name makeUInitrd uInitrdArch; builder = ./make-initrd.sh; diff --git a/pkgs/build-support/kernel/make-initrd.sh b/pkgs/build-support/kernel/make-initrd.sh index 0aeaedeb3724..822883a681f0 100644 --- a/pkgs/build-support/kernel/make-initrd.sh +++ b/pkgs/build-support/kernel/make-initrd.sh @@ -44,5 +44,5 @@ done if [ -n "$makeUInitrd" ]; then mv $out/initrd $out/initrd.gz - mkimage -A arm -O linux -T ramdisk -C gzip -d $out/initrd.gz $out/initrd + mkimage -A $uInitrdArch -O linux -T ramdisk -C gzip -d $out/initrd.gz $out/initrd fi |