Commit graph

887 commits

Author SHA1 Message Date
Shea Levy
baa5ebfbdf Linux 3.0.57 2012-12-17 17:43:02 -05:00
Shea Levy
55196223c7 Linux 3.4.24 2012-12-17 17:42:38 -05:00
Shea Levy
cc12516cf0 Linux 3.6.11 2012-12-17 17:33:44 -05:00
Lluís Batlle i Rossell
faf821e501 Adding USB cameras to linux 3.7
Details changed since the 3.6 config to get this enabled.
2012-12-17 11:52:47 +01:00
aszlig
639edcb829
manual-kernel: Fix handling spaces in readConfig.
The previos version did a for loop over the output of set, which spits out _all_
defined variables and their contents. This not only is dangerous if there is a
variable starting with CONFIG_ but also can't handle whitespace, as the IFS is
set to any (horizontal _and_ vertical) whitespace by default.

So, imagine (actually don't imagine, something like this is the case in a lot of
kernel configuration files) you have the following variable:

CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi ..."

A loop with for and the default IFS would result in the following variable
pieces:

0: CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi
1: -fcall-saved-rsi
2: ..."

This obviously leads to the problem that this config variable is being cut off
at the first whitespace.

Another downside of this approach is that set not only returns variables but
functions as well. This could lead to quite a lot of unexpected behaviour and
confusion.

So the new approach doesn't source the kernel configuration anymore but uses
`read` to parse the file line-by line, setting IFS to '=', thus splitting all
configuration lines into key/value pairs.

Using parameter expansion, we ensure that we only read lines starting with
"CONFIG_". This particularily has the advantage of not being bash-specific,
should we choose to change to a different default shell someday.

