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

Merge pull request #14784 from joachifm/kernelHeaders

Browse Source 
linuxPackages: remove kernelHeaders
This commit is contained in:
Joachim Fasting 2016-04-19 22:50:18 +02:00
commit e758611191
3 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/os-specific/linux/kernel-headers/default.nix
View File

@ -1,5 +1,7 @@
{ stdenv, kernel, perl }: { stdenv, kernel, perl }:
assert (!(kernel.features.grsecurity or false));
let let
baseBuildFlags = [ "INSTALL_HDR_PATH=$(out)" "headers_install" ]; baseBuildFlags = [ "INSTALL_HDR_PATH=$(out)" "headers_install" ];
in stdenv.mkDerivation { in stdenv.mkDerivation {

15
pkgs/os-specific/linux/klibc/default.nix
View File

@ -1,16 +1,15 @@
{ stdenv, fetchurl, kernelHeaders, kernel, perl }: { stdenv, fetchurl, linuxHeaders, perl }:
let let
version = "2.0.4";
commonMakeFlags = [ commonMakeFlags = [
"prefix=$(out)" "prefix=$(out)"
"SHLIBDIR=$(out)/lib" "SHLIBDIR=$(out)/lib"
]; ];
in in
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "klibc-${version}-${kernel.version}"; name = "klibc-${version}";
version = "2.0.4";
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/libs/klibc/2.0/klibc-${version}.tar.xz"; url = "mirror://kernel/linux/libs/klibc/2.0/klibc-${version}.tar.xz";
@ -23,13 +22,13 @@ stdenv.mkDerivation {
makeFlags = commonMakeFlags ++ [ makeFlags = commonMakeFlags ++ [
"KLIBCARCH=${stdenv.platform.kernelArch}" "KLIBCARCH=${stdenv.platform.kernelArch}"
"KLIBCKERNELSRC=${kernelHeaders}" "KLIBCKERNELSRC=${linuxHeaders}"
] ++ stdenv.lib.optional (stdenv.platform.kernelArch == "arm") "CONFIG_AEABI=y"; ] ++ stdenv.lib.optional (stdenv.platform.kernelArch == "arm") "CONFIG_AEABI=y";
crossAttrs = { crossAttrs = {
makeFlags = commonMakeFlags ++ [ makeFlags = commonMakeFlags ++ [
"KLIBCARCH=${stdenv.cross.platform.kernelArch}" "KLIBCARCH=${stdenv.cross.platform.kernelArch}"
"KLIBCKERNELSRC=${kernelHeaders.crossDrv}" "KLIBCKERNELSRC=${linuxHeaders.crossDrv}"
"CROSS_COMPILE=${stdenv.cross.config}-" "CROSS_COMPILE=${stdenv.cross.config}-"
] ++ stdenv.lib.optional (stdenv.cross.platform.kernelArch == "arm") "CONFIG_AEABI=y"; ] ++ stdenv.lib.optional (stdenv.cross.platform.kernelArch == "arm") "CONFIG_AEABI=y";
}; };
@ -41,7 +40,7 @@ stdenv.mkDerivation {
cp $(find $(find . -name static) -type f ! -name "*.g" -a ! -name ".*") $dir/ cp $(find $(find . -name static) -type f ! -name "*.g" -a ! -name ".*") $dir/
cp usr/dash/sh $dir/ cp usr/dash/sh $dir/
for file in ${kernelHeaders}/include/*; do for file in ${linuxHeaders}/include/*; do
ln -sv $file $out/lib/klibc/include ln -sv $file $out/lib/klibc/include
done done
''; '';

10
pkgs/top-level/all-packages.nix
View File

@ -10425,6 +10425,10 @@ in
kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { }; kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { };
klibc = callPackage ../os-specific/linux/klibc { };
klibcShrunk = lowPrio (callPackage ../os-specific/linux/klibc/shrunk.nix { });
linux_mptcp = callPackage ../os-specific/linux/kernel/linux-mptcp.nix { linux_mptcp = callPackage ../os-specific/linux/kernel/linux-mptcp.nix {
kernelPatches = [ kernelPatches.bridge_stp_helper ] kernelPatches = [ kernelPatches.bridge_stp_helper ]
++ lib.optionals ((platform.kernelArch or null) == "mips") ++ lib.optionals ((platform.kernelArch or null) == "mips")
@ -10670,12 +10674,6 @@ in
facetimehd = callPackage ../os-specific/linux/facetimehd { }; facetimehd = callPackage ../os-specific/linux/facetimehd { };
kernelHeaders = callPackage ../os-specific/linux/kernel-headers { };
klibc = callPackage ../os-specific/linux/klibc { };
klibcShrunk = lowPrio (callPackage ../os-specific/linux/klibc/shrunk.nix { });
jool = callPackage ../os-specific/linux/jool { }; jool = callPackage ../os-specific/linux/jool { };
mba6x_bl = callPackage ../os-specific/linux/mba6x_bl { }; mba6x_bl = callPackage ../os-specific/linux/mba6x_bl { };