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

kernel: Add deps for building 4.16

Browse Source
This commit is contained in:
Tuomas Tynkkynen 2018-02-15 18:27:25 +02:00
parent 7a7e8a8004
commit 64fa0d5b97
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/os-specific/linux/kernel/generic.nix
View File

@ -1,4 +1,4 @@
{ buildPackages, runCommand, nettools, bc, perl, gmp, libmpc, mpfr, openssl { buildPackages, runCommand, nettools, bc, bison, flex, perl, gmp, libmpc, mpfr, openssl
, ncurses , ncurses
, libelf , libelf
, utillinux , utillinux
@ -82,7 +82,8 @@ let
kernelConfig = kernelConfigFun config; kernelConfig = kernelConfigFun config;
depsBuildBuild = [ buildPackages.stdenv.cc ]; depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ perl ]; nativeBuildInputs = [ perl ]
++ lib.optionals (stdenv.lib.versionAtLeast version "4.16") [ bison flex ];
platformName = hostPlatform.platform.name; platformName = hostPlatform.platform.name;
# e.g. "defconfig" # e.g. "defconfig"

7
pkgs/os-specific/linux/kernel/manual-config.nix
View File

@ -1,4 +1,4 @@
{ buildPackages, runCommand, nettools, bc, perl, gmp, libmpc, mpfr, openssl { buildPackages, runCommand, nettools, bc, bison, flex, perl, gmp, libmpc, mpfr, openssl
, ncurses ? null , ncurses ? null
, libelf , libelf
, utillinux , utillinux
@ -41,10 +41,10 @@ in {
let let
inherit (stdenv.lib) inherit (stdenv.lib)
hasAttr getAttr optional optionalString optionalAttrs maintainers platforms; hasAttr getAttr optional optionals optionalString optionalAttrs maintainers platforms;
# Dependencies that are required to build kernel modules # Dependencies that are required to build kernel modules
moduleBuildDependencies = stdenv.lib.optional (stdenv.lib.versionAtLeast version "4.14") libelf; moduleBuildDependencies = optional (stdenv.lib.versionAtLeast version "4.14") libelf;
installkernel = writeTextFile { name = "installkernel"; executable=true; text = '' installkernel = writeTextFile { name = "installkernel"; executable=true; text = ''
#!${stdenv.shell} -e #!${stdenv.shell} -e
@ -262,6 +262,7 @@ stdenv.mkDerivation ((drvAttrs config hostPlatform.platform kernelPatches config
++ optional (stdenv.hostPlatform.platform.kernelTarget == "uImage") buildPackages.ubootTools ++ optional (stdenv.hostPlatform.platform.kernelTarget == "uImage") buildPackages.ubootTools
++ optional (stdenv.lib.versionAtLeast version "4.14") libelf ++ optional (stdenv.lib.versionAtLeast version "4.14") libelf
++ optional (stdenv.lib.versionAtLeast version "4.15") utillinux ++ optional (stdenv.lib.versionAtLeast version "4.15") utillinux
++ optionals (stdenv.lib.versionAtLeast version "4.16") [ bison flex ]
; ;
hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" ]; hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" ];