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 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