philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity
%!d() commits 3 branches 0 tags 1.4 GiB
Commit graph

263 commits

Author SHA1 Message Date
Lluís Batlle i Rossell 9183f21f7e Merging from trunk. 
I fixed conflicts regarding the renaming 'kernel' -> 'linux' in all-packages.
Also a small conflict in all-packages about making openssl overridable.
And I some linux 2.6.31-zen kernel files also marked in conflict.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19438
 2010-01-14 14:49:31 +00:00
Michael Raskin 5bf63365d2 Update options according to renaming of them in Zen 
svn path=/nixpkgs/trunk/; revision=19407
 2010-01-13 16:19:48 +00:00
Michael Raskin fdc45114a7 Remove tabs 
svn path=/nixpkgs/trunk/; revision=19403
 2010-01-13 15:42:08 +00:00
Michael Raskin 77c9077f0a Adding a attrSet to import configuration chunks from 
svn path=/nixpkgs/trunk/; revision=19398
 2010-01-13 15:16:08 +00:00
Eelco Dolstra 0f38401813 * Latest and greatest kernels. 
svn path=/nixpkgs/trunk/; revision=19287
 2010-01-07 14:10:39 +00:00
Eelco Dolstra ed4447febd * Urgh - generic.nix doesn't expect a `extraConfig' argument. 
svn path=/nixpkgs/trunk/; revision=19205
 2010-01-04 13:14:39 +00:00
Eelco Dolstra e3c2b77c11 * Add the gcov patch to patches.nix. 
svn path=/nixpkgs/trunk/; revision=19190
 2010-01-03 17:57:08 +00:00
Lluís Batlle i Rossell d864771e26 Updating from trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19139
 2009-12-28 11:40:34 +00:00
Lluís Batlle i Rossell d5aa5641de Fixing the evaluation of the linux kernel (= /= ==) 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19138
 2009-12-28 11:26:23 +00:00
Lluís Batlle i Rossell 1452ce46a4 Fixing the kernel configuration for the sheevaplug 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19137
 2009-12-28 10:35:34 +00:00
Eelco Dolstra ea5a440d42 * Linux 2.6.32.2, 2.6.27.42. 
svn path=/nixpkgs/trunk/; revision=19091
 2009-12-24 12:48:01 +00:00
Lluís Batlle i Rossell 9ef11e4c4d Made the linux kernel expressions support 'platform' again (thinking on reusing 
most of the kernel expressions for the sheevaplug).
I still have not added anything in the kernels about cross compilation.
I moved the platform definitions out of all-packages.
I have not written good platform definitions for the sheevaplug - only for the
PC.
Only the linux-2.6.32 expression uses the platforms kernelConfig.
The linux-2.6.31 was broken, and I left it broken.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19046
 2009-12-19 12:12:24 +00:00
Lluís Batlle i Rossell 5bae851b1e Merging from trunk. I had to give away some structure to build the native 
sheevaplug kernel, so the kernel does not build in the sheevaplug right now.
I will try to fix that in next commits.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19045
 2009-12-19 11:14:16 +00:00
Eelco Dolstra c122c7a5ba * Hm, I thought I tested this... 
svn path=/nixpkgs/trunk/; revision=19032
 2009-12-18 12:23:13 +00:00
Eelco Dolstra cfd6dd29fe * Linux 2.6.32.1. 
svn path=/nixpkgs/branches/kernel-config/; revision=19000
 2009-12-16 19:22:42 +00:00
Eelco Dolstra f833d465e6 * Enable Kernel Samepage Merging. 
svn path=/nixpkgs/branches/kernel-config/; revision=18949
 2009-12-14 19:30:25 +00:00
Eelco Dolstra 2e5908b1df * Use the kernel config generator for Linux 2.6.25. 
svn path=/nixpkgs/branches/kernel-config/; revision=18948
 2009-12-14 19:08:20 +00:00
