Skip to content
Browse files

Implement generic kernel build via manual-config

This has three major benefits:

1. We no longer have two kernel build processes to maintain

2. The build process is (IMO) cleaner and cleaves more closely to
upstream. In partuclar, we use make install to install the kernel and
development source/build trees, eliminating the guesswork about which
files to copy.

3. The derivation has multiple outputs: the kernel and modules are in
the default `out' output, while the build and source trees are in a
`dev' output. This makes it possible for the full source and build tree
to be kept (which is expected by out-of-tree modules) without bloating
the closure of the system derivation.

In addition, if a solution for how to handle queries in the presence of
imports from derivations ever makes it into nix, a framework for
querying the full configuration of the kernel in nix expressions is
already in place.

Signed-off-by: Shea Levy <shea@shealevy.com>
  • Loading branch information...
1 parent df82dd0 commit 39c3f49905f9fc7bcc63e42ea49af193f278eb06 @shlevy shlevy committed Mar 25, 2013
View
156 pkgs/os-specific/linux/kernel/builder.sh
@@ -1,156 +0,0 @@
-source $stdenv/setup
-
-
-makeFlags="ARCH=$arch SHELL=/bin/sh"
-if [ -n "$crossConfig" ]; then
- makeFlags="$makeFlags CROSS_COMPILE=$crossConfig-"
-fi
-
-postPatch() {
- # Makefiles are full of /bin/pwd, /bin/false, /bin/bash, etc.
- # Patch these away, assuming the tools are in $PATH.
- for mf in $(find -name Makefile); do
- echo "stripping FHS paths in \`$mf'..."
- sed -i "$mf" -e 's|/usr/bin/||g ; s|/bin/||g'
- done
-}
-
-configurePhase() {
- if test -n "$preConfigure"; then
- eval "$preConfigure";
- fi
-
- export INSTALL_PATH=$out
- export INSTALL_MOD_PATH=$out
-
-
- # Set our own localversion, if specified.
- rm -f localversion*
- if test -n "$localVersion"; then
- echo "$localVersion" > localversion-nix
- fi
-
-
- # Patch kconfig to print "###" after every question so that
- # generate-config.pl can answer them.
- sed -e '/fflush(stdout);/i\printf("###");' -i scripts/kconfig/conf.c
-
- # Get a basic config file for later refinement with $generateConfig.
- make $kernelBaseConfig ARCH=$arch
-
- # Create the config file.
- echo "generating kernel configuration..."
- echo "$kernelConfig" > kernel-config
- DEBUG=1 ARCH=$arch KERNEL_CONFIG=kernel-config AUTO_MODULES=$autoModules \
- perl -w $generateConfig
-}
-
-
-installPhase() {
-
- mkdir -p $out
-
- # New kernel versions have a combined tree for i386 and x86_64.
- archDir=$arch
- if test -e arch/x86 -a \( "$arch" = i386 -o "$arch" = x86_64 \); then
- archDir=x86
- fi
-
-
- # Copy the bzImage and System.map.
- cp System.map $out
- if test "$arch" = um; then
- mkdir -p $out/bin
- cp linux $out/bin
- elif test "$kernelTarget" != "vmlinux"; then
- # In any case we copy the 'vmlinux' ELF in the next lines
- cp arch/$archDir/boot/$kernelTarget $out
- fi
-
- cp vmlinux $out
-
- if grep -q "CONFIG_MODULES=y" .config; then
- # Install the modules in $out/lib/modules with matching paths
- # in modules.dep (i.e., refererring to $out/lib/modules, not
- # /lib/modules). The depmod_opts= is to prevent the kernel
- # from passing `-b PATH' to depmod.
- export MODULE_DIR=$out/lib/modules/
- substituteInPlace Makefile --replace '-b $(INSTALL_MOD_PATH)' ''
- make modules_install \
- DEPMOD=$module_init_tools/sbin/depmod depmod_opts= \
- $makeFlags "${makeFlagsArray[@]}" \
- $installFlags "${installFlagsArray[@]}"
-
- if test -z "$dontStrip"; then
- # Strip the kernel modules.
- echo "Stripping kernel modules..."
- if [ -z "$crossConfig" ]; then
- find $out -name "*.ko" -print0 | xargs -0 strip -S
- else
- find $out -name "*.ko" -print0 | xargs -0 $crossConfig-strip -S
- fi
- fi
-
- # move this to install later on
- # largely copied from early FC3 kernel spec files
- version=$(cd $out/lib/modules && ls -d *)
-
- # remove symlinks and create directories
- rm -f $out/lib/modules/$version/build
- rm -f $out/lib/modules/$version/source
- mkdir $out/lib/modules/$version/build
-
- # copy config
- cp .config $out/lib/modules/$version/build/.config
- ln -s $out/lib/modules/$version/build/.config $out/config
-
- if test "$arch" != um; then
- # copy all Makefiles and Kconfig files
- ln -s $out/lib/modules/$version/build $out/lib/modules/$version/source
- cp --parents `find -type f -name Makefile -o -name "Kconfig*"` $out/lib/modules/$version/build
- cp Module.symvers $out/lib/modules/$version/build
-
- if test "$dontStrip" = "1"; then
- # copy any debugging info that can be found
- cp --parents -rv `find -name \*.debug -o -name debug.a` \
- "$out/lib/modules/$version/build"
- fi
-
- # weed out unneeded stuff
- rm -rf $out/lib/modules/$version/build/Documentation
- rm -rf $out/lib/modules/$version/build/scripts
- rm -rf $out/lib/modules/$version/build/include
-
- # copy architecture dependent files
- cp -a arch/$archDir/scripts $out/lib/modules/$version/build/ || true
- cp -a arch/$archDir/*lds $out/lib/modules/$version/build/ || true
- cp -a arch/$archDir/Makefile*.cpu $out/lib/modules/$version/build/arch/$archDir/ || true
- cp -a --parents arch/$archDir/kernel/asm-offsets.s $out/lib/modules/$version/build/arch/$archDir/kernel/ || true
-
- # copy scripts
- rm -f scripts/*.o
- rm -f scripts/*/*.o
- cp -a scripts $out/lib/modules/$version/build
-
- # copy include files
- includeDir=$out/lib/modules/$version/build/include
- mkdir -p $includeDir
- (cd include && cp -a * $includeDir)
- (cd arch/$archDir/include && cp -a * $includeDir || true)
- (cd arch/$archDir/include && cp -a asm/* $includeDir/asm/ || true)
- (cd arch/$archDir/include && cp -a generated/asm/* $includeDir/asm/ || true)
- (cd arch/$archDir/include/asm/mach-generic && cp -a * $includeDir/ || true)
- # include files for special arm architectures
- if [ "$archDir" == "arm" ]; then
- cp -a --parents arch/arm/mach-*/include $out/lib/modules/$version/build
- fi
- fi
- fi
-
- if test -n "$postInstall"; then
- eval "$postInstall";
- fi
-}
-
-
-genericBuild
View
5 pkgs/os-specific/linux/kernel/generate-config.pl
@@ -11,6 +11,9 @@
use strict;
use IPC::Open2;
+use Cwd;
+
+my $wd = getcwd;
my $debug = $ENV{'DEBUG'};
my $autoModules = $ENV{'AUTO_MODULES'};
@@ -36,7 +39,7 @@
sub runConfig {
# Run `make config'.
- my $pid = open2(\*IN, \*OUT, "make config SHELL=bash ARCH=$ENV{ARCH}");
+ my $pid = open2(\*IN, \*OUT, "make -C $ENV{SRC} O=$wd config SHELL=bash ARCH=$ENV{ARCH}");
# Parse the output, look for questions and then send an
# appropriate answer.
View
153 pkgs/os-specific/linux/kernel/generic.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, mktemp, module_init_tools
+{ stdenv, perl, linuxManualConfig
, # The kernel source tarball.
src
@@ -27,20 +27,7 @@
# optionally be compressed with gzip or bzip2.
kernelPatches ? []
-, # Allows you to set your own kernel version suffix (e.g.,
- # "-my-kernel").
- localVersion ? ""
-
-, preConfigure ? ""
, extraMeta ? {}
-, ubootChooser ? null
-, postInstall ? ""
-
-, # After the builder did a 'make all' (kernel + modules)
- # we force building the target asked: bzImage/zImage/uImage/...
- postBuild ? "make $makeFlags $kernelTarget; make $makeFlags -C scripts unifdef"
-
-, extraNativeBuildInputs ? []
, ...
}:
@@ -59,88 +46,72 @@ let
map ({extraConfig ? "", ...}: extraConfig) kernelPatches;
in lib.concatStringsSep "\n" ([baseConfig] ++ configFromPatches);
-in
+ configfile = stdenv.mkDerivation {
+ name = "linux-config-${version}";
+
+ generateConfig = ./generate-config.pl;
+
+ kernelConfig = kernelConfigFun config;
+
+ # For UML and non-PC, just ignore all options that don't apply (We are lazy).
+ ignoreConfigErrors = stdenv.platform.name != "pc";
+
+ nativeBuildInputs = [ perl ];
+
+ platformName = stdenv.platform.name;
+ kernelBaseConfig = stdenv.platform.kernelBaseConfig;
+ kernelTarget = stdenv.platform.kernelTarget;
+ autoModules = stdenv.platform.kernelAutoModules;
+ arch = stdenv.platform.kernelArch;
+
+ crossAttrs = let
+ cp = stdenv.cross.platform;
+ in {
+ arch = cp.kernelArch;
+ platformName = cp.name;
+ kernelBaseConfig = cp.kernelBaseConfig;
+ kernelTarget = cp.kernelTarget;
+ autoModules = cp.kernelAutoModules;
+
+ # Just ignore all options that don't apply (We are lazy).
+ ignoreConfigErrors = true;
-stdenv.mkDerivation {
- name = "linux-${version}";
+ kernelConfig = kernelConfigFun configCross;
+ };
- enableParallelBuilding = true;
+ buildCommand = ''
+ # Get a basic config file for later refinement with $generateConfig.
+ make -C ${kernel.sourceRoot} O=$PWD $kernelBaseConfig ARCH=$arch
+
+ # Create the config file.
+ echo "generating kernel configuration..."
+ echo "$kernelConfig" > kernel-config
+ DEBUG=1 ARCH=$arch KERNEL_CONFIG=kernel-config AUTO_MODULES=$autoModules \
+ SRC=${kernel.sourceRoot} perl -w $generateConfig
+ mv .config $out
+ '';
+ };
+
+ kernel = linuxManualConfig {
+ inherit version modDirVersion src kernelPatches;
+
+ configfile = configfile.nativeDrv or configfile;
+
+ crossConfigfile = configfile.crossDrv or configfile;
+
+ config = { CONFIG_MODULES = "y"; CONFIG_FW_LOADER = "m"; };
+
+ crossConfig = { CONFIG_MODULES = "y"; CONFIG_FW_LOADER = "m"; };
+ };
passthru = {
- inherit version modDirVersion kernelPatches;
# Combine the `features' attribute sets of all the kernel patches.
- features = lib.fold (x: y: (if x ? features then x.features else {}) // y) features kernelPatches;
+ features = lib.fold (x: y: (x.features or {}) // y) features kernelPatches;
+
+ meta = kernel.meta // extraMeta;
};
- builder = ./builder.sh;
-
- generateConfig = ./generate-config.pl;
-
- inherit preConfigure src module_init_tools localVersion postInstall postBuild;
-
- patches = map (p: p.patch) kernelPatches;
-
- kernelConfig = kernelConfigFun config;
-
- # For UML and non-PC, just ignore all options that don't apply (We are lazy).
- ignoreConfigErrors = stdenv.platform.name != "pc";
-
- nativeBuildInputs = [ perl mktemp ] ++ extraNativeBuildInputs;
-
- buildInputs = lib.optional (stdenv.platform.uboot != null)
- (ubootChooser stdenv.platform.uboot);
-
- platformName = stdenv.platform.name;
- kernelBaseConfig = stdenv.platform.kernelBaseConfig;
- kernelTarget = stdenv.platform.kernelTarget;
- autoModules = stdenv.platform.kernelAutoModules;
-
- # Should we trust platform.kernelArch? We can only do
- # that once we differentiate i686/x86_64 in platforms.
- arch =
- if stdenv.system == "i686-linux" then "i386" else
- if stdenv.system == "x86_64-linux" then "x86_64" else
- if stdenv.isArm then "arm" else
- if stdenv.system == "mips64el-linux" then "mips" else
- abort "Platform ${stdenv.system} is not supported.";
-
- crossAttrs = let
- cp = stdenv.cross.platform;
- in
- assert cp.name == "sheevaplug" -> cp.uboot != null;
- {
- arch = cp.kernelArch;
- platformName = cp.name;
- kernelBaseConfig = cp.kernelBaseConfig;
- kernelTarget = cp.kernelTarget;
- autoModules = cp.kernelAutoModules;
-
- # Just ignore all options that don't apply (We are lazy).
- ignoreConfigErrors = true;
-
- kernelConfig = kernelConfigFun configCross;
-
- # The substitution of crossAttrs happens *after* the stdenv cross adapter sets
- # the parameters for the usual stdenv. Thus, we need to specify
- # the ".crossDrv" in the buildInputs here.
- buildInputs = lib.optional (cp.uboot != null) (ubootChooser cp.uboot).crossDrv;
- };
-
- meta = {
- description =
- "The Linux kernel" +
- (if kernelPatches == [] then "" else
- " (with patches: "
- + lib.concatStrings (lib.intersperse ", " (map (x: x.name) kernelPatches))
- + ")");
- inherit version;
- license = "GPLv2";
- homepage = http://www.kernel.org/;
- maintainers = [
- lib.maintainers.eelco
- lib.maintainers.chaoflow
- ];
- platforms = lib.platforms.linux;
- } // extraMeta;
-}
+ nativeDrv = lib.addPassthru kernel.nativeDrv passthru;
+ crossDrv = lib.addPassthru kernel.crossDrv passthru;
+in if kernel ? crossDrv then nativeDrv // { inherit nativeDrv crossDrv; } else lib.addPassthru kernel passthru
View
5 pkgs/os-specific/linux/kernel/linux-2.6.15.nix
@@ -33,16 +33,15 @@ in
import ./generic.nix (rec {
version = "2.6.15.7";
- postBuild = "make $makeFlags $kernelTarget";
src = fetchurl {
url = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${version}.tar.bz2";
- sha256 = "43e0c251924324749b06464512532c3002d6294520faabdba5b3aea4e840b48b";
+ sha256 = "43e0c251924324749b06464512532c3002d6294520faabdba5b3aea4e840b48b";
};
config = configWithPlatform stdenv.platform;
configCross = configWithPlatform stdenv.cross.platform;
}
// removeAttrs args ["extraConfig"]
-)
+)
View
8 pkgs/os-specific/linux/kernel/linux-3.0.nix
@@ -1,6 +1,4 @@
-args @ { stdenv, fetchurl, extraConfig ? ""
-, perl, mktemp, module_init_tools
-, ... }:
+args @ { stdenv, fetchurl, extraConfig ? "", ... }:
let
configWithPlatform = kernelPlatform :
@@ -232,10 +230,6 @@ import ./generic.nix (
rec {
version = "3.0.70";
- preConfigure = ''
- substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
- '';
-
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
sha256 = "0hxb457mixpcq43dg0lnbkfdjnzqw4ajfcfkyyfgdzn5496li6va";
View
10 pkgs/os-specific/linux/kernel/linux-3.2.nix
@@ -1,6 +1,4 @@
-args @ { stdenv, fetchurl, extraConfig ? ""
-, perl, mktemp, module_init_tools
-, ... }:
+args @ { stdenv, fetchurl, extraConfig ? "", ... }:
let
configWithPlatform = kernelPlatform :
@@ -241,12 +239,6 @@ import ./generic.nix (
rec {
version = "3.2.41";
- modDirVersion = version;
-
- preConfigure = ''
- substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
- '';
-
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.0/linux-${version}.tar.xz";
sha256 = "0dwk0pg07kq5s4i8h0mzv4n3dc68hp0ayd1lqis3ix86m8qkhv4j";
View
8 pkgs/os-specific/linux/kernel/linux-3.4.nix
@@ -1,6 +1,4 @@
-args @ { stdenv, fetchurl, extraConfig ? ""
-, perl, mktemp, module_init_tools
-, ... }:
+args @ { stdenv, fetchurl, extraConfig ? "", ... }:
let
configWithPlatform = kernelPlatform :
@@ -247,10 +245,6 @@ import ./generic.nix (
version = "3.4.37";
testing = false;
- preConfigure = ''
- substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
- '';
-
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
sha256 = "0f7gbspi28a29vvvv0x2818pwhyjry4wzdm5d1nknf3a0cdi8an7";
View
8 pkgs/os-specific/linux/kernel/linux-3.7.nix
@@ -1,6 +1,4 @@
-args @ { stdenv, fetchurl, extraConfig ? ""
-, perl, mktemp, module_init_tools
-, ... }:
+args @ { stdenv, fetchurl, extraConfig ? "", ... }:
let
configWithPlatform = kernelPlatform :
@@ -254,10 +252,6 @@ import ./generic.nix (
version = "3.7.10";
testing = false;
- preConfigure = ''
- substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
- '';
-
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
sha256 = "1l8b40z95ahc2v9babmhrbi8jn2bhwkapq0libq0z21iipqsya4v";
View
8 pkgs/os-specific/linux/kernel/linux-3.8.nix
@@ -1,6 +1,4 @@
-args @ { stdenv, fetchurl, extraConfig ? ""
-, perl, mktemp, module_init_tools
-, ... }:
+args @ { stdenv, fetchurl, extraConfig ? "", ... }:
let
configWithPlatform = kernelPlatform :
@@ -254,10 +252,6 @@ import ./generic.nix (
version = "3.8.4";
testing = false;
- preConfigure = ''
- substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
- '';
-
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
sha256 = "0sxh4nwmj49n9l0rnfpgvgvgxx47mdfmpg5syvn854zfb5sv0fvy";
View
10 pkgs/os-specific/linux/kernel/linux-3.9.nix
@@ -1,6 +1,4 @@
-args @ { stdenv, fetchurl, extraConfig ? ""
-, perl, mktemp, module_init_tools, bc
-, ... }:
+args @ { stdenv, fetchurl, extraConfig ? "", ... }:
let
configWithPlatform = kernelPlatform :
@@ -255,10 +253,6 @@ import ./generic.nix (
modDirVersion = "3.9.0-rc3";
testing = true;
- preConfigure = ''
- substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
- '';
-
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
sha256 = "1fbg952zzn6nkch2fpd1fzkwc6xsf66fnmkxrmc77yz8d29qddi5";
@@ -272,8 +266,6 @@ import ./generic.nix (
features.needsCifsUtils = true;
features.canDisableNetfilterConntrackHelpers = true;
features.netfilterRPFilter = true;
-
- extraNativeBuildInputs = [bc];
}
// removeAttrs args ["extraConfig"]
View
6 pkgs/os-specific/linux/kernel/linux-rpi-3.6.nix
@@ -1,5 +1,5 @@
args @ {
- stdenv, fetchurl, extraConfig ? "" , perl, mktemp, module_init_tools, ...
+ stdenv, fetchurl, extraConfig ? "", ...
}:
let
@@ -18,10 +18,6 @@ import ./generic.nix (
version = "3.6.y-${rev}";
testing = false;
- preConfigure = ''
- substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
- '';
-
src = fetchurl {
url = "https://api.github.com/repos/raspberrypi/linux/tarball/${rev}";
name = "linux-raspberrypi-${version}.tar.gz";
View
25 pkgs/os-specific/linux/kernel/manual-config.nix
@@ -158,6 +158,21 @@ let
"s|${sourceRoot}|$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-${sourceRoot.name}|g"
fi
'' else null;
+
+ meta = {
+ description =
+ "The Linux kernel" +
+ (if kernelPatches == [] then "" else
+ " (with patches: "
+ + stdenv.lib.concatStrings (stdenv.lib.intersperse ", " (map (x: x.name) kernelPatches))
+ + ")");
+ license = "GPLv2";
+ homepage = http://www.kernel.org/;
+ maintainers = [
+ stdenv.lib.maintainers.shlevy
+ ];
+ platforms = stdenv.lib.platforms.linux;
+ };
};
in
@@ -186,14 +201,4 @@ stdenv.mkDerivation ((drvAttrs config stdenv.platform (kernelPatches ++ nativeKe
# may be different from stdenv.platform.uboot)
buildInputs = optional (cp.uboot != null) (ubootChooser cp.uboot).crossDrv;
};
-
- meta = {
- description = "The Linux kernel";
- license = "GPLv2";
- homepage = http://www.kernel.org/;
- maintainers = [
- stdenv.lib.maintainers.shlevy
- ];
- platforms = stdenv.lib.platforms.linux;
- };
})
View
20 pkgs/top-level/all-packages.nix
@@ -5832,15 +5832,15 @@ let
kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { };
linux_2_6_15 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.15.nix) {
- inherit fetchurl perl mktemp module_init_tools;
+ inherit fetchurl perl linuxManualConfig;
stdenv = overrideInStdenv stdenv [ gcc34 gnumake381 ];
kernelPatches =
[ kernelPatches.cifs_timeout_2_6_15
];
};
linux_2_6_32 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.32.nix) {
- inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
+ inherit fetchurl stdenv perl linuxManualConfig;
kernelPatches =
[ kernelPatches.fbcondecor_2_6_31
kernelPatches.sec_perm_2_6_24
@@ -5852,7 +5852,7 @@ let
};
linux_2_6_35 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.35.nix) {
- inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
+ inherit fetchurl stdenv perl linuxManualConfig;
kernelPatches =
[ kernelPatches.fbcondecor_2_6_35
kernelPatches.sec_perm_2_6_24
@@ -5874,7 +5874,7 @@ let
};
linux_3_0 = makeOverridable (import ../os-specific/linux/kernel/linux-3.0.nix) {
- inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
+ inherit fetchurl stdenv perl linuxManualConfig;
kernelPatches =
[ #kernelPatches.fbcondecor_2_6_38
kernelPatches.sec_perm_2_6_24
@@ -5883,7 +5883,7 @@ let
};
linux_3_2 = makeOverridable (import ../os-specific/linux/kernel/linux-3.2.nix) {
- inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
+ inherit fetchurl stdenv perl linuxManualConfig;
kernelPatches =
[ #kernelPatches.fbcondecor_2_6_38
kernelPatches.sec_perm_2_6_24
@@ -5899,7 +5899,7 @@ let
};
linux_3_4 = makeOverridable (import ../os-specific/linux/kernel/linux-3.4.nix) {
- inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
+ inherit fetchurl stdenv perl linuxManualConfig;
kernelPatches =
[ #kernelPatches.fbcondecor_2_6_38
kernelPatches.sec_perm_2_6_24
@@ -5911,7 +5911,7 @@ let
};
linux_3_7 = makeOverridable (import ../os-specific/linux/kernel/linux-3.7.nix) {
- inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
+ inherit fetchurl stdenv perl linuxManualConfig;
kernelPatches =
[
kernelPatches.sec_perm_2_6_24
@@ -5924,11 +5924,11 @@ let
};
linux_3_6_rpi = makeOverridable (import ../os-specific/linux/kernel/linux-rpi-3.6.nix) {
- inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
+ inherit fetchurl stdenv perl linuxManualConfig;
};
linux_3_8 = makeOverridable (import ../os-specific/linux/kernel/linux-3.8.nix) {
- inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
+ inherit fetchurl stdenv perl linuxManualConfig;
kernelPatches =
[
kernelPatches.sec_perm_2_6_24
@@ -5941,7 +5941,7 @@ let
# low-priority because it is RC
linux_3_9 = lowPrio (makeOverridable (import ../os-specific/linux/kernel/linux-3.9.nix) {
- inherit fetchurl stdenv perl mktemp bc module_init_tools ubootChooser;
+ inherit fetchurl stdenv perl linuxManualConfig;
kernelPatches =
[
kernelPatches.sec_perm_2_6_24

0 comments on commit 39c3f49

Please sign in to comment.
Something went wrong with that request. Please try again.