Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Linux API headers to those of the default NixOS kernel #15449

Merged
merged 2 commits into from
May 16, 2016
Merged

Update Linux API headers to those of the default NixOS kernel #15449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c9750f5
linuxHeaders_4_4: init at 4.4.10
joachifm May 14, 2016
aa18837
linuxHeaders: linuxHeaders_3_18 -> linuxHeaders_4_4
joachifm May 14, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
71 changes: 71 additions & 0 deletions pkgs/os-specific/linux/kernel-headers/4.4.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
{ stdenv, fetchurl, perl, cross ? null }:

assert cross == null -> stdenv.isLinux;

let

version = "4.4.10";

kernelHeadersBaseConfig =
if cross == null
then stdenv.platform.kernelHeadersBaseConfig
else cross.platform.kernelHeadersBaseConfig;

in

stdenv.mkDerivation {
name = "linux-headers-${version}";

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1kpjvvd9q9wwr3314q5ymvxii4dv2d27295bzly225wlc552xhja";
};

targetConfig = if cross != null then cross.config else null;

platform =
if cross != null then cross.platform.kernelArch else
if stdenv.system == "i686-linux" then "i386" else
if stdenv.system == "x86_64-linux" then "x86_64" else
if stdenv.system == "powerpc-linux" then "powerpc" else
if stdenv.isArm then "arm" else
if stdenv.platform ? kernelArch then stdenv.platform.kernelArch else
abort "don't know what the kernel include directory is called for this platform";

buildInputs = [perl];

extraIncludeDirs =
if cross != null then
(if cross.arch == "powerpc" then ["ppc"] else [])
else if stdenv.system == "powerpc-linux" then ["ppc"] else [];

buildPhase = ''
if test -n "$targetConfig"; then
export ARCH=$platform
fi
make ${kernelHeadersBaseConfig} SHELL=bash
make mrproper headers_check SHELL=bash
'';

installPhase = ''
make INSTALL_HDR_PATH=$out headers_install

# Some builds (e.g. KVM) want a kernel.release.
mkdir -p $out/include/config
echo "${version}-default" > $out/include/config/kernel.release
'';

# !!! hacky
fixupPhase = ''
ln -s asm $out/include/asm-$platform
if test "$platform" = "i386" -o "$platform" = "x86_64"; then
ln -s asm $out/include/asm-x86
fi
'';

meta = with stdenv.lib; {
description = "Header files and scripts for Linux kernel";
license = licenses.gpl2;
platforms = platforms.linux;
};
}
6 changes: 4 additions & 2 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10569,18 +10569,20 @@ in

# -- Linux kernel expressions ------------------------------------------------

linuxHeaders = self.linuxHeaders_3_18;
linuxHeaders = self.linuxHeaders_4_4;

linuxHeaders24Cross = forceNativeDrv (callPackage ../os-specific/linux/kernel-headers/2.4.nix {
cross = assert crossSystem != null; crossSystem;
});

linuxHeaders26Cross = forceNativeDrv (callPackage ../os-specific/linux/kernel-headers/3.18.nix {
linuxHeaders26Cross = forceNativeDrv (callPackage ../os-specific/linux/kernel-headers/4.4.nix {
cross = assert crossSystem != null; crossSystem;
});

linuxHeaders_3_18 = callPackage ../os-specific/linux/kernel-headers/3.18.nix { };

linuxHeaders_4_4 = callPackage ../os-specific/linux/kernel-headers/4.4.nix { };

# We can choose:
linuxHeadersCrossChooser = ver : if ver == "2.4" then self.linuxHeaders24Cross
else if ver == "2.6" then self.linuxHeaders26Cross
Expand Down