Commit graph

436 commits

Author SHA1 Message Date
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 &nbsp; 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
Eelco Dolstra 7dea1a0f4f * Revert to 2.6.32.18 for now, because we get a lot of "BUG:
scheduling while atomic" errors
  (e.g. http://hydra.nixos.org/build/568323/log/raw).  This might be
  fixed by this patch: http://lkml.org/lkml/2010/8/6/672

svn path=/nixpkgs/trunk/; revision=23272
2010-08-20 13:13:26 +00:00
Eelco Dolstra 2e230288bf * Latest kernels.
svn path=/nixpkgs/trunk/; revision=23270
2010-08-20 09:29:10 +00:00
Michael Raskin 2d062ba772 Allow override options being required in kernel configuration.. Otherwise modifying significantly config via extraConfig becomes practically impossible.
svn path=/nixpkgs/trunk/; revision=23171
2010-08-14 09:18:57 +00:00
David Guibert 92d437c54f kernel updates and add kernel 2.6.35.1
svn path=/nixpkgs/trunk/; revision=23155
2010-08-12 16:33:19 +00:00
Eelco Dolstra e4686546ec * Enable parallel building for the Linux kernel, an obvious candidate.
svn path=/nixpkgs/trunk/; revision=23109
2010-08-11 10:43:09 +00:00
Eelco Dolstra 5c8b4ec35a * Linux 2.6.32.18.
svn path=/nixpkgs/trunk/; revision=23104
2010-08-11 09:25:35 +00:00
Lluís Batlle i Rossell 4137ceaf80 Updated nanonote 2.6.35 kernel (fixed a keyboard matrix problem)
svn path=/nixpkgs/branches/stdenv-updates/; revision=23041
2010-08-08 18:50:10 +00:00
Lluís Batlle i Rossell eddc9d6ab5 Fixing the nanonote kernel expressions so they work.
In fact only 2.6.34 boots fine, while 2.6.35 needs a fetchsvn new revision,
waiting for an upstream patch.

svn path=/nixpkgs/branches/stdenv-updates/; revision=23039
2010-08-08 18:46:57 +00:00
Lluís Batlle i Rossell 46082f25f9 Updating from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=23027
2010-08-07 20:14:04 +00:00
Lluís Batlle i Rossell 8783e812b5 More changes beyond stdenv-linux for the fuloong2f platform
svn path=/nixpkgs/branches/stdenv-updates/; revision=22973
2010-08-05 18:51:12 +00:00
Lluís Batlle i Rossell b17d1d7d07 Adding nanonote kernel and uboot
svn path=/nixpkgs/branches/stdenv-updates/; revision=22943
2010-08-04 11:07:13 +00:00
Eelco Dolstra 5a08a41204 * Kernel updates.
svn path=/nixpkgs/trunk/; revision=22941
2010-08-04 10:40:25 +00:00
Eelco Dolstra 3f287cfb1d * Ensure that the dell-bluetooth device does not stay in the "hard
blocked" state.

svn path=/nixpkgs/branches/x-updates/; revision=22730
2010-07-25 12:15:59 +00:00
Eelco Dolstra 3d442ad185 * Apply a patch that is apparently required to make the kernel work
properly on Amazon EC2.
* Always apply the CIFS timeout patch.  It's rather annoying to have
  to build a separate kernel for the VM tests.

svn path=/nixpkgs/trunk/; revision=22630
2010-07-18 21:10:46 +00:00
Eelco Dolstra 237c7808ce * Latest Linux kernels.
svn path=/nixpkgs/trunk/; revision=22488
2010-07-06 08:44:05 +00:00
Eelco Dolstra cb5bcfa04a * In the VM tests, apply a patch to increase the 15s timeout on CIFS
operations to 120s.  This is necessary if the host is heavily
  loaded.  For instance, in the Hydra build farm, if there are many
  concurrent jobs, VM builds often fail because they hit the timeout.

svn path=/nixpkgs/trunk/; revision=22347
2010-06-20 20:52:08 +00:00
David Guibert c6b05c7164 aufs2: patch for kernel 2.6.34
svn path=/nixpkgs/trunk/; revision=22178
2010-06-08 06:29:02 +00:00
Eelco Dolstra 6daa7866ca * Only build aufs2 for kernels that have the requisite base/standalone
patch applied.

svn path=/nixpkgs/trunk/; revision=22037
2010-05-28 09:29:39 +00:00
Eelco Dolstra 74b6d94ed5 * Get aufs2 and aufs2-util to build against Linux 2.6.32.
svn path=/nixpkgs/trunk/; revision=22032
2010-05-28 07:09:15 +00:00
David Guibert 7c19b40dbf kernel-2.6.34
The Linux 2.6.34 kernel delivers (from [1])
- many open-source GPU driver updates,
- GPU switching support,
- the LogFS file-system,
- faster KVM networking support,
- Btrfs file-system updates,
- the VMware memory ballooning driver,
- and many other changes.

A more exhaustive list of the Linux 2.6.34 kernel changes from
architectures to network drivers is listed on the Wiki at
KernelNewbies.org.[2]

[1] http://www.phoronix.com:
[2] http://kernelnewbies.org/Linux_2_6_34

svn path=/nixpkgs/trunk/; revision=22023
2010-05-27 19:44:23 +00:00
Eelco Dolstra 8f99f22819 * Kernel updates.
svn path=/nixpkgs/trunk/; revision=22002
2010-05-27 12:16:05 +00:00
Eelco Dolstra a310fc9ed0 * Latest kernels.
svn path=/nixpkgs/trunk/; revision=21874
2010-05-19 12:28:54 +00:00
Ludovic Courtès 3bda68d779 Linux: Attempt to copy more debugging info to $out.
svn path=/nixpkgs/trunk/; revision=21624
2010-05-06 11:52:49 +00:00
Ludovic Courtès 074f450ab3 Linux: Patch incorrect absolute paths in makefiles.
svn path=/nixpkgs/trunk/; revision=21623
2010-05-06 11:52:43 +00:00
Ludovic Courtès 96f2d289bc Don't strip Linux modules in the SystemTap variant.
svn path=/nixpkgs/trunk/; revision=21619
2010-05-05 19:48:52 +00:00
Ludovic Courtès 588be9d6db Add a Linux kernel suitable for SystemTap.
svn path=/nixpkgs/trunk/; revision=21618
2010-05-05 19:48:46 +00:00
Eelco Dolstra 68d9e26bcb * Linux 2.6.32.12, 2.6.33.3.
svn path=/nixpkgs/trunk/; revision=21338
2010-04-27 09:52:36 +00:00
Eelco Dolstra 5330be5fbb * Latest Linux kernels.
svn path=/nixpkgs/trunk/; revision=20952
2010-04-06 10:33:49 +00:00
Michael Raskin 6934d0770c Fix build of fresh Zen kernels: POSIX ACL seems to be non-optional in OCFS2 now
svn path=/nixpkgs/trunk/; revision=20684
2010-03-17 10:04:35 +00:00
Eelco Dolstra f02cd9d59c * Linux updated to 2.6.32.10, 2.6.33.1.
svn path=/nixpkgs/trunk/; revision=20646
2010-03-16 11:44:28 +00:00
Lluís Batlle i Rossell 11c20b3a2c Making the cross kernel builds take properly the cross-built uboot, when needed.
svn path=/nixpkgs/trunk/; revision=20455
2010-03-06 22:04:21 +00:00
Lluís Batlle i Rossell ef1918f200 Allowing the kernel to build in the sheevaplug natively.
svn path=/nixpkgs/trunk/; revision=20284
2010-02-28 08:58:07 +00:00
Lluís Batlle i Rossell 289d728337 Fixing the kernel expressions to allow normal and cross-building, depending
on the native and cross platforms.

I thought I already did that today in a previous commit, but I did all wrong.

svn path=/nixpkgs/trunk/; revision=20280
2010-02-27 21:48:48 +00:00
Lluís Batlle i Rossell 3b747e92e5 Fixing the correct handling of uboot in the initrd and the kernel derivations.
(nixos on sheevaplug)


svn path=/nixpkgs/trunk/; revision=20275
2010-02-27 18:51:06 +00:00
Lluís Batlle i Rossell 11aa65c28a Simplified much more the expressions for cross building and multiplatform.
I introduce the new nixpkgs parameter "platform", defaulting to "pc",
which was before defined as an attribute of nixpkgs.

I made the crossSystem nixpkgs attribute set parameter contain its own 'platform'.

This allows cross-building a kernel for a given crossSystem.platform in a non-PC
platform.

The actual native platform can be taken from stdenv.platform, and this way we also
avoid the constant passing of 'platform' to packages for platform-dependant builds
(kernel, initrd, ...).

I will update nixos accordingly to these changes, for non-PC platforms to work.

I think we are gaining on flexibility and clearness. I could cross build succesfully
an ultrasparc kernel and a mipsel kernel on PC. But since this change, I should be able
to do this also in non-PC.

Before this change, there was no possibility of distinguishing the "target platform" or
the "native build platform" when cross building, being the single "platform" attribute
always interpreted as target platform.

The platform is a quite relevant attribute set, as it determines the linuxHeaders used
(in the case, by now the only one supported, of linux targets).

The platform attributes are quite linux centric still. Let's hope for more generality to come.

svn path=/nixpkgs/trunk/; revision=20273
2010-02-27 17:35:47 +00:00
Eelco Dolstra 61c9c2434f * Updated fbcondecor for Linux 2.6.33.
svn path=/nixpkgs/trunk/; revision=20257
2010-02-25 14:15:42 +00:00
Eelco Dolstra 280ba422b8 * Linux 2.6.32.9.
svn path=/nixpkgs/trunk/; revision=20255
2010-02-25 13:55:57 +00:00
Eelco Dolstra e04c9a452a * Linux 2.6.33.
svn path=/nixpkgs/trunk/; revision=20246
2010-02-25 12:40:03 +00:00
Lluís Batlle i Rossell 9727f3d707 Making the i915 module Kernel Mode Setting enabled.
This is required by the X module nowadays, and the linux i686 config does not
have it enabled by default.


svn path=/nixpkgs/trunk/; revision=20136
2010-02-19 18:28:02 +00:00
Lluís Batlle i Rossell 50e309f022 linux: Removing some assertions on armv5tel no more valid when cross-building.
svn path=/nixpkgs/trunk/; revision=20119
2010-02-18 21:10:53 +00:00
Lluís Batlle i Rossell 9bcb6277f3 Changing linux kernel references from vmlinuz to bzImage.
This way we get a simpler kernel build script.

svn path=/nixpkgs/trunk/; revision=20094
2010-02-18 11:34:48 +00:00
Lluís Batlle i Rossell 5fc64e5f9c Again, trying to fix the kernel build.
It seems that there is no make target named 'vmlinuz' that makes the file 'vmlinuz'.
So we need different variables for the make target and the kernel file. Unless we
some day stop using the file 'vmlinuz' in pc, and use bzImage.

svn path=/nixpkgs/trunk/; revision=20092
2010-02-18 10:25:33 +00:00
Lluís Batlle i Rossell ee72c53378 Trying to fix the non-cross kernel build.
svn path=/nixpkgs/trunk/; revision=20090
2010-02-18 08:02:16 +00:00
Lluís Batlle i Rossell 4e51d7d296 Fixing the linux kernel cross builder (lacking an ARCH again in a make call)
svn path=/nixpkgs/trunk/; revision=20081
2010-02-17 22:36:59 +00:00
Lluís Batlle i Rossell 70cb7050f5 Trying to make the linux kernels also cross-build.
svn path=/nixpkgs/trunk/; revision=20080
2010-02-17 22:20:56 +00:00
Lluís Batlle i Rossell c86da889cc Made the kernel generate-config "build as modules as you can" an option.
Sepcifically, a nixpkgs "platform" option. So, for PC all remained the same
as it was.

svn path=/nixpkgs/trunk/; revision=20059
2010-02-16 19:27:51 +00:00
Eelco Dolstra 2027b96de5 * Linux 2.6.32.8.
svn path=/nixpkgs/trunk/; revision=19933
2010-02-11 14:33:17 +00:00
Eelco Dolstra a617a7c239 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19786
2010-02-03 14:23:43 +00:00
Eelco Dolstra 26ea153e8b svn path=/nixpkgs/trunk/; revision=19724 2010-01-29 00:38:34 +00:00
Eelco Dolstra e04beb262e * Strangely, running "make defconfig" before the generator causes
"make config" to print an additional question that the script
  doesn't know how to answer ("Audio Excel DSP 16 [N/y] (NEW) ###").
  Just ignore it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=19713
2010-01-27 15:43:27 +00:00
Eelco Dolstra 561e37cfe0 * Linux 2.6.32.6, 2.6.27.44.
svn path=/nixpkgs/trunk/; revision=19661
2010-01-26 10:18:14 +00:00
Lluís Batlle i Rossell bcba809460 Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19654
2010-01-25 18:52:07 +00:00
Michael Raskin 44457a9ad7 Fixing a typo in options
svn path=/nixpkgs/trunk/; revision=19563
2010-01-20 11:06:20 +00:00
Michael Raskin d2795e889c Force CFS in zen-kernel not specified as BFS
svn path=/nixpkgs/trunk/; revision=19557
2010-01-20 06:24:29 +00:00
Michael Raskin 30477123ef Allow building kernels for CPUs incapable of running Xen
svn path=/nixpkgs/branches/stdenv-updates/; revision=19489
2010-01-16 20:40:59 +00:00
Lluís Batlle i Rossell 70dd97620c Updating from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=19485
2010-01-16 15:19:23 +00:00
Michael Raskin c0bca28b2f Do not insist on using CONFIG_PAE if we are trying to build a non-PAE kernel
svn path=/nixpkgs/trunk/; revision=19454
2010-01-15 05:30:00 +00:00
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