Commit graph

573 commits

Author SHA1 Message Date
Shea Levy
839c58f5b1 linux/manual-config: Cleanup 2012-08-11 21:21:06 -04:00
Shea Levy
9ac776ab22 linux/manual-config.nix: Set sourceRoot directly to the pre-unpacked source rather than using a symlink 2012-08-11 21:07:37 -04:00
Shea Levy
0c18551c93 linux/manual-config: Do source unpacking/patching in a separate derivation.
Since we keep the source in the kernel build anyway, no space is wasted by having a separate store path for the unpacked source. The upside is that the same source can be used to build the kernel multiple times, or generate configurations for later kernel builds, without going through the (fairly long) unpack and patch process multiple times.
2012-08-11 21:02:30 -04:00
Eelco Dolstra
e69a6c57bc linux: Update to 3.2.27 2012-08-10 18:54:10 -04:00
Lluís Batlle i Rossell
691d069af9 perf: make it take the linux patches
Otherwise the previous patch I added does not get used for perf.
2012-08-10 10:03:53 +02:00
Lluís Batlle i Rossell
734bb84f09 linux-3.5: fix perf build with a patch from the perf mailing list 2012-08-10 09:41:43 +02:00
Mathijs Kwik
cbb2c3abf2 linux-3.5: upgrade to 3.5.1 2012-08-10 08:27:09 +02:00
Shea Levy
21a200d6b2 linux/manual-config: Fix depmod step, remove false comment 2012-08-07 06:36:50 -04:00
Eelco Dolstra
d6cc420fd7 linux: Update to 3.2.26 2012-08-06 09:57:21 -04:00
Mathijs Kwik
fb99c24d7c kernel-3.5: add aufs3 patch 2012-08-05 01:55:31 +02:00
Shea Levy
1935f7e5b8 linux/manual-config: Add informative comment 2012-08-03 08:33:31 -04:00
Shea Levy
1b7264d349 linux/manual-config.nix: When stripping, use xargs -r in case CONFIG_MODULES=y but no modules are actually installed 2012-08-01 23:32:02 -04:00
Shea Levy
4aba2bb3f5 linux/manual-config: Use kernelPatches like generic.nix, not a plain patches list 2012-08-01 23:02:17 -04:00
Shea Levy
fd330e9315 linux/manual-config: Install the kernel with the name given in stdenv.platform.kernelTarget 2012-08-01 15:39:49 -04:00
Shea Levy
ad49d92899 linux/manual-config: When installing firmware, create the firmware directory prior to make *_install.
It is probably a kernel build system bug that this is necessary, but it's not really a big deal either.
2012-08-01 11:56:12 -04:00
Shea Levy
3f4fd55c63 linux/manual-config: Remove unnecessary quotation 2012-08-01 11:26:30 -04:00
Shea Levy
443b9bc936 linux/kernel/manual-config: use isDisabled instead of isNo in case FIRMWARE_IN_KERNEL is left unspecified 2012-08-01 11:21:32 -04:00
Shea Levy
3dbfca0d7f linux/manual-config: Change from 'features' to 'config' and fix build when firmware is installed.
Instead of manually adding which 'features' a kernel has based on its config here, just generate a nixexpr representation of the whole config and let places that need it (e.g. NixOS modules) decide how to map config options to features.

