linuxManualConfig: Fix build on non-modular kernels
This commit is contained in:
parent
81081ba670
commit
7ce1f0b8ae
|
@ -155,14 +155,13 @@ let
|
||||||
if platform.kernelTarget == "zImage" || platform.kernelTarget == "Image.gz" then "zinstall" else
|
if platform.kernelTarget == "zImage" || platform.kernelTarget == "Image.gz" then "zinstall" else
|
||||||
"install") ];
|
"install") ];
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = (optionalString installsFirmware ''
|
||||||
mkdir -p $dev
|
|
||||||
cp vmlinux $dev/
|
|
||||||
'' + (optionalString installsFirmware ''
|
|
||||||
mkdir -p $out/lib/firmware
|
mkdir -p $out/lib/firmware
|
||||||
'') + (if (platform ? kernelDTB && platform.kernelDTB) then ''
|
'') + (if (platform ? kernelDTB && platform.kernelDTB) then ''
|
||||||
make $makeFlags "''${makeFlagsArray[@]}" dtbs dtbs_install INSTALL_DTBS_PATH=$out/dtbs
|
make $makeFlags "''${makeFlagsArray[@]}" dtbs dtbs_install INSTALL_DTBS_PATH=$out/dtbs
|
||||||
'' else "") + (if isModular then ''
|
'' else "") + (if isModular then ''
|
||||||
|
mkdir -p $dev
|
||||||
|
cp vmlinux $dev/
|
||||||
if [ -z "$dontStrip" ]; then
|
if [ -z "$dontStrip" ]; then
|
||||||
installFlagsArray+=("INSTALL_MOD_STRIP=1")
|
installFlagsArray+=("INSTALL_MOD_STRIP=1")
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -13331,7 +13331,7 @@ with pkgs;
|
||||||
linux_samus_latest = linuxPackages_samus_latest.kernel;
|
linux_samus_latest = linuxPackages_samus_latest.kernel;
|
||||||
|
|
||||||
# A function to build a manually-configured kernel
|
# A function to build a manually-configured kernel
|
||||||
linuxManualConfig = pkgs.buildLinux;
|
linuxManualConfig = makeOverridable (callPackage ../os-specific/linux/kernel/manual-config.nix {});
|
||||||
buildLinux = makeOverridable (callPackage ../os-specific/linux/kernel/generic.nix {});
|
buildLinux = makeOverridable (callPackage ../os-specific/linux/kernel/generic.nix {});
|
||||||
|
|
||||||
keyutils = callPackage ../os-specific/linux/keyutils { };
|
keyutils = callPackage ../os-specific/linux/keyutils { };
|
||||||
|
|
Loading…
Reference in a new issue