Commit graph

331 commits

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