Note that if your kernel requires firmware whose hex file sits directly in ${src}/firmware rather than in a subdirectory thereof, you may need this patch for now: https://lkml.org/lkml/2012/7/31/724
2012-08-01 06:18:03 -04:00
Mathijs Kwik
b5d4e8a17a linux-3.4: upgrade to 3.4.7 2012-07-31 10:26:18 +02:00
Shea Levy
da4c64026a linux/kernel/manual-config: Greatly simplify config parser 2012-07-29 15:54:31 -04:00
Shea Levy
298b5ccdab linux/kernel/manual-config: Only import from derivation when explicitly asked to 2012-07-29 13:26:39 -04:00
Shea Levy
f0694a3151 linux/kernel/manual-config: Do all of the config file parsing in the imported-from derivation 2012-07-29 13:24:05 -04:00
Shea Levy
6585646d41 linux/kernel/manual-config: Add meta 2012-07-29 04:59:38 -04:00
Shea Levy
46fa5ab105 linux/kernel/manual-config: Relink the symlink from the build directory to the source directory after the source directory is moved 2012-07-29 04:56:56 -04:00
Shea Levy
f7b6f01da1 linux/kernel/manual-config: Cleanup 2012-07-29 04:52:34 -04:00
Shea Levy
98341e0bda linux/kernel/manual-config: Use the kernel's make install 2012-07-29 04:48:50 -04:00
Shea Levy
a9a7085684 linux/kernel/manual-config: Allow manually specifying features, cleanup 2012-07-29 04:31:40 -04:00
Shea Levy
6bb20c7ba2 linux/kernel/manual-config: Strip modules after install 2012-07-29 04:23:28 -04:00
Shea Levy
6b18ab5365 linux/kernel/manual-config: Remove useless INSTALL_MOD_STRIP variable 2012-07-29 04:07:43 -04:00
Shea Levy
6e3b17feec linux/kernel/manual-config: Run depmod after build 2012-07-29 04:01:40 -04:00
Shea Levy
48b5e8eee7 linux/kernel/manual-config: Build in a separate directory and move the build and source trees into $out 2012-07-29 03:49:52 -04:00
Shea Levy
e42a6c5f46 linux/kernel/manual-config: Move the build directory to $out instead of symlinking it 2012-07-29 03:27:09 -04:00
Shea Levy
a36456ca25 linux/kernel-manual-config: Simplify the lines.nix runCommand now that I know how to escape properly 2012-07-29 03:09:44 -04:00
Shea Levy
5a9d9f4f45 linux/kernel/manual-config: Properly escape makeFlagsArray and installFlagsArray 2012-07-29 02:57:58 -04:00
Shea Levy
471b4bc9bb MODLIB needs to be passed directly to make 2012-07-29 02:49:31 -04:00
Shea Levy
aa40e0ff59 linux/kernel/manual-config: The default 'make install' tries to do something with LILO, so install the kernel manually 2012-07-29 01:57:59 -04:00
Shea Levy
dfa750732d linux/kernel/manual-config: Properly set env vars referencing $out 2012-07-29 01:34:27 -04:00
Shea Levy
ff728a6365 The kernel build needs hostname and perl 2012-07-29 01:29:56 -04:00
Shea Levy
bf7467cbb1 Add first attempt at linux/kernel/manual-config.
The goal of this function is to make it possible to build a kernel with a user provided .config.
As a secondary goal, it will extract NixOS-relevant features from the config automatically.
As a tertiary goal, the build will aim to be simpler than the current generic kernel builder.sh.

Unfortunately, that simplicity is offset by the complexity of the feature extraction, especially since nix segfaults when trying to split the file into lines (so an import from a derivation is used)
2012-07-29 01:23:51 -04:00
Eelco Dolstra
1b0abce6de linux: Update to 3.2.24 2012-07-26 11:32:53 -04:00
Shea Levy
8c9bef04a6 linux-3.5: Enable XEN_DOM0 support 2012-07-24 02:26:04 +00:00
Shea Levy
053f641d16 Add linux-3.5 2012-07-22 11:33:00 -04:00
Mathijs Kwik
f3b43a268d linux-3.4: update to 3.4.6 2012-07-20 13:37:46 +02:00
Shea Levy
d04cbc85cf linux-3.4: Update to 3.4.5 2012-07-16 20:26:27 -04:00
Eelco Dolstra
dc5ba23ab4 linux: Update to 3.2.23 2012-07-14 17:41:52 -04:00
Shea Levy
6bf409999f linux-3.4: Add the improved transaction scheduler for USB 2.0
This is needed for new Apple trackpads
2012-07-14 12:17:28 -04:00
Shea Levy
685acc6ef8 Linux 3.4: Enable options to make b43 work with bcm4331 2012-07-13 22:48:43 -04:00
Eelco Dolstra
0b07259865 linux: Update to 3.2.22 2012-07-10 09:18:12 -04:00
Peter Simons
82b2588e35 Linux no-xsave.patch: commit patch into Nixpkgs since fetchurl no longer works
Patch submitted by Jan Malakhovski <oxij@oxij.org>.
2012-07-02 16:53:53 +02:00
Lluís Batlle i Rossell
876ff45fd5 linux perf: Allowing perf to build with its gtk interface.
Disabled by default, it can be enabled using overrides.
2012-06-27 22:23:15 +02:00
Mathijs Kwik
f97a277efc linux kernel: 3.4.2 -> 3.4.4 2012-06-24 10:03:09 +02:00
Eelco Dolstra
023e8f2fb9 * Linux 3.2.21.
svn path=/nixpkgs/trunk/; revision=34570
2012-06-20 12:42:56 +00:00
Eelco Dolstra
6551b822af * Enable devtmpfs since recent udev (systemd) versions need it.
svn path=/nixpkgs/trunk/; revision=34565
2012-06-19 19:10:54 +00:00
Eelco Dolstra
1582276602 * Drop some old obsolete kernels and unused patches.
svn path=/nixpkgs/trunk/; revision=34558
2012-06-19 15:56:17 +00:00
Eelco Dolstra
cf6db2bbac * "powermanagement" is not a word.
svn path=/nixpkgs/trunk/; revision=34557
2012-06-19 15:01:49 +00:00
Lluís Batlle i Rossell
a5c2318d08 Fixing the mips patch for sigill fpu cases.
svn path=/nixpkgs/trunk/; revision=34527
2012-06-16 15:37:04 +00:00
Lluís Batlle i Rossell
3874e5812d Adding two kernel patches for mips, that make the life easier on loongson2f
(less sigill, less sigbus). Related to bad handling of FPU instructions.