Now, after we got a correct "CONFIG_" line, we're using a temporary variable to
split off the first quote from the result. Particularily the reason behind this
is shell compatibility again, as ${${foo#"}%"} only works in Bash, Zsh and
whatnot but not in plain SH.

And within the next line we obviously insert the no_firstquote variable without
it's last quote removed.

But, what about escaping?

First of all, if we'd just eval the $val variable, we would correctly unescape
the value, but this has the downside that variables within the content would be
expanded, for example look at this:

CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"

Well, obviously this is a bad example at the Nix sense, but just to show that
variables within kernel configuration entries aren't impossible.

And second, which would have been a show stopper if \" would be within $val: It
simply would end up being an invalid Nix expression, because \" would end up as
a ploin " within a double quoted string.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-12-13 22:54:57 +01:00
Mathijs Kwik
caf561d41a aufs3: upgrade to 1210 release, add linux-3.7 support 2012-12-13 14:00:28 +01:00
Shea Levy
9ddd1cc78b Linux 3.7
Kernel configuration succeeds, I'll let hydra test the build
2012-12-11 11:57:04 -05:00
Shea Levy
ce5ba30f64 Linux 3.6.10 2012-12-10 19:26:36 -05:00
Shea Levy
ed994dcbe2 Linux 3.4.23 2012-12-10 19:26:20 -05:00
Shea Levy
81a856c878 Linux 3.0.56 2012-12-10 19:25:00 -05:00
Eelco Dolstra
88ca46bfa0 linux: Update to 3.2 2012-12-07 13:24:40 +01:00
Mathijs Kwik
fe070086fb linux-3.6: upgrade to 3.6.9 2012-12-04 12:02:36 +01:00
Mathijs Kwik
38740214cb linux-3.4: upgrade to 3.4.21 2012-12-04 12:02:36 +01:00
Mathijs Kwik
47362f67ea linux-3.0: upgrade to 3.0.54 2012-12-04 12:02:36 +01:00
Shea Levy
9b0879bf85 Linux 3.6.8 2012-11-26 15:42:07 -05:00
Shea Levy
d4d1100123 Linux 3.4.20 2012-11-26 15:41:55 -05:00
Shea Levy
1180478089 Linux 3.0.53 2012-11-26 15:37:06 -05:00
Mathijs Kwik
3ee85e3a8d linux-3.6: upgrade to 3.6.7 2012-11-18 11:13:04 +01:00
Mathijs Kwik
6a46699855 linux-3.4: upgrade to 3.4.19 2012-11-18 11:13:04 +01:00
Mathijs Kwik
0404c409cc linux-3.2: upgrade to 3.2.34 2012-11-18 11:13:04 +01:00
Mathijs Kwik
d45b239dcc linux-3.0: upgrade to 3.0.52 2012-11-18 11:13:03 +01:00
Mathijs Kwik
f215bda5b4 linux-2.6.32: upgrade to 2.6.32.60 2012-11-18 11:13:03 +01:00
David Guibert
c604ff045e add cifs_timeout to kernel 3.5 2012-11-15 07:41:11 +01:00
Lluís Batlle i Rossell
bb3b603ea7 mips linux: Adding a patch to fix an ext3 bug in 3.5 and 3.6
I made it apply to all Mips, although the bug works only for n32 and o32 ABIs.
We don't support any n64 by now.
2012-11-06 00:16:13 +01:00
Mathijs Kwik
b56a899320 linux-3.6: upgrade to 3.6.6, contains fix for recent ext4 corruption 2012-11-05 21:11:21 +01:00
Mathijs Kwik
97c5b93402 linux-3.4: kernel 3.4.18, contains fix for recent ext4 corruption 2012-11-05 21:11:21 +01:00
Mathijs Kwik
a1c54023ce linux-3.0: upgrade to 3.0.51 2012-11-05 21:11:20 +01:00
Eelco Dolstra
1d384b0fe0 linux: Update to 3.2.33 2012-10-31 13:48:04 +01:00
Shea Levy
9f221073c2 Linux 3.6.4 2012-10-28 22:13:59 -04:00
Shea Levy
1da5d34957 Linux 3.4.16 2012-10-28 22:09:25 -04:00
Shea Levy
d843ec6b28 Linux 3.0.49 2012-10-28 22:05:33 -04:00
Shea Levy
125f6a02a4 Linux 3.6.3 2012-10-21 22:40:13 -04:00
Shea Levy
e71103deef Linux 3.4.15 2012-10-21 22:38:53 -04:00
Shea Levy
c01c02a74b Linux 3.0.47 2012-10-21 22:36:33 -04:00
Eelco Dolstra
76c010b928 linux: Update to 3.2.32 2012-10-18 12:22:17 -04:00
Mathijs Kwik
fb62b5fb91 linux-3.0: upgrade to 3.0.46 2012-10-13 12:22:48 +02:00
Mathijs Kwik
444b136eee linux-3.4: upgrade to 3.4.14 2012-10-13 12:22:47 +02:00
Mathijs Kwik
86693f1c5c linux-3.5: upgrade to 3.5.7 2012-10-13 12:22:47 +02:00
Mathijs Kwik
12ad270d2a linux-3.6: upgrade to 3.6.2 2012-10-13 12:22:47 +02:00
Mathijs Kwik
5711282fd8 linux kernels: mark kernels that can disable the conntrack-helper 2012-10-13 12:22:47 +02:00
Mathijs Kwik
8ea8105071 linux kernels: mark kernels with rpfilter support 2012-10-13 12:22:47 +02:00
Eelco Dolstra
ebd2b0e1ab linux: Update to 3.2.31 2012-10-10 21:51:36 -04:00
Mathijs Kwik
8f480e3035 linux-3.6: upgrade to 3.6.1
- enable aufs3 patch
- check other patches needing upgrade/enable
2012-10-09 16:05:24 +02:00
Mathijs Kwik
2f39ec92e3 linux-3.5: upgrade to 3.5.6 2012-10-09 16:05:23 +02:00
Mathijs Kwik
76aa428ac6 linux-3.4: upgrade to 3.4.13 2012-10-09 16:05:23 +02:00
Mathijs Kwik
332c6de736 linux-3.0: upgrade to 3.0.45 2012-10-09 16:05:23 +02:00
Michael Raskin
396de23762 Enable V4L2 modules 2012-10-04 15:35:21 +04:00
Shea Levy
359355e150 Linux 3.6 2012-10-01 07:01:31 -04:00
Lluis Batlle
22e050f8c6 linux: In case of an ARM kernel build, add extra include directories
They are required in order to build some modules, like that of
cryptodev.
2012-09-23 19:59:37 +02:00
Eelco Dolstra
0874615fcc Remove User Mode Linux
It hasn't built in a long time and it's obsolete IMHO.
2012-09-21 13:32:37 -04:00
Eelco Dolstra
50aac3247a linux: Update to 3.2.30 2012-09-21 13:30:00 -04:00
Mathijs Kwik
ce3e42df72 linux aufs3: upgrade patch and utils to 20120827 for all 3.x kernels 2012-09-16 13:05:52 +02:00
Mathijs Kwik
7b92af45f8 linux-3.4: upgrade to 3.4.11 2012-09-16 13:05:52 +02:00
Mathijs Kwik
c9b24ba210 linux-3.0: upgrade to 3.0.43 2012-09-16 13:05:52 +02:00
Lluís Batlle i Rossell
95fa07e183 linux-3.5: Updating to 3.5.4 2012-09-15 21:57:05 +02:00
Eelco Dolstra
080c0a5c20 linux: Update to 3.2.29 2012-09-13 10:10:26 -04:00
Mathijs Kwik
d37b642769 newer kernels need cifs-utils to mount CIFS filesystems
the kernel itself (and busybox's cifs mount code) are no longer able
to do this in some/most cases and will error out saying:
"CIFS VFS: connecting to DFS root not implemented yet""

Nixos' qemu-vm target is hurt by this, as it wants to mount /nix/store
via cifs very early in the boot process.

this commit just marks the problematic kernels.
An associated commit in nixos will use this info to fix the problem.
2012-08-30 18:25:49 +02:00
Mathijs Kwik
6fabe047c6 linux-3.4: upgrade to 3.4.10 2012-08-30 18:25:49 +02:00
Mathijs Kwik
8f1a34e228 linux-3.5: upgrade to 3.5.3 2012-08-30 18:25:49 +02:00
Mathijs Kwik
192b29181b linux-3.4: upgrade to 3.4.9
- aufs patch: upgrade to latest stable 3.4
2012-08-21 10:27:13 +02:00
Mathijs Kwik
6e9a6a5924 linux-3.3: upgrade to 3.3.8
- aufs patch: upgrade to latest stable 3.3
2012-08-21 10:26:44 +02:00
Eelco Dolstra
e91a4fb1e4 linux: Update to 3.2.28 2012-08-20 09:56:39 -04:00
Mathijs Kwik
03228d60fe linux-3.5: upgrade aufs3 patch to latest stable 2012-08-16 12:00:25 +02:00
Mathijs Kwik
05ed13dc49 linux-3.5: upgrade to 3.5.2 2012-08-16 12:00:04 +02:00
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
Lluís Batlle i Rossell
4a1c721c01 Changing every reference from mips64-linux to mips64el-linux. That's
what the new nix thinks the fuloong is.

Anyone having the old nix should use a nixpkgs previous to this change to build
the new nix. And then, with the new nix, he can use any newer nixpkgs revision.

svn path=/nixpkgs/trunk/; revision=31751
2012-01-21 00:34:51 +00:00
Lluís Batlle i Rossell
10394bd844 Updating linux 3.2 to 3.2.1
svn path=/nixpkgs/trunk/; revision=31743
2012-01-20 16:51:39 +00:00
Eelco Dolstra
c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
2012-01-18 20:16:00 +00:00
Lluís Batlle i Rossell
29e69f119d Making perf cross-build again, now with manpages.
svn path=/nixpkgs/trunk/; revision=31371
2012-01-06 19:35:12 +00:00
Lluís Batlle i Rossell
75d5ffe7ac Adding perf manual pages.
I copied the docbook inputs from awesome. I don't understand them.


svn path=/nixpkgs/trunk/; revision=31355
2012-01-06 17:45:53 +00:00
Lluís Batlle i Rossell
b76352800e Adding slang to perf. It looks like it wants slang too.
svn path=/nixpkgs/trunk/; revision=31354
2012-01-06 17:04:32 +00:00
Lluís Batlle i Rossell
cae619da08 Updating elfutils/perf to cross-build. I tested this for the nanonote.
I add newt, checking that it cross-builds too.

I update perf to have newt support, and now it's also finding python, whatever
that means. I've not tested if 'python' as buildInputs is enough.


svn path=/nixpkgs/trunk/; revision=31353
2012-01-06 16:45:14 +00:00
Lluís Batlle i Rossell
4c814dd003 Adding linux 'perf' tool.
svn path=/nixpkgs/trunk/; revision=31319
2012-01-05 21:24:51 +00:00
Michael Raskin
da6b6a9332 Update Linux 3.2 to release
svn path=/nixpkgs/trunk/; revision=31306
2012-01-05 07:24:37 +00:00
Lluís Batlle i Rossell
95b42b8134 Updating linux to 2.6.32.52 and 3.1.7
svn path=/nixpkgs/trunk/; revision=31299
2012-01-04 21:34:03 +00:00
Michael Raskin
0efe938292 A newer rc
svn path=/nixpkgs/trunk/; revision=31081
2011-12-26 04:20:15 +00:00
Michael Raskin
435c32b5b6 A fresher Linux rc
svn path=/nixpkgs/trunk/; revision=31048
2011-12-23 04:26:36 +00:00
Michael Raskin
0e3d2e236e Update Linux kernel to 3.1
svn path=/nixpkgs/trunk/; revision=30876
2011-12-14 07:27:58 +00:00
Shea Levy
f3b7b7d69e Linux 3.1.4
svn path=/nixpkgs/trunk/; revision=30625
2011-11-29 16:47:28 +00:00
Eelco Dolstra
752203c3ca * Remove broken tux-on-ice kernels.
svn path=/nixpkgs/trunk/; revision=30619
2011-11-29 14:49:32 +00:00
Eelco Dolstra
25f6c6ca6e * Re-enable the CFQ scheduler as a builtin module (as was the case in
2.6.32).

svn path=/nixpkgs/trunk/; revision=30617
2011-11-29 14:19:35 +00:00
Eelco Dolstra
ab017a58c5 * Enable PROC_EVENTS, since it's required by libcgroup's cgrulesengd
to monitor process creation.

svn path=/nixpkgs/trunk/; revision=30549
2011-11-24 17:54:55 +00:00
Shea Levy
df05356c05 Linux 3.1.2
svn path=/nixpkgs/trunk/; revision=30529
2011-11-22 17:05:18 +00:00
Shea Levy
9a9df48782 Linux 3.0.9 and 3.1.1
svn path=/nixpkgs/trunk/; revision=30427
2011-11-14 16:55:50 +00:00
Shea Levy
d800dcc26c Linux 3.2-rc1
svn path=/nixpkgs/trunk/; revision=30336
2011-11-08 16:58:20 +00:00
Shea Levy
c65ff0d37d Update aufs3.0, add aufs3.1
svn path=/nixpkgs/trunk/; revision=30329
2011-11-08 16:00:19 +00:00
Shea Levy
5e5dd16842 Remove the efi stub patch
svn path=/nixpkgs/trunk/; revision=30264
2011-11-06 17:38:51 +00:00
Eelco Dolstra
40f93f0b3b * Increase XEN_MAX_DOMAIN_MEMORY to support 4xlarge EC2 instances.
svn path=/nixpkgs/trunk/; revision=30036
2011-10-26 17:34:31 +00:00
Shea Levy
6638835c93 Linux 3.0
svn path=/nixpkgs/trunk/; revision=30007
2011-10-25 06:21:27 +00:00
Eelco Dolstra
f405ee266b * Enable staging drivers in Linux 3.x. Staging drivers are more experimental
and lower quality than regular drivers.  However, there are a lot of drivers
  for wireless cards that we really need to have.  And it doesn't really hurt
  to have these drivers if you don't need them.
* Enable the Radeon KMS option.  This shouldn't be a problem since the X driver
  supports KMS (I think).

svn path=/nixpkgs/trunk/; revision=29994
2011-10-24 16:30:59 +00:00
Shea Levy
b3f1015e6b Linux 3.1
svn path=/nixpkgs/trunk/; revision=29993
2011-10-24 16:06:31 +00:00
Shea Levy
11941954d8 Linux 3.0.7
svn path=/nixpkgs/trunk/; revision=29978
2011-10-23 15:52:28 +00:00
Florian Friesdorf
805a4c0261 linux/kernel - added myself to maintainers
svn path=/nixpkgs/trunk/; revision=29811
2011-10-13 09:23:22 +00:00
Shea Levy
5a5602184e Whoops, forgot to re-inherit postBuild now that it's not set manually
I really should have done these changes in a topic branch, sorry

svn path=/nixpkgs/trunk/; revision=29567
2011-10-02 17:12:50 +00:00
Shea Levy
34144e835d Linux 3.x: Use our module directory during modules_install
The "unset MODULE_DIR" trick was enough to get Linux 3.x kernels compiling, but it was definitely the Wrong Thing
We NEED MODULE_DIR set so that depmod can store the right dependencies during the build. The REAL problem with the
3.x kernels was two-fold: Our module-init-tools was so old that the kernel build needed to introduce a hack when
calling depmod (involving creating a symlink prepending 99.98 to the version number), and the depmod wrapper was
moved out of the Makefile into scripts/depmod.sh, so our substituteInPlace to get rid of '-b $(INSTALL_MOD_PATH)' in
the Makefile was a noop and INSTALL_MOD_PATH was still being passed to depmod. This is now fixed and modprobe can
successfully find dependencies using the modules.dep created during install

svn path=/nixpkgs/trunk/; revision=29559
2011-10-02 11:01:08 +00:00
Shea Levy
72f41379be Add a patch to enable adding efi stub code to the linux kernel
svn path=/nixpkgs/trunk/; revision=29555
2011-10-01 23:00:48 +00:00
Shea Levy
107e39b214 linux-3.1: rc8
svn path=/nixpkgs/trunk/; revision=29539
2011-09-28 23:15:30 +00:00
Shea Levy
f979d3de4e Add features.aufs2 to old kernels
svn path=/nixpkgs/trunk/; revision=29536
2011-09-28 22:13:59 +00:00
Shea Levy
ed38cc3545 aufs3-util
svn path=/nixpkgs/trunk/; revision=29535
2011-09-28 21:59:07 +00:00
Shea Levy
4add420a48 aufs3 kernelPackage
svn path=/nixpkgs/trunk/; revision=29534
2011-09-28 21:46:07 +00:00
Shea Levy
2e012018bb makeAufs3StandalonePatch: Don't unpack the kernel source
svn path=/nixpkgs/trunk/; revision=29533
2011-09-28 21:09:54 +00:00
Shea Levy
60b155479d linux-3.0: Add aufs3 patch
svn path=/nixpkgs/trunk/; revision=29532
2011-09-28 20:48:08 +00:00
Shea Levy
b6a786f097 linux-3.1: Bump to rc7
svn path=/nixpkgs/trunk/; revision=29463
2011-09-23 20:03:52 +00:00
Shea Levy
2872ccafd6 linux-3.1: Bump to r6
Not sure if kernel.org is ever coming back now...

svn path=/nixpkgs/trunk/; revision=29303
2011-09-16 11:26:43 +00:00
Shea Levy
4a47336cb5 linux-3.1.nix: Bump to rc5
I wanted to wait for kernel.org to get back up, but there doesn't seem to be any information about when that will be. If you don't trust that this is Torvalds' github, see https://lkml.org/lkml/2011/9/4/92 for how to verify

svn path=/nixpkgs/trunk/; revision=29198
2011-09-12 03:38:12 +00:00
Eelco Dolstra
e8c849f8e3 * Re-enable the fbcondecor patch for Linux 2.6.35, seems to work fine.
svn path=/nixpkgs/trunk/; revision=28974
2011-09-02 13:41:38 +00:00
David Guibert
80db090ed7 add bluetooth audio support for linux 3.0 and 3.1.
svn path=/nixpkgs/trunk/; revision=28954
2011-09-01 10:03:06 +00:00
Shea Levy
5058e62c56 linux-3.1: Bump to rc4
svn path=/nixpkgs/trunk/; revision=28928
2011-08-30 13:25:23 +00:00
Shea Levy
72c9b2f62e linux-3.0.nix: Bump to 3.0.4
svn path=/nixpkgs/trunk/; revision=28927
2011-08-30 13:25:11 +00:00
Shea Levy
019cc6614a linux-3.1.nix: Bump to 3.1-rc3
svn path=/nixpkgs/trunk/; revision=28765
2011-08-23 02:34:21 +00:00
David Guibert
4b3530f55d apply aufs patch to other kernels.
svn path=/nixpkgs/trunk/; revision=28708
2011-08-20 07:55:53 +00:00
David Guibert
db3eb9de85 utrace: fix urls.
But it still does not apply to recent 2.6.32 kernels.

svn path=/nixpkgs/trunk/; revision=28707
2011-08-20 06:47:13 +00:00
David Guibert
22ee5aba7a aufs for 2.6.36/39 and 3.0
svn path=/nixpkgs/trunk/; revision=28705
2011-08-20 06:39:29 +00:00
David Guibert
b541948dee kernel 2.6.32.44 -> .45
svn path=/nixpkgs/trunk/; revision=28704
2011-08-20 06:39:23 +00:00
Michael Raskin
87e5c7e6fb Enable options useful for lxc - linux containers. Changing only 3.0/3.1
svn path=/nixpkgs/trunk/; revision=28666
2011-08-18 16:10:50 +00:00
Shea Levy
739b5aae63 linux-3.0.nix: Bump to 3.0.3. Not sure what happened to 3.0.2...
svn path=/nixpkgs/trunk/; revision=28650
2011-08-17 22:48:14 +00:00
Shea Levy
e3da49ce82 linux-3.1.nix: Bump to rc2
svn path=/nixpkgs/trunk/; revision=28607
2011-08-16 07:24:39 +00:00
David Guibert
5db26b465e update kernels
svn path=/nixpkgs/trunk/; revision=28437
2011-08-09 20:04:03 +00:00
Shea Levy
532511e7f5 linux-3.1.nix: Set modDirVersion
broadcom-sta: use kernel.modDirVersion in place of kernel.version

svn path=/nixpkgs/trunk/; revision=28406
2011-08-08 20:49:59 +00:00
Shea Levy
ffdc37215a kernel/generic.nix: Add a passed-thru modDirVersion attribute
With the new kernel versioning scheme, the first release in a series only has a version number and
a major revision number (e.g. linux 3.0, linux 3.1-rc1, etc.). Unfortunately, the module
directory for these kernels still has a minor revision number (e.g. lib/modules/3.0.0, lib/modules/3.0.1-rc1, etc.).
This causes problems for packages such as broadcom_sta that need to know the module directory, so
this attribute will allow setting the module directory version number separate from the
kernel version number when necessary.

svn path=/nixpkgs/trunk/; revision=28405
2011-08-08 20:49:49 +00:00
Michael Raskin
56cf7dfe4a Two options allegedely required for ath9k detection in Linux 3.0+. Without them nothing works, checked.
svn path=/nixpkgs/trunk/; revision=28404
2011-08-08 20:49:32 +00:00
Shea Levy
6d5004cc42 linux-3.{0,1}: Use the v3.x subdirectory instead of the 3.0 one
svn path=/nixpkgs/trunk/; revision=28387
2011-08-08 13:25:18 +00:00
Shea Levy
363b0c12d3 linux-3.1: Get the right sources
svn path=/nixpkgs/trunk/; revision=28383
2011-08-08 12:47:58 +00:00
Shea Levy
8aefeeefed Base the Linux 3.1 expression off of the Linux 3.0 expression
svn path=/nixpkgs/trunk/; revision=28382
2011-08-08 12:32:07 +00:00
Shea Levy
5b197147cb linuxPackages_3_0: Bumped to 3.0.1
svn path=/nixpkgs/trunk/; revision=28203
2011-08-06 19:14:13 +00:00
Eelco Dolstra
3c05ad236d * Linux 2.6.32.43.
svn path=/nixpkgs/trunk/; revision=27981
2011-07-28 09:32:02 +00:00
Shea Levy
20ebca303e Add comments explaining the purpose of the postBuild prepend
svn path=/nixpkgs/trunk/; revision=27922
2011-07-24 20:24:23 +00:00
Shea Levy
5db8c88547 Fix problem with linux 3.0 trying to install in /nix/store/...
Thanks to MarcWeber on IRC for helping with this

svn path=/nixpkgs/trunk/; revision=27921
2011-07-24 20:24:12 +00:00
Shea Levy
e34c2e366e First attempt at linuxPackages_3_0
svn path=/nixpkgs/trunk/; revision=27915
2011-07-24 03:05:00 +00:00
Lluís Batlle i Rossell
57f59594db Updating the linux 2.6.39 to 2.6.39.3
svn path=/nixpkgs/trunk/; revision=27878
2011-07-21 13:56:25 +00:00
Ludovic Courtès
5795d23320 Linux: Actually use `postBuild'.
svn path=/nixpkgs/trunk/; revision=27833
2011-07-19 09:03:09 +00:00
Ludovic Stordeur
69dca5f4aa Add meta.platforms to the Linux kernel expression.
svn path=/nixpkgs/trunk/; revision=27722
2011-07-11 14:07:21 +00:00
Ludovic Stordeur
12f976e56e Added Linux 2.6.15
svn path=/nixpkgs/trunk/; revision=27721
2011-07-11 14:00:26 +00:00
Ludovic Stordeur
14f3664d3f Added Linux 2.6.26
svn path=/nixpkgs/trunk/; revision=27720
2011-07-11 14:00:21 +00:00
Ludovic Stordeur
808c2f69b4 Fixed Linux 2.6.31 compilation
linux_2_6_31 compilation was broken and added the CIFS timeout patch.

svn path=/nixpkgs/trunk/; revision=27716
2011-07-11 14:00:03 +00:00
Ludovic Stordeur
e381c7c385 Added CIFS timeout patch for Linux 2.6.15
svn path=/nixpkgs/trunk/; revision=27715
2011-07-11 14:00:01 +00:00
Ludovic Stordeur
388ba0981b Added CIFS timeout patch for Linux 2.6.{25 --> 28}
svn path=/nixpkgs/trunk/; revision=27713
2011-07-11 13:59:54 +00:00
Ludovic Stordeur
b2cf02eb5e Renamed cifs-timeout-2.6.{32 --> 29} patch
Renamed cifs-timeout-2.6.32 patch to cifs-timeout-2.6.29 as this is the
older kernel version this patch applies to.

svn path=/nixpkgs/trunk/; revision=27711
2011-07-11 13:59:47 +00:00
Ludovic Stordeur
c551998c82 Added CIFS timeout patch for Linux 2.6.{35 --> 38}
svn path=/nixpkgs/trunk/; revision=27710
2011-07-11 13:59:43 +00:00
Ludovic Stordeur
df0a6394b3 Suffixed cifs timeout patch with kernel version.
Currently suffixed with 2.6.32.
This pre-patch prepares the landing of several versions of this patch to
support other Linux kernel versions.

svn path=/nixpkgs/trunk/; revision=27709
2011-07-11 13:59:40 +00:00
Ludovic Stordeur
8268a39690 Improved the Linux kernel building framework
Moved the hardcoded postBuild hook from the builder to generic.nix:

Some old kernel (such as 2.6.15) did not yet support the unifdef target.
As a result, compiling them with the current Linux builder leads to a
failure.
Fixed by moving this hook as argument of the top-level function of
generic.nix. This allows some kernel nix codes to overrides its default
value.

svn path=/nixpkgs/trunk/; revision=27708
2011-07-11 13:59:37 +00:00
Eelco Dolstra
0a127bf64b * Linux 2.6.32.41.
svn path=/nixpkgs/trunk/; revision=27395
2011-06-08 10:36:50 +00:00
Michael Raskin
186d36ca4b Fix kernel configuration
svn path=/nixpkgs/trunk/; revision=27282
2011-05-20 08:37:25 +00:00
Michael Raskin
6719630316 Add Linux 2.6.39
svn path=/nixpkgs/trunk/; revision=27279
2011-05-19 11:17:34 +00:00
Eelco Dolstra
95b7bc1726 * Linux 2.6.32.40.
svn path=/nixpkgs/trunk/; revision=27222
2011-05-11 12:56:18 +00:00
Lluís Batlle i Rossell
d7325f69dd Updating linux 2.6.37
svn path=/nixpkgs/trunk/; revision=26966
2011-04-25 13:33:28 +00:00
Lluís Batlle i Rossell
8c115162c4 Updating the nanonote kernel 2.6.36, because I was hitting a bug about stack shrinking:
https://bugzilla.redhat.com/show_bug.cgi?id=643426

No problem in 2.6.36.3.


svn path=/nixpkgs/trunk/; revision=26947
2011-04-24 12:33:23 +00:00
Michael Raskin
eaad654e4a Update Linux kernel version
svn path=/nixpkgs/trunk/; revision=26929
2011-04-23 07:10:08 +00:00
Eelco Dolstra
73dbdbd1d7 * Linux 2.6.32.38.
svn path=/nixpkgs/trunk/; revision=26900
2011-04-20 09:30:46 +00:00
Shea Levy
dedd972a16 Add fbcondecor for 2.6.38
svn path=/nixpkgs/trunk/; revision=26876
2011-04-18 15:13:04 +00:00
Michael Raskin
5662304328 Update Linux kernel version
svn path=/nixpkgs/trunk/; revision=26872
2011-04-17 20:31:23 +00:00
Lluís Batlle i Rossell
9d0df24860 Updating linux 2.6.38 to 2.6.38.2
svn path=/nixpkgs/trunk/; revision=26832
2011-04-13 20:41:20 +00:00
Shea Levy
d86630472b Add aufs2.1 for 2.6.38
svn path=/nixpkgs/trunk/; revision=26811
2011-04-12 18:36:33 +00:00
Eelco Dolstra
2f84b4b7b3 * Linux 2.6.32.36.
svn path=/nixpkgs/trunk/; revision=26783
2011-04-11 13:42:54 +00:00
Ludovic Courtès
16d86dcbe2 Linux 2.6.{25,28}: Allow compilation with recent Glibc.
svn path=/nixpkgs/trunk/; revision=26741
2011-04-07 13:57:43 +00:00
Ludovic Courtès
38a4604710 Linux 2.6.{28,29}: Disable Xen support, which no longer builds on x86_64.
svn path=/nixpkgs/trunk/; revision=26732
2011-04-07 09:57:38 +00:00
Lluís Batlle i Rossell
6eaaa06077 Committing on behalf of Shea Levy:
This patch adds a "features.aufs2_1" to the aufs-2.1 patch for Linux
2.6.37 to prevent aufs2_1 and aufs2_1_util from being options for
kernels without an aufs 2.1 patch. There were several Hydra build
failures as a result of attempting to build aufs2.1 against older
kernels.

svn path=/nixpkgs/trunk/; revision=26597
2011-03-30 08:16:44 +00:00
Lluís Batlle i Rossell
1357904982 Committing the aufs2.1 patch by Shea Levy. His comments:
* My motivation for this patch is that kernels < 2.6.36 contain an
     e1000e that does not support the ethernet card that is part of the
     chipset for the second-generation Core-i Intel CPUs, so in order
     to have a more useful livecd I needed to get aufs working with a
     newer kernel, and 2.6.37 is the latest kernel with an official
     aufs release.
   * All sources are downloaded with fetchgit. This is because the aufs
     upstream doesn't provide release tarballs, they just add a tag to
     their git tree for an official release.
   * The make target for the aufs2.1 headers uses a Makefile in the
     kernel build directory that requires that unifdef be in the
     scripts/ subdirectory of the build directory. The way I've dealt
     with this here is by adding "make $makeFlags -C scripts unifdef"
     to the postBuild in the kernel builder. Since the builder is used
     by all kernel versions, this will require rebuilding every kernel
     and kernel-dependent package if the patch is accepted, so one
     alternative I thought of would be to create a fake kernel build
     directory where everything is symlinked to the real build
     directory except scripts/, which is first copied and then make
     unifdef is run before building aufs2.1. If that more complicated
     solution is preferred, or if anyone has ideas for another one, I
     can do that and submit a new patch.
   * The patch was tested by building a livecd ISO that uses it, then
     running the ISO from within virtualbox and installing aufs2.1-util
     from within the livecd environment.
   * The livecd was built using installation-cd-minimal.nix, with two
     changes to the Nixos tree:
        1. boot.kernelPackages = pkgs.linuxPackages_2_6_37 was added to
           profiles/minimal.nix
        2. config.boot.kernelPackages.aufs2 was changed to
           config.boot.kernelPackages.aufs2_1 in iso-image.nix
     I would have preferred to keep all changes within
     profiles/minimal.nix, but I couldn't figure out how to override
     iso-image.nix's definition of boot.extraModulePackages. Livecds
     that use an older kernel can't be built with this iso-image.nix,
     since we don't have aufs2.1 for them (just aufs2). If someone can
     point me to how I can override things set in iso-image.nix, I'd
     appreciate it.

make -C scripts unifdef compiles the unifdef application in the
scripts/ directory, and when Nix copies over the build tree to
$out/lib/modules/$version/build for kernel modules to reference, it
copies over all of scripts/ except the .o files. I can't speak for
other kernel versions, but at the least for 2.6.37.1 unifdef is not
built by default. If you look at the Makefile in scripts, unifdef is
listed  under a comment saying that the following programs are only
built on-demand.

svn path=/nixpkgs/trunk/; revision=26548
2011-03-27 15:18:39 +00:00
Lluís Batlle i Rossell
f6e3d3e10d Adding tuxonice for some recent kernels.
svn path=/nixpkgs/trunk/; revision=26447
2011-03-21 15:53:22 +00:00
Lluís Batlle i Rossell
84ca32b293 Adding tuxonice for 2.6.35
svn path=/nixpkgs/trunk/; revision=26446
2011-03-21 15:42:21 +00:00
Lluís Batlle i Rossell
8ab38a2828 Adding the fbcondecor patch for 2.6.37, by Shea Levy
svn path=/nixpkgs/trunk/; revision=26428
2011-03-19 20:44:45 +00:00
Michael Raskin
19253151fe Source for Linux 2.6.38
svn path=/nixpkgs/trunk/; revision=26411
2011-03-18 07:51:22 +00:00
Eelco Dolstra
5a1dec3588 * Linux 2.6.32.33.
svn path=/nixpkgs/trunk/; revision=26344
2011-03-16 09:30:38 +00:00
Eelco Dolstra
39828662e9 * Linux 2.6.32.32.
svn path=/nixpkgs/trunk/; revision=26225
2011-03-09 12:04:45 +00:00
Eelco Dolstra
8944a4110d * Linux 2.6.32: fix "swiotlb" build failures.
svn path=/nixpkgs/trunk/; revision=26180
2011-03-06 19:36:41 +00:00
Eelco Dolstra
5cc5e16104 * Remove the xen-pvclock-resume patch, which has finally been merged
into 2.6.32.

svn path=/nixpkgs/trunk/; revision=26149
2011-03-03 15:36:13 +00:00
Eelco Dolstra
43cca4d6ab * Linux 2.6.32.30.
svn path=/nixpkgs/trunk/; revision=26148
2011-03-03 15:00:30 +00:00
David Guibert
a5dae2652e kernel: 2.6.37 -> 2.6.37.1
svn path=/nixpkgs/trunk/; revision=26108
2011-02-24 22:19:42 +00:00
Eelco Dolstra
76b07fbc18 * Linux 2.6.32.29.
svn path=/nixpkgs/trunk/; revision=26090
2011-02-24 13:11:51 +00:00
Eelco Dolstra
529b17d8c5 * Linux 2.6.27.57, 2.6.32.28.
svn path=/nixpkgs/trunk/; revision=25563
2011-01-14 13:01:15 +00:00
David Guibert
48749c756c kernel: new 2.6.37
svn path=/nixpkgs/trunk/; revision=25508
2011-01-11 13:42:59 +00:00
David Guibert
132f791f81 kernel: 2.6.36.2 -> 2.6.36.3
svn path=/nixpkgs/trunk/; revision=25507
2011-01-11 13:42:55 +00:00
David Guibert
98c3eed19c kernel: 2.6.35.7 -> 2.6.35.9
svn path=/nixpkgs/trunk/; revision=25506
2011-01-11 13:42:52 +00:00
Eelco Dolstra
c14382cb45 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25225
2010-12-21 15:14:33 +00:00
Eelco Dolstra
0af5585d3c * Linux 2.6.32.27.
svn path=/nixpkgs/trunk/; revision=25209
2010-12-20 12:18:37 +00:00
Lluís Batlle i Rossell
b48b2a7bb4 Merging from trunk. I solved some trivial merge conflicts.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25188
2010-12-17 20:39:58 +00:00
Lluís Batlle i Rossell
dc94479f5f Updating the linux 2.6.36 to 2.6.36.2
svn path=/nixpkgs/trunk/; revision=25185
2010-12-17 20:28:50 +00:00
Lluís Batlle i Rossell
ee04ffcb55 Updating from trunk. I resolved simple conflicts.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25061
2010-12-11 12:47:00 +00:00
Lluís Batlle i Rossell
09bcba17f5 Adding the nanonote openwrt 2.6.36 kernel
svn path=/nixpkgs/branches/stdenv-updates/; revision=25005
2010-12-06 15:30:19 +00:00
Eelco Dolstra
9feaa9db94 * Linux 2.6.32.26.
svn path=/nixpkgs/trunk/; revision=24911
2010-11-29 09:52:50 +00:00
Lluís Batlle i Rossell
13a8b34a81 Fix for a syscall restart bug on linux-mips
svn path=/nixpkgs/branches/stdenv-updates/; revision=24791
2010-11-21 15:26:36 +00:00
Lluís Batlle i Rossell
8746de3ae8 Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24674
2010-11-11 22:18:14 +00:00
Michael Raskin
e119bdb5de Enable VGA_SWITCHEROO
svn path=/nixpkgs/trunk/; revision=24667
2010-11-11 21:37:35 +00:00
Eelco Dolstra
528dc56ce1 * Linux 2.6.32.25.
svn path=/nixpkgs/trunk/; revision=24588
2010-11-03 20:54:20 +00:00
Lluís Batlle i Rossell
f4f84af4ab Updating from trunk. I only had to take away the usual stdenv2 in
all-packages.nix


svn path=/nixpkgs/branches/stdenv-updates/; revision=24553
2010-10-31 19:30:31 +00:00
Eelco Dolstra
85a0cd1385 * A better fix for the Xen clock problem.
svn path=/nixpkgs/trunk/; revision=24488
2010-10-26 13:08:51 +00:00
Eelco Dolstra
5762edd607 * Linux 2.6.32: revert upstream patch
489fb490dbf8dab0249ad82b56688ae3842a79e8.  It causes the DomU clock
  to jump into the future and freeze after being saved and restored
  across a Dom0 reboot.  See 

    http://lists.xensource.com/archives/html/xen-devel/2010-10/msg00498.html
    http://lists.xensource.com/archives/html/xen-devel/2010-10/msg01174.html

svn path=/nixpkgs/trunk/; revision=24473
2010-10-25 16:36:42 +00:00
Lluís Batlle i Rossell
6dc839d344 Merging from trunk. I resolved some conflicts; I hope that well.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24429
2010-10-23 14:52:21 +00:00
Michael Raskin
ac19af507f Adding Linux 2.6.36
svn path=/nixpkgs/trunk/; revision=24403
2010-10-21 12:28:14 +00:00
Lluís Batlle i Rossell
bf6f39fb7c Adding a patch fixing ARM trouble on the recent linux 2.6.35
svn path=/nixpkgs/branches/stdenv-updates/; revision=24158
2010-10-07 22:10:28 +00:00
Lluís Batlle i Rossell
fca582bff0 Updating from trunk. I had to resolve the pcre and some stdenv2 in all-packages
svn path=/nixpkgs/branches/stdenv-updates/; revision=24155
2010-10-07 21:21:31 +00:00
Eelco Dolstra
872fa6577d * Update the Xen pvops kernel.
svn path=/nixpkgs/trunk/; revision=24145
2010-10-07 14:06:44 +00:00
Michael Raskin
1f136b4630 Update Linux 2.6.35 to .35.7
svn path=/nixpkgs/trunk/; revision=24105
2010-10-06 06:58:05 +00:00
Eelco Dolstra
80607fd285 * Linux 2.6.32.24, which fixes booting on Xen.
svn path=/nixpkgs/trunk/; revision=24065
2010-10-05 10:38:25 +00:00
Lluís Batlle i Rossell
cd4b54748a Updating from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=24038
2010-10-03 09:25:34 +00:00
Eelco Dolstra
2368ca287c * Linux 2.6.32.23.
svn path=/nixpkgs/trunk/; revision=23997
2010-09-30 13:53:13 +00:00
Lluís Batlle i Rossell
87aed78cc0 Updating to linux 2.6.35.6
svn path=/nixpkgs/trunk/; revision=23976
2010-09-27 21:22:55 +00:00
David Guibert
30765e4be9 update kernels
svn path=/nixpkgs/trunk/; revision=23974
2010-09-27 20:05:42 +00:00
Evgeny Egorochkin
9f696ae43e Revert "Make kernel work for me". Committed this by accident.
This reverts commit 8a2cd2c99f26e5bd5c5a324e2a1712db8991379e.

svn path=/nixpkgs/trunk/; revision=23856
2010-09-18 16:22:04 +00:00
Evgeny Egorochkin
5bc3007bf6 Make kernel work for me
svn path=/nixpkgs/trunk/; revision=23855
2010-09-18 16:20:06 +00:00
Lluís Batlle i Rossell
2c5de61327 Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=23840
2010-09-17 19:10:21 +00:00
Ludovic Courtès
078353fc15 Linux: Add GuruPlug-related patches.
svn path=/nixpkgs/trunk/; revision=23833
2010-09-17 15:56:42 +00:00
Eelco Dolstra
13f346058c * Add a branch of the Linux kernel that can be used in Xen's Dom0.
From http://git.kernel.org/?p=linux/kernel/git/jeremy/xen.git;a=shortlog;h=refs/heads/xen/stable-2.6.32.x

svn path=/nixpkgs/trunk/; revision=23729
2010-09-10 16:27:39 +00:00
Eelco Dolstra
ead1b8bc5c * Move config-blocks.nix to zen-kernel where it's used.
svn path=/nixpkgs/trunk/; revision=23721
2010-09-10 14:07:22 +00:00
Eelco Dolstra
9ff5c12798 * Remove the systemtap option from linux-2.6.32.nix and use
extraConfig instead.

svn path=/nixpkgs/trunk/; revision=23720
2010-09-10 14:06:56 +00:00
Lluís Batlle i Rossell
a42e571e33 Trying to fix an URL for a patch (the previous URL did not work anyamore)
svn path=/nixpkgs/branches/stdenv-updates/; revision=23700
2010-09-09 17:07:12 +00:00
Lluís Batlle i Rossell
bd17763fbb Fixing an url on kernel patches
svn path=/nixpkgs/branches/stdenv-updates/; revision=23639
2010-09-05 05:59:55 +00:00
Lluís Batlle i Rossell
641f956581 Setting any stdenv.system references for the loongson2f system to 'mips64-linux'.
(my git-svn info:)
Merge branch 'mips64' into stdenv-updates

Conflicts:
	pkgs/applications/networking/browsers/firefox/3.6.nix
	pkgs/top-level/all-packages.nix

svn path=/nixpkgs/branches/stdenv-updates/; revision=23588
2010-09-01 09:50:12 +00:00
Lluís Batlle i Rossell
cca1cae042 Updating from trunk. I had to do some changes to make it fit.
svn path=/nixpkgs/branches/stdenv-updates/; revision=23500
2010-08-29 11:09:23 +00:00
Michael Raskin
a73c3a96e6 Correct patch for AUFS2 2.6.35.*
svn path=/nixpkgs/trunk/; revision=23498
2010-08-29 10:37:58 +00:00
Eelco Dolstra
3f400cc2e3 * Latest kernels.
svn path=/nixpkgs/trunk/; revision=23476
2010-08-27 08:44:07 +00:00
Eelco Dolstra
509fa794dd * Linux 2.6.32.20, 2.6.27.52. This fixes the "scheduling while
atomic" regression.

svn path=/nixpkgs/trunk/; revision=23386
2010-08-24 09:01:48 +00:00
Michael Raskin
fb24277ef2 Update Linux kernel to 2.6.35.3 - 2.6.35.2 has a few lockup regressions
svn path=/nixpkgs/trunk/; revision=23356
2010-08-23 11:49:17 +00:00
Michael Raskin
be17d69549 Fix &nbsp; problem in aufs2-35.patch
svn path=/nixpkgs/trunk/; revision=23291
2010-08-20 21:35:11 +00:00
Michael Raskin
d3d44dc6d3 Add AUFS patch for 2.6.35
svn path=/nixpkgs/trunk/; revision=23288
2010-08-20 20:46:12 +00:00
Yury G. Kudryashov
10c5146a78 Add fbcondecor-2.6.35
svn path=/nixpkgs/trunk/; revision=23286
2010-08-20 20:12:03 +00:00
Lluís Batlle i Rossell
f16353b6f2 Updated from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=23275
2010-08-20 13:41:12 +00:00
Lluís Batlle i Rossell
f7d0fcdaac Making the kernel builder accept the 'vmlinux' kerneltarget.
svn path=/nixpkgs/branches/stdenv-updates/; revision=23274
2010-08-20 13:30:59 +00:00
Eelco Dolstra
7dea1a0f4f * Revert to 2.6.32.18 for now, because we get a lot of "BUG:
scheduling while atomic" errors
  (e.g. http://hydra.nixos.org/build/568323/log/raw).  This might be
  fixed by this patch: http://lkml.org/lkml/2010/8/6/672

svn path=/nixpkgs/trunk/; revision=23272
2010-08-20 13:13:26 +00:00
Eelco Dolstra
2e230288bf * Latest kernels.
svn path=/nixpkgs/trunk/; revision=23270
2010-08-20 09:29:10 +00:00
Michael Raskin
2d062ba772 Allow override options being required in kernel configuration.. Otherwise modifying significantly config via extraConfig becomes practically impossible.
svn path=/nixpkgs/trunk/; revision=23171
2010-08-14 09:18:57 +00:00
David Guibert
92d437c54f kernel updates and add kernel 2.6.35.1
svn path=/nixpkgs/trunk/; revision=23155
2010-08-12 16:33:19 +00:00
Eelco Dolstra
e4686546ec * Enable parallel building for the Linux kernel, an obvious candidate.
svn path=/nixpkgs/trunk/; revision=23109
2010-08-11 10:43:09 +00:00
Eelco Dolstra
5c8b4ec35a * Linux 2.6.32.18.
svn path=/nixpkgs/trunk/; revision=23104
2010-08-11 09:25:35 +00:00
Lluís Batlle i Rossell
4137ceaf80 Updated nanonote 2.6.35 kernel (fixed a keyboard matrix problem)
svn path=/nixpkgs/branches/stdenv-updates/; revision=23041
2010-08-08 18:50:10 +00:00
Lluís Batlle i Rossell
eddc9d6ab5 Fixing the nanonote kernel expressions so they work.
In fact only 2.6.34 boots fine, while 2.6.35 needs a fetchsvn new revision,
waiting for an upstream patch.

svn path=/nixpkgs/branches/stdenv-updates/; revision=23039
2010-08-08 18:46:57 +00:00
Lluís Batlle i Rossell
46082f25f9 Updating from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=23027
2010-08-07 20:14:04 +00:00
Lluís Batlle i Rossell
8783e812b5 More changes beyond stdenv-linux for the fuloong2f platform
svn path=/nixpkgs/branches/stdenv-updates/; revision=22973
2010-08-05 18:51:12 +00:00
Lluís Batlle i Rossell
b17d1d7d07 Adding nanonote kernel and uboot
svn path=/nixpkgs/branches/stdenv-updates/; revision=22943
2010-08-04 11:07:13 +00:00
Eelco Dolstra
5a08a41204 * Kernel updates.
svn path=/nixpkgs/trunk/; revision=22941
2010-08-04 10:40:25 +00:00
Eelco Dolstra
3f287cfb1d * Ensure that the dell-bluetooth device does not stay in the "hard
blocked" state.

svn path=/nixpkgs/branches/x-updates/; revision=22730
2010-07-25 12:15:59 +00:00
Eelco Dolstra
3d442ad185 * Apply a patch that is apparently required to make the kernel work
properly on Amazon EC2.
* Always apply the CIFS timeout patch.  It's rather annoying to have
  to build a separate kernel for the VM tests.

svn path=/nixpkgs/trunk/; revision=22630
2010-07-18 21:10:46 +00:00
Eelco Dolstra
237c7808ce * Latest Linux kernels.
svn path=/nixpkgs/trunk/; revision=22488
2010-07-06 08:44:05 +00:00
Eelco Dolstra
cb5bcfa04a * In the VM tests, apply a patch to increase the 15s timeout on CIFS
operations to 120s.  This is necessary if the host is heavily
  loaded.  For instance, in the Hydra build farm, if there are many
  concurrent jobs, VM builds often fail because they hit the timeout.

svn path=/nixpkgs/trunk/; revision=22347
2010-06-20 20:52:08 +00:00
David Guibert
c6b05c7164 aufs2: patch for kernel 2.6.34
svn path=/nixpkgs/trunk/; revision=22178
2010-06-08 06:29:02 +00:00
Eelco Dolstra
6daa7866ca * Only build aufs2 for kernels that have the requisite base/standalone
patch applied.

svn path=/nixpkgs/trunk/; revision=22037
2010-05-28 09:29:39 +00:00
Eelco Dolstra
74b6d94ed5 * Get aufs2 and aufs2-util to build against Linux 2.6.32.
svn path=/nixpkgs/trunk/; revision=22032
2010-05-28 07:09:15 +00:00
David Guibert
7c19b40dbf kernel-2.6.34
The Linux 2.6.34 kernel delivers (from [1])
- many open-source GPU driver updates,
- GPU switching support,
- the LogFS file-system,
- faster KVM networking support,
- Btrfs file-system updates,
- the VMware memory ballooning driver,
- and many other changes.

A more exhaustive list of the Linux 2.6.34 kernel changes from
architectures to network drivers is listed on the Wiki at
KernelNewbies.org.[2]

[1] http://www.phoronix.com:
[2] http://kernelnewbies.org/Linux_2_6_34

svn path=/nixpkgs/trunk/; revision=22023
2010-05-27 19:44:23 +00:00
Eelco Dolstra
8f99f22819 * Kernel updates.
svn path=/nixpkgs/trunk/; revision=22002
2010-05-27 12:16:05 +00:00
Eelco Dolstra
a310fc9ed0 * Latest kernels.
svn path=/nixpkgs/trunk/; revision=21874
2010-05-19 12:28:54 +00:00
Ludovic Courtès
3bda68d779 Linux: Attempt to copy more debugging info to $out.
svn path=/nixpkgs/trunk/; revision=21624
2010-05-06 11:52:49 +00:00
Ludovic Courtès
074f450ab3 Linux: Patch incorrect absolute paths in makefiles.
svn path=/nixpkgs/trunk/; revision=21623
2010-05-06 11:52:43 +00:00
Ludovic Courtès
96f2d289bc Don't strip Linux modules in the SystemTap variant.
svn path=/nixpkgs/trunk/; revision=21619
2010-05-05 19:48:52 +00:00
Ludovic Courtès
588be9d6db Add a Linux kernel suitable for SystemTap.
svn path=/nixpkgs/trunk/; revision=21618
2010-05-05 19:48:46 +00:00
Eelco Dolstra
68d9e26bcb * Linux 2.6.32.12, 2.6.33.3.
svn path=/nixpkgs/trunk/; revision=21338
2010-04-27 09:52:36 +00:00
Eelco Dolstra
5330be5fbb * Latest Linux kernels.
svn path=/nixpkgs/trunk/; revision=20952
2010-04-06 10:33:49 +00:00
Michael Raskin
6934d0770c Fix build of fresh Zen kernels: POSIX ACL seems to be non-optional in OCFS2 now
svn path=/nixpkgs/trunk/; revision=20684
2010-03-17 10:04:35 +00:00
Eelco Dolstra
f02cd9d59c * Linux updated to 2.6.32.10, 2.6.33.1.
svn path=/nixpkgs/trunk/; revision=20646
2010-03-16 11:44:28 +00:00
Lluís Batlle i Rossell
11c20b3a2c Making the cross kernel builds take properly the cross-built uboot, when needed.
svn path=/nixpkgs/trunk/; revision=20455
2010-03-06 22:04:21 +00:00
Lluís Batlle i Rossell
ef1918f200 Allowing the kernel to build in the sheevaplug natively.
svn path=/nixpkgs/trunk/; revision=20284
2010-02-28 08:58:07 +00:00
Lluís Batlle i Rossell
289d728337 Fixing the kernel expressions to allow normal and cross-building, depending
on the native and cross platforms.

I thought I already did that today in a previous commit, but I did all wrong.

svn path=/nixpkgs/trunk/; revision=20280
2010-02-27 21:48:48 +00:00