Eelco Dolstra 00c641d336 * Use the kernel config generator for Linux 2.6.28. 
* Get rid of Linux 2.6.20 and 2.6.26 (the former was only used for
  building UML).

svn path=/nixpkgs/branches/kernel-config/; revision=18945
 2009-12-14 18:34:46 +00:00
Eelco Dolstra ec2fd60f88 * Doh! 
svn path=/nixpkgs/branches/kernel-config/; revision=18944
 2009-12-14 18:30:52 +00:00
Eelco Dolstra c3e80cbc9f * Get User-Mode Linux to build with a newer kernel. Yes, SHELL really 
has to be "/bin/sh" - other values such as "sh" or "bash" or "$(type
  -tP sh)" cause a build error:

  LD      .tmp_vmlinux1
  /nix/store/1yv8i1m76cvwk5w5i5wrk4gj5zyfj6vh-binutils-2.19.1/bin/ld:arch/um/kernel/vmlinux.lds:1: ignoring invalid character `#' in expression
  /nix/store/1yv8i1m76cvwk5w5i5wrk4gj5zyfj6vh-binutils-2.19.1/bin/ld:arch/um/kernel/vmlinux.lds:1: syntax error
  collect2: ld returned 1 exit status

  This is caused by Bash 4.0
  (http://bugzilla.kernel.org/show_bug.cgi?id=13343).

svn path=/nixpkgs/branches/kernel-config/; revision=18941
 2009-12-14 17:22:38 +00:00
Eelco Dolstra 03b4efe9c8 * Use the kernel config generator for Linux 2.6.27. 
* Move kernel patches out of all-packages.nix to
  os-specific/linux/kernel/patches.nix.
* Make the kernel config available under $out/config (it's also in
  $out/lib/modules/$version/build/.config, but that's kind of hard to
  find).

svn path=/nixpkgs/branches/kernel-config/; revision=18937
 2009-12-14 15:28:55 +00:00
Eelco Dolstra 98101f9cb1 * Linux 2.6.32. 
svn path=/nixpkgs/branches/kernel-config/; revision=18932
 2009-12-14 10:15:52 +00:00
Eelco Dolstra 15c6ede144 * Allow options to be ignored if they don't exist by marking them with 
a "?".

svn path=/nixpkgs/branches/kernel-config/; revision=18931
 2009-12-14 09:27:15 +00:00
Eelco Dolstra 71ed6194e1 * Get fbcondecor to work. 
* Barf on ignored options.

svn path=/nixpkgs/branches/kernel-config/; revision=18914
 2009-12-12 18:55:17 +00:00
Eelco Dolstra 03e45e0cb4 * Added a script to generate the kernel configuration. 
`generate-config.pl' runs `make config' to generate a Linux kernel
  configuration file.  For each question (i.e. kernel configuration
  option), unless an override is provided, it answers "m" if possible,
  and otherwise uses the default answer (as determined by the default
  config for the architecture).  This is safer than allmodconfig,
  which answers "y" everywhere it can't answer "m" and thus ends up
  enabling a lot of experimental or debug options.  (For this reason,
  a configuration generated by allmodconfig must be carefully checked
  with every new release to ensure that nothing dangerous is enabled.
  The default config should be safer wrt new kernel releases.)

  Overrides are specified in the `config' argument to generic.nix,
  which is a string that contains lines such as `EXT2_FS_POSIX_ACL y'.
  The script warns about ignored options, and aborts if `make config'
  selects an answer inconsistent with the one in `config'.  This
  allows us to be sure that `make config' doesn't silently override
  our configuration values (e.g., depending on other options, it will
  set FB_TILEBLITTING to "y" even if we want it to be "n").

svn path=/nixpkgs/branches/kernel-config/; revision=18910
 2009-12-12 13:51:07 +00:00
Lluís Batlle i Rossell 89fe676bb3 Updating from trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=18878
 2009-12-10 14:48:45 +00:00
Eelco Dolstra ebeacec489 * Linux 2.6.27.39. 
svn path=/nixpkgs/trunk/; revision=18838
 2009-12-08 11:38:19 +00:00
Michael Raskin 84eb2eadef Apply patch from Lluis needed for future ARM merge.. 
svn path=/nixpkgs/trunk/; revision=18776
 2009-12-03 07:08:51 +00:00
Lluís Batlle i Rossell 7769ad11bd Updating the logic to put the resulting kernel image into its store path. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=18289
 2009-11-08 17:19:46 +00:00
Lluís Batlle i Rossell 4b27d28701 Porting changes from stdenv-updates into this branch. 
This comes from:
svn diff  ^/nixpkgs/trunk/@18255 ^/nixpkgs/branches/stdenv-updates/ > diff
patch -p0 < diff
and then adding into svn all files new from the patch.

trunk@18255 comes from the last time I updated stdenv-updates from trunk.


svn path=/nixpkgs/stdenv-updates2/; revision=18272
 2009-11-08 00:32:12 +00:00
Eelco Dolstra 45ba16864f * Deleted some obsolete kernels (2.6.20, 2.6.21, 2.6.22, 2.6.23 and 
the 2.6.31rcs).

svn path=/nixpkgs/trunk/; revision=18065
 2009-11-01 17:17:40 +00:00
Eelco Dolstra 41879a5c74 * Linux 2.6.27.38. 
svn path=/nixpkgs/trunk/; revision=17985
 2009-10-28 12:07:00 +00:00
Ludovic Courtès 37b42b3ab7 Linux: Enable `sdhci', for Ricoh SD readers. 
svn path=/nixpkgs/trunk/; revision=17954
 2009-10-25 15:22:54 +00:00
