public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

makeInitrd: don't assume uImage => arm

Browse Source 
mips for example might use uImages too
This commit is contained in:
Linus Heckemann
2020-12-17 11:10:37 +01:00
parent a343ff7e14
commit 85e0ae7827
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/build-support/kernel/make-initrd.nix
+2 -1
View File
@@ -18,6 +18,7 @@
, prepend ? [] , prepend ? []
, lib , lib
, makeUInitrd ? stdenvNoCC.hostPlatform.platform.kernelTarget == "uImage" , makeUInitrd ? stdenvNoCC.hostPlatform.platform.kernelTarget == "uImage"
, uInitrdArch ? stdenvNoCC.hostPlatform.parsed.cpu.family
}: }:
let let
# !!! Move this into a public lib function, it is probably useful for others # !!! 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)); lib.concatStringsSep "-" (filter (x: !(isList x)) (split "[^a-zA-Z0-9_=.?-]+" x));
in stdenvNoCC.mkDerivation rec { in stdenvNoCC.mkDerivation rec {
inherit name makeUInitrd; inherit name makeUInitrd uInitrdArch;
builder = ./make-initrd.sh; builder = ./make-initrd.sh;
pkgs/build-support/kernel/make-initrd.sh
+1 -1
View File
@@ -44,5 +44,5 @@ done
if [ -n "$makeUInitrd" ]; then if [ -n "$makeUInitrd" ]; then
mv $out/initrd $out/initrd.gz 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 fi