makeInitrd: don't assume uImage => arm

mips for example might use uImages too

+3 -2
+2 -1
pkgs/build-support/kernel/make-initrd.nix
··· 18 18 , prepend ? [] 19 19 , lib 20 20 , makeUInitrd ? stdenvNoCC.hostPlatform.platform.kernelTarget == "uImage" 21 + , uInitrdArch ? stdenvNoCC.hostPlatform.parsed.cpu.family 21 22 }: 22 23 let 23 24 # !!! Move this into a public lib function, it is probably useful for others ··· 25 26 lib.concatStringsSep "-" (filter (x: !(isList x)) (split "[^a-zA-Z0-9_=.?-]+" x)); 26 27 27 28 in stdenvNoCC.mkDerivation rec { 28 - inherit name makeUInitrd; 29 + inherit name makeUInitrd uInitrdArch; 29 30 30 31 builder = ./make-initrd.sh; 31 32
+1 -1
pkgs/build-support/kernel/make-initrd.sh
··· 44 44 45 45 if [ -n "$makeUInitrd" ]; then 46 46 mv $out/initrd $out/initrd.gz 47 - mkimage -A arm -O linux -T ramdisk -C gzip -d $out/initrd.gz $out/initrd 47 + mkimage -A $uInitrdArch -O linux -T ramdisk -C gzip -d $out/initrd.gz $out/initrd 48 48 fi