Commit graph

689 commits

Author SHA1 Message Date
Vladimír Čunát 26af997d41 Merge branch 'master' into stdenv-updates
Conflicts (simple):
	pkgs/applications/networking/browsers/chromium/default.nix
	pkgs/development/libraries/libsoup/default.nix
	pkgs/os-specific/linux/kernel/manual-config.nix
	pkgs/os-specific/linux/qemu-kvm/default.nix
2013-03-02 10:41:53 +01:00
aszlig 94fe64b3eb
manual-kernel: Add bc to buildNativeInputs.
As timeconst.pl was replaced by a bc script in the merge window for kernel 3.9,
we also need bc during build time, for more information about the reasons,
please have a look at the following commit:

torvalds/linux@70730bca13

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-02-28 18:57:03 +01:00
Eelco Dolstra bf8f39ff9b linux: Update to 3.2.39
CVE-2013-0228
2013-02-27 14:47:40 +01:00
Peter Simons 5f32207dfc Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-02-24 19:27:08 +01:00
Lluís Batlle i Rossell 17d289498f linux: Typo: CFG80211_WEXT 2013-02-24 12:07:14 +01:00
Lluís Batlle i Rossell 0961084afb linux 3.7, 3.8: Enabling CFG80211_WEXT (for ipw2200)
My computer with a ipw2200 nic needs that, to have the
ipw2200 driver.
2013-02-23 15:40:20 +01:00
Shea Levy afe3758b1b Remove myself from kernel maintainers.
I use manual config now.
2013-02-21 12:39:25 -05:00
Shea Levy acd4299e75 Merge branch 'master' into stdenv-updates
Conflicts:
	pkgs/applications/networking/browsers/chromium/default.nix
	pkgs/top-level/all-packages.nix

Merge conflicts seemed trivial, but a look from viric and aszlig would be nice.
2013-02-21 11:13:30 -05:00
David Guibert 059c30bf9d add kernel 3.8 2013-02-21 08:53:16 +01:00
Shea Levy aacca1902c Merge branch 'upstream-master' into stdenv-updates 2013-02-19 10:09:39 -05:00
Shea Levy a4d5e4a9e2 Linux 3.7.9 2013-02-18 11:35:22 -05:00
Shea Levy 0e4c3a1fc9 Linux 3.4.32 2013-02-18 11:34:42 -05:00
Shea Levy f4a51bbdd6 Linux 3.0.65 2013-02-18 11:34:19 -05:00
Eelco Dolstra 2aa6f262cb Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-02-15 13:36:34 +01:00
Shea Levy af26af6fc7 Remove EOL'd Linux 3.6 2013-02-14 14:33:42 -05:00
Shea Levy 0ad870eb5e Remove EOL'd Linux 3.5 2013-02-14 14:32:44 -05:00
Shea Levy c23084906b Remove EOL'd Linux 3.3 2013-02-14 14:30:31 -05:00
Shea Levy 0178a3b7b1 Remove EOL'd Linux 3.1 2013-02-14 14:28:53 -05:00
Shea Levy ca59489e2b Linux 3.7.8 2013-02-14 14:25:19 -05:00
Shea Levy e531913aca Linux 3.4.31 2013-02-14 14:25:11 -05:00
Shea Levy 2d23eb3a19 Linux 3.0.64 2013-02-14 14:24:57 -05:00
Lluís Batlle i Rossell 00251af191 SUNRPC_DEBUG doesn't work on linux 3.3
It's as if the option isn't there.

http://hydra.nixos.org/build/4015233
2013-02-14 20:08:08 +01:00
Shea Levy 3a8631201e Linux 3.4.30 2013-02-11 12:57:40 -05:00
Shea Levy 45e877f706 Linux 3.0.63 2013-02-11 12:53:43 -05:00
Shea Levy 170b0c9e2e Linux 3.7.7 2013-02-11 12:34:14 -05:00
Eelco Dolstra 76a5e89a1c linux: Update to 3.2.38 2013-02-11 15:34:30 +01:00
Lluís Batlle i Rossell c4216ed1a0 linux kernel: enabling SUNRPC_DEBUG
Much easier debugging of nfs issues.