I apply them only to linux 3.4, although I think they can apply to many older kernels too.


svn path=/nixpkgs/trunk/; revision=34522
2012-06-16 10:49:03 +00:00
Eelco Dolstra
4cfe058218 * Linux 3.2.20.
svn path=/nixpkgs/trunk/; revision=34486
2012-06-12 22:27:55 +00:00
Mathijs Kwik
3d4ab75229 linux kernel headers: copy generated headers as well
as they are referenced from other kernel headers, this seems like the
best thing to do. Ubuntu seems to do so too.

Fixes issues with nvidia's binary driver and bbswitch on kernels > 3.3

svn path=/nixpkgs/trunk/; revision=34469
2012-06-11 17:41:11 +00:00
Mathijs Kwik
46beccef20 linux kernel aufs (needed for livecd): added to 3.4
upgraded 3.3 version to stable

svn path=/nixpkgs/trunk/; revision=34468
2012-06-11 17:41:05 +00:00
Lluís Batlle i Rossell
1697485678 Updating linux 3.4.1 to 3.4.2
svn path=/nixpkgs/trunk/; revision=34423
2012-06-10 15:24:28 +00:00
Lluís Batlle i Rossell
9ebd661fb8 Updating linux 3.4 to 3.4.1
svn path=/nixpkgs/trunk/; revision=34411
2012-06-09 20:25:48 +00:00
Eelco Dolstra
dd6ab8d7bf * Linux 3.2.19.
svn path=/nixpkgs/trunk/; revision=34382
2012-06-08 13:11:38 +00:00
Lluís Batlle i Rossell
8805bf1ba5 'perf' wants flex and bison, since linux 3.4.
svn path=/nixpkgs/trunk/; revision=34210
2012-05-22 17:32:23 +00:00
Lluís Batlle i Rossell
5c393a469b Adding linux 3.4.
svn path=/nixpkgs/trunk/; revision=34209
2012-05-22 15:29:51 +00:00
Eelco Dolstra
690051abbc * Linux 3.2.18.
svn path=/nixpkgs/trunk/; revision=34198
2012-05-21 18:14:47 +00:00
Eelco Dolstra
da01b6db17 * Linux 3.2.17.
svn path=/nixpkgs/trunk/; revision=34073
2012-05-12 19:55:39 +00:00
Shea Levy
b64a1dac46 Linux 3.3.6
svn path=/nixpkgs/trunk/; revision=34070
2012-05-12 17:50:19 +00:00
Eelco Dolstra
196c30de9b * Linux 3.0.31.
svn path=/nixpkgs/trunk/; revision=34036
2012-05-09 21:49:39 +00:00
Shea Levy
829e78f78f Linux 3.3.5
svn path=/nixpkgs/trunk/; revision=34011
2012-05-07 22:24:35 +00:00
Shea Levy
497a4afe72 We no longer need the bootstub config patch
svn path=/nixpkgs/trunk/; revision=33987
2012-05-05 14:26:20 +00:00
Shea Levy
242e54dab6 Linux 3.3.4 (not compile tested, sorry
svn path=/nixpkgs/trunk/; revision=33956
2012-04-30 17:31:39 +00:00
Eelco Dolstra
7716976345 * Linux 3.2.16.
svn path=/nixpkgs/trunk/; revision=33908
2012-04-24 13:54:33 +00:00
Shea Levy
50a0b839af Linux 3.3.3
This incorporates the btrfs fix, so remove that patch. Also, I will test
that this builds after committing, and fix it if it fails

svn path=/nixpkgs/trunk/; revision=33885
2012-04-23 00:12:47 +00:00
Nicolas Pierron
82b308bf11 Add armv7l support.
svn path=/nixpkgs/trunk/; revision=33798
2012-04-15 23:41:25 +00:00
Eelco Dolstra
73d98c07c2 * Linux 3.2.15.
svn path=/nixpkgs/trunk/; revision=33794
2012-04-15 16:23:08 +00:00
Lluís Batlle i Rossell
8ebd53f45f Updating linux to 3.3.2
svn path=/nixpkgs/trunk/; revision=33779
2012-04-13 18:09:27 +00:00
Lluís Batlle i Rossell
b35d2c6b89 Adding a patch for linux 3.3 for btrfs regarding ENOSPC.
This should solve the problem I had, where I could not boot either 3.3 or 3.3.1
in my system, as I got ENOSPC all the time.


svn path=/nixpkgs/trunk/; revision=33714
2012-04-09 21:02:17 +00:00
Lluís Batlle i Rossell
5dfcf18801 Adding a minimal FTRACE to the 3.2 and 3.3 linux kernels, that should not
affect the kernel performance, but allow more tracing.


svn path=/nixpkgs/trunk/; revision=33713
2012-04-09 21:01:00 +00:00
Eelco Dolstra
8e160830c1 * Doh.
svn path=/nixpkgs/trunk/; revision=33620
2012-04-05 13:09:30 +00:00
Eelco Dolstra
9a1080d7ea * Enable NUMA. On our 48-core machines this cut the duration of a
kernel build from 12m27s to 4m42s.

svn path=/nixpkgs/trunk/; revision=33616
2012-04-05 12:26:13 +00:00
Shea Levy
8cd391b130 Whoops, don't need modDirVersion for 3.3.1
svn path=/nixpkgs/trunk/; revision=33547
2012-04-02 20:18:52 +00:00
Shea Levy
8585f4000b Linux 3.3.1
svn path=/nixpkgs/trunk/; revision=33546
2012-04-02 20:15:19 +00:00
Shea Levy
1e8dfa4e2c Linux 3.3 release
svn path=/nixpkgs/trunk/; revision=33260
2012-03-19 15:36:40 +00:00
Shea Levy
dfcd4dd559 Add a kernel patch for the efi boot stub to read a config file when booted without arguments, and base removable media booting off of that patch
The patch is currently being discussed on LKML and hopefully will be included
in mainline in some form in the future. Note that booting from the livecd has
to do a lot of work before anything is output to the console, so if the drive
is still busy don't assume the boot has hanged

svn path=/nixpkgs/trunk/; revision=33235
2012-03-18 17:14:52 +00:00
Eelco Dolstra
a3b099d279 * Latest 3.0.x, 3.1.x and 3.2.x kernels.
svn path=/nixpkgs/trunk/; revision=33151
2012-03-16 12:08:41 +00:00
Shea Levy
0845f6618c Add an 'efiBootStub' kernel feature to be used by NixOS
svn path=/nixpkgs/trunk/; revision=33137
2012-03-16 02:45:47 +00:00
Shea Levy
76832793f2 Linux 3.3-rc7
svn path=/nixpkgs/trunk/; revision=33007
2012-03-12 02:19:05 +00:00
Yury G. Kudryashov
38e3d7bc86 svn merge ^/nixpkgs/trunk
Not merged r32497 (tree conflict, glibc GNU Hurd update). Ludovic, could you
please look at this?

svn path=/nixpkgs/branches/stdenv-updates/; revision=32520
2012-02-23 20:06:21 +00:00
Peter Simons
1ee7c4250f linux-3.2.nix: updated to version 3.2.7
svn path=/nixpkgs/trunk/; revision=32517
2012-02-23 18:07:09 +00:00
Peter Simons
9db6840814 linux kernel 3.2 : added aufs patches
svn path=/nixpkgs/trunk/; revision=32483
2012-02-22 20:29:18 +00:00
Florian Friesdorf
77a8ea6fbd merge powertop kernel config into default kernel config
svn path=/nixpkgs/trunk/; revision=32472
2012-02-22 12:12:00 +00:00
Eelco Dolstra
0beb6c6266 * Remove some obsolete patches.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32379
2012-02-17 23:53:49 +00:00
Eelco Dolstra
eae4c3afab * Get rid of some old kernels that no longer compile.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32378
2012-02-17 23:47:00 +00:00
Eelco Dolstra
acee1c4e5a * Latest 2.6.27 and 2.6.32 kernels.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32376
2012-02-17 22:31:37 +00:00
Yury G. Kudryashov
5144a19987 svn merge ^/nixpkgs/trunk
There were a few merge conflicts due to ensureDir->mkdir -p migration

svn path=/nixpkgs/branches/stdenv-updates/; revision=32174
2012-02-10 10:24:30 +00:00
Arie Middelkoop
f1a6497357 Linux kernel 3.2.2 -> 3.2.4.
svn path=/nixpkgs/trunk/; revision=32096
2012-02-07 09:13:45 +00:00
Yury G. Kudryashov
3256c40575 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=31878
2012-01-27 11:48:58 +00:00
Arie Middelkoop
c4fdb28b80 Stable kernel 3.2.2 released today.
svn path=/nixpkgs/trunk/; revision=31874
2012-01-26 23:25:39 +00:00
Yury G. Kudryashov
5b132f6e96 svn merge ^/nixpkgs/trunk
Conflicts: cups, all-packages.nix (gcc45_debug)

svn path=/nixpkgs/branches/stdenv-updates/; revision=31863
2012-01-26 15:27:03 +00:00