Commit graph

451 commits

Author SHA1 Message Date
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