If I understand correctly, it was enabled in 3.2 and below; I enable it for
next kernels.
2013-02-07 16:21:03 +01:00
Shea Levy 5336c82882 Linux 3.7.6 2013-02-04 06:58:19 -05:00
Shea Levy 249b3ea5ef Linux 3.4.29 2013-02-04 06:58:07 -05:00
Shea Levy c32435381e Linux 3.0.62 2013-02-04 06:57:46 -05:00
Lluís Batlle i Rossell 45de66b2b1 Update the raspberry pi kernel to one newer. 2013-01-29 20:17:32 +01:00
Eelco Dolstra 97c5ab3a6d linux-2.6.32-xen: Remove
Hasn't built in a long time and is obsolete anyway.
2013-01-29 12:43:53 +01:00
Shea Levy 2afdaf0e82 Linux 3.7.5 2013-01-28 00:12:35 -05:00
Shea Levy 4bf80b462d Linux 3.4.28 2013-01-28 00:12:24 -05:00
viric 39fa2f72ab Merge pull request #253 from rickynils/fscache
linux 3.2-3.7: enable NFS_FSCACHE and CIFS_FSCACHE
2013-01-27 12:39:25 -08:00
Rickard Nilsson 1886d1db6a Merge remote-tracking branch 'upstream/master' into stdenv-updates 2013-01-20 16:53:21 +01:00
David Guibert d54c8c4b83 update kernels: 3.0.59, 3.4.26 and 3.7.3 2013-01-18 08:31:25 +01:00
Eelco Dolstra 8faee15126 linux: Update to 3.2.37 2013-01-17 17:21:31 +01:00
Eelco Dolstra 5bb548d2e4 Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-01-17 14:19:14 +01:00
Mathijs Kwik 2d56a2cc15 linux-3.7: upgrade to 3.7.2 2013-01-13 14:30:55 +01:00
Mathijs Kwik 91d4d56703 linux-3.4: upgrade to 3.4.25 2013-01-13 14:30:55 +01:00
Mathijs Kwik cf546347e5 linux-3.0: upgrade to 3.0.58 2013-01-13 14:30:55 +01:00
Rickard Nilsson 97d6292deb linux 3.2-3.7: enable NFS_FSCACHE and CIFS_FSCACHE
NFS_FSCACHE and CIFS_FSCACHE are required to enable the local cache support for
NFS and CIFS (the 'fsc' mount option). The reasoning for enabling it from 3.2
and forward is that at least Ubuntu 12.04 (linux 3.2) has it turned on. Could
probably be enabled for earlier kernels too.
2013-01-09 18:14:54 +01:00
Peter Simons 9e9cd7b529 Merge branch 'master' into stdenv-updates. 2013-01-04 21:00:53 +01:00
Eelco Dolstra 99897218f4 linux: Update to 3.2.36 2013-01-04 14:19:00 +01:00
Lluís Batlle i Rossell 67aa9243f0 Merge branch 'stdenv-updates' into pi-stdenv-updates
Conflicts:
	pkgs/development/compilers/gcc/4.7/default.nix

Trivial.
2012-12-28 23:30:53 +01:00
Lluís Batlle i Rossell b58780c43d Merge remote-tracking branch 'eelco/master' into stdenv-updates
Conflicts:
	pkgs/development/compilers/gcc/4.7/default.nix

Trivial solution.
2012-12-28 23:28:16 +01:00
Lluís Batlle i Rossell 719ba63004 Merge branch 'stdenv-updates' into pi-stdenv-updates
Conflicts:
	pkgs/development/compilers/gcc/4.6/default.nix
	pkgs/development/compilers/gcc/4.7/default.nix

The 4.7 had some weird parameters added in crossAttrs; I've removed
them, but I don't understand where they come from.
2012-12-28 20:14:01 +00:00
Eelco Dolstra ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
Eelco Dolstra 5be0a9acd7 Rename hostDrv -> crossDrv, buildDrv -> nativeDrv
This is for consistency with terminology in stdenv (and the terms
"hostDrv" and "buildDrv" are not very intuitive, even if they're
consistent with GNU terminology).
2012-12-28 19:08:19 +01:00
Lluís Batlle i Rossell ab2520c383 Adding linux-3.6-rpi
I picked the change from
7b4d69eeff
2012-12-27 21:29:56 +00:00
Shea Levy 9247552a91 Linux 3.7.1 2012-12-17 17:45:01 -05:00
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