Eelco Dolstra 21ddf5e52e * Linux 2.6.27.37. 
svn path=/nixpkgs/trunk/; revision=17909
 2009-10-21 13:07:09 +00:00
Eelco Dolstra 213519d327 * Linux 2.6.27.35. 
svn path=/nixpkgs/trunk/; revision=17422
 2009-09-25 18:59:07 +00:00
Michael Raskin f4162c9716 Turn off more debug options not needed by default 
svn path=/nixpkgs/trunk/; revision=17103
 2009-09-13 20:22:37 +00:00
Michael Raskin a8fa3e9cc9 Removing more debugging options from default 2.6.31 config 
svn path=/nixpkgs/trunk/; revision=17101
 2009-09-13 20:10:19 +00:00
Michael Raskin 01063c854b Remove option stopping 2.6.31 from booting 
svn path=/nixpkgs/trunk/; revision=17094
 2009-09-13 16:24:44 +00:00
Michael Raskin 0462878b22 Fixing a typo 
svn path=/nixpkgs/trunk/; revision=17067
 2009-09-12 07:33:55 +00:00
Michael Raskin a5023cf381 Adding 2.6.31 kernel and trying to generate config for it without manual operations 
svn path=/nixpkgs/trunk/; revision=17065
 2009-09-12 07:13:20 +00:00
Michael Raskin 491255bbb3 Trying to add Zen Linux Kernel 
svn path=/nixpkgs/trunk/; revision=17050
 2009-09-11 13:16:18 +00:00
Eelco Dolstra 2dffe66c92 * Linux 2.6.27.31. 
svn path=/nixpkgs/trunk/; revision=16754
 2009-08-18 09:29:03 +00:00
Eelco Dolstra e8dbd26bee * Linux 2.6.27.29. 
svn path=/nixpkgs/trunk/; revision=16554
 2009-08-03 10:04:20 +00:00
Michael Raskin be5fc98c97 Really non-PAE configuration this time 
svn path=/nixpkgs/trunk/; revision=16552
 2009-08-03 09:25:57 +00:00
Michael Raskin 3baa3663c9 Try newer -RC kernel 
svn path=/nixpkgs/trunk/; revision=16504
 2009-07-29 18:10:26 +00:00
Michael Raskin 15bec036fa Add 2.6.31-rc2 kernel for now : rc3 has a BtrFS stability regression 
svn path=/nixpkgs/trunk/; revision=16384
 2009-07-16 06:30:25 +00:00
Michael Raskin 8eefb03231 Fix typo 
svn path=/nixpkgs/trunk/; revision=16383
 2009-07-15 21:09:17 +00:00
Michael Raskin 0865385a29 Add a config for older x86 processors without PAE support. Turn off PAT for a good measure, too 
svn path=/nixpkgs/trunk/; revision=16382
 2009-07-15 21:01:24 +00:00
Michael Raskin 57c8392eee Fixed cmdline override in 2.6.31-rc3 kernel config 
svn path=/nixpkgs/trunk/; revision=16362
 2009-07-14 19:24:10 +00:00
Michael Raskin a310f4f2a0 Forgot to turn off debugging options in all-mod-config.. 
svn path=/nixpkgs/trunk/; revision=16347
 2009-07-14 10:23:45 +00:00
Michael Raskin 396ae631ea Add AMD64 config for 2.6.31-rc3 
svn path=/nixpkgs/trunk/; revision=16346
 2009-07-14 09:57:51 +00:00
Michael Raskin 64c89c7532 Oops, mixed up hashes 
svn path=/nixpkgs/trunk/; revision=16345
 2009-07-14 09:18:22 +00:00
Michael Raskin ad2f62980a Try building a really full-featured configuration of the fresh Linux kernel pre-release 
svn path=/nixpkgs/trunk/; revision=16344
 2009-07-14 09:13:59 +00:00
Eelco Dolstra bfadd94cec * Kernel updates. 
svn path=/nixpkgs/trunk/; revision=16155
 2009-07-03 09:11:46 +00:00
Eelco Dolstra 85479e92d1 * Linux 2.6.29.5. 
* Build the PC speaker as a module.  This allows people who are
  annoyed by beeps (e.g. users of Dell Latitude D6xx laptops) to get
  rid of them :-)

svn path=/nixpkgs/trunk/; revision=15983
 2009-06-17 12:26:22 +00:00
Eelco Dolstra 588eb7a351 * Linux 2.6.27.25. 
svn path=/nixpkgs/trunk/; revision=15962
 2009-06-15 15:05:42 +00:00
Eelco Dolstra e559192847 * Fix module installation. 
svn path=/nixpkgs/trunk/; revision=15887
 2009-06-07 21:49:14 +00:00
Eelco Dolstra 86e3458dd7 * Linux 2.6.29. It doesn't build yet due to some depmod problem. 
svn path=/nixpkgs/trunk/; revision=15884
 2009-06-06 23:09:38 +00:00
Eelco Dolstra 6645fcb0c5 * Oops. 
svn path=/nixpkgs/trunk/; revision=15821
 2009-06-02 12:29:40 +00:00
Eelco Dolstra 32aa1eacf3 * Linux 2.6.27.24, 2.6.28.10. 
svn path=/nixpkgs/trunk/; revision=15819
 2009-06-02 09:48:01 +00:00
Michael Raskin 65a87fefd5 Fix kernel builder - fails, depending on FS behavior 
svn path=/nixpkgs/trunk/; revision=15437
 2009-05-04 10:51:51 +00:00
Michael Raskin 10b1740dab Copy all the headers already - problems with module building seem to be worse than hdd usage 
svn path=/nixpkgs/trunk/; revision=15423
 2009-05-02 14:18:22 +00:00
Eelco Dolstra 7689a348c4 * Got rid of a lot of "postInstall=postInstall" and similar lines in 
builders.  These are redundant now.
* Inlined some trivial builders.
* Removed a few explicit setup-hook creations.  This is done
  automatically now if setupHook is set.
* Deleted the initscripts package.  NixOS doesn't use it anymore.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15276
 2009-04-23 13:31:10 +00:00
Michael Raskin 9379c34b11 Renable preConfigure for kernel builder. Actually needed by custom kernel 
Linux kernel 2.6.29 (release) has a slightly changed Makefile. They now add the prefix for depmod. So in NixOS "make modules_install" fails on depmod. To fix it, our old '/-b \$(INSTALL_MOD_PATH) -r/d' should be replaced with '/-b \$(INSTALL_MOD_PATH)/d'.

svn path=/nixpkgs/trunk/; revision=14811
 2009-03-31 20:10:05 +00:00
Eelco Dolstra 105f9f7b80 * Some kernel updates. 
svn path=/nixpkgs/trunk/; revision=14790
 2009-03-30 15:02:17 +00:00
Ludovic Courtès b161fd2921 Linux: Build the `sdhci' module, for Ricoh SD readers. 
svn path=/nixpkgs/trunk/; revision=14541
 2009-03-15 14:03:59 +00:00
Eelco Dolstra f8641d34a2 * Latest kernels. 
svn path=/nixpkgs/trunk/; revision=14486
 2009-03-10 09:05:43 +00:00
Michael Raskin 958a01ffa6 These changes to kernel builder are obviously needed. kQemu is built, but causes kernel oops 
svn path=/nixpkgs/trunk/; revision=14213
 2009-02-24 05:10:36 +00:00
Lluís Batlle i Rossell f9b79d752a Fixing in general the module construction (there were wrong paths in modules/build). Now kqemu works well for me, for instance. I will take the commit back, if it annoys anyone. 
svn path=/nixpkgs/trunk/; revision=14192
 2009-02-22 20:49:35 +00:00
Eelco Dolstra a6a74c53f8 * Latest 2.6.{27,28} kernels. 
svn path=/nixpkgs/trunk/; revision=14136
 2009-02-20 10:56:00 +00:00
Eelco Dolstra 5e3c509cb8 * Latest kernels. 
svn path=/nixpkgs/trunk/; revision=14019
 2009-02-10 11:10:12 +00:00
Eelco Dolstra a6867fa9a3 * Linux 2.6.28.3. 
svn path=/nixpkgs/trunk/; revision=13963
 2009-02-02 19:00:30 +00:00
Eelco Dolstra 858cf3cdcb * Wrong hash. 
svn path=/nixpkgs/trunk/; revision=13899
 2009-01-29 11:00:56 +00:00
Eelco Dolstra e5349d1716 * Linux 2.6.27.13 and 2.6.28.2. 
svn path=/nixpkgs/trunk/; revision=13887
 2009-01-27 14:56:17 +00:00
Michael Raskin 4e9b120ad2 small fixes to build custom kernel 
svn path=/nixpkgs/trunk/; revision=13795
 2009-01-17 13:40:12 +00:00
Eelco Dolstra 4eedf7dae8 * Install the arch-specific headers for Linux <= 2.6.27 properly 
again.

svn path=/nixpkgs/trunk/; revision=13783
 2009-01-16 10:28:18 +00:00
Eelco Dolstra 89364df3e9 svn path=/nixpkgs/trunk/; revision=13781 2009-01-15 16:22:01 +00:00
Eelco Dolstra 7df6cdf6da * Doh. 
svn path=/nixpkgs/trunk/; revision=13780
 2009-01-15 15:59:59 +00:00
Eelco Dolstra f89876974e * Use the generic kernel builder. 
svn path=/nixpkgs/trunk/; revision=13779
 2009-01-15 15:54:24 +00:00
Eelco Dolstra a0670a904e * Reduce duplication between kernel expressions. 
svn path=/nixpkgs/trunk/; revision=13778
 2009-01-15 15:40:23 +00:00
Eelco Dolstra 2188660f2d * CONFIG_LSF should be set on i686, otherwise ext4 can't even mount 
filesystems created by mkfs.ext4 with default options.

svn path=/nixpkgs/trunk/; revision=13777
 2009-01-15 15:11:14 +00:00
Eelco Dolstra 739ef5e82a * Various hacks needed to get the NVIDIA driver to build on 
Linux 2.6.28.  In particular the arch-specific headers
  are in a different place now.  (I'd like to do "make
  headers_install", but it doesn't install all the headers
  that are needed to build external kernel modules.  What
  a mess.)
* Add Linux 2.6.28 to the channel.

svn path=/nixpkgs/trunk/; revision=13775
 2009-01-15 15:00:30 +00:00
Eelco Dolstra 6c0b144efc * Linux 2.6.27.10. 
svn path=/nixpkgs/trunk/; revision=13752
 2009-01-13 09:05:05 +00:00
Eelco Dolstra 33278912fd * Linux 2.6.28. 
svn path=/nixpkgs/trunk/; revision=13743
 2009-01-12 13:11:18 +00:00
Eelco Dolstra 3189f877d0 * Linux 2.6.27.7 
svn path=/nixpkgs/trunk/; revision=13487
 2008-11-28 13:12:43 +00:00
Eelco Dolstra dbc520876d * Linux 2.6.27.4. Not tested yet. 
svn path=/nixpkgs/trunk/; revision=13144
 2008-10-29 12:34:54 +00:00
Eelco Dolstra 3a1136f6ad * Linux 2.6.26.7. 
svn path=/nixpkgs/trunk/; revision=13139
 2008-10-28 16:00:37 +00:00
Eelco Dolstra e826b90e73 * Linux 2.6.26.6. 
svn path=/nixpkgs/trunk/; revision=13022
 2008-10-09 13:15:45 +00:00
Michael Raskin 3a7ffa5c58 Some of preparation work for adding Xen. Troubles: 1. Xen Dom0 support not complete in mainline. 2. Xen's love to check for headers in /usr/include. To do afterwards: We need to change bootloading setup a bit. 
svn path=/nixpkgs/trunk/; revision=12941
 2008-10-04 15:24:08 +00:00
Eelco Dolstra 8d7d8fc4bd * Linux 2.6.25.17. 
svn path=/nixpkgs/trunk/; revision=12879
 2008-09-18 09:53:12 +00:00
Eelco Dolstra 29f04e4331 * Linux 2.6.26.5. 
svn path=/nixpkgs/trunk/; revision=12833
 2008-09-09 09:54:33 +00:00
Eelco Dolstra 649ccdd2db * Moved the Linux kernel maintenance notes to the manual, expanded 
them.

svn path=/nixpkgs/trunk/; revision=12739
 2008-08-27 12:59:55 +00:00
Eelco Dolstra 4457e49a90 * Linux 2.6.25.16. 
svn path=/nixpkgs/trunk/; revision=12693
 2008-08-22 12:25:51 +00:00
Eelco Dolstra eb63b86c6d * Doh doh doh! Use the right config file for the 2.6.26 kernel. 
svn path=/nixpkgs/trunk/; revision=12690
 2008-08-22 10:55:00 +00:00
Eelco Dolstra 16d317e709 * Linux 2.6.26.3. 
svn path=/nixpkgs/trunk/; revision=12674
 2008-08-21 08:33:46 +00:00
Eelco Dolstra 73eaeefcfd * Linux 2.6.25.15. 
svn path=/nixpkgs/trunk/; revision=12583
 2008-08-11 12:01:55 +00:00
Eelco Dolstra 9d0b7c4aa9 * Linux 2.6.26.2. Totally untested of course. 
svn path=/nixpkgs/trunk/; revision=12534
 2008-08-07 14:57:10 +00:00
Eelco Dolstra f6935cfd98 * Linux 2.6.25.14. 
svn path=/nixpkgs/trunk/; revision=12495
 2008-08-04 17:54:34 +00:00
Eelco Dolstra 9d741c88bf * Linux 2.6.25.11. 
svn path=/nixpkgs/trunk/; revision=12381
 2008-07-18 14:53:48 +00:00
Eelco Dolstra 343d4fc9f6 * Linux 2.6.25.9 
svn path=/nixpkgs/trunk/; revision=12212
 2008-06-29 17:02:08 +00:00