Commit graph

1034 commits

Author SHA1 Message Date
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 305a7a2ddf More testing allows fixing more errors from the recent commits.
svn path=/nixpkgs/trunk/; revision=20279
2010-02-27 21:21:20 +00:00
Lluís Batlle i Rossell 4677180b0d Barf. I have to test the expressions before commiting.
svn path=/nixpkgs/trunk/; revision=20278
2010-02-27 20:37:58 +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
Lluís Batlle i Rossell b1b7266aa3 After some testing with an ultrasparc cross-compiler:
Updating the cross-build expressions, adding some flexibility.
Updated the linux headers used cross building, as 2.6.28 had bugs on endianness in
sparc64.
There were, as usual some bugs in gcc. Maybe not many make a cross compiler to
ultrasparc.

For the record, I could build an ultrasparc kernel with this base nix:
import /etc/nixos/nixpkgs/default.nix   # The root nixpkgs default.nix
{
    crossSystem = {
        config = "sparc64-unknown-linux";
        bigEndian = true;
        arch = "sparc64";
        float = "soft";
        withTLS = true;
        cpu = "ultrasparc";
    };

    config = pkgs: {
      packageOverrides = pkgs : {
        platform = {
            name = "sparc64";
            kernelHeadersBaseConfig = "sparc64_defconfig";
            kernelBaseConfig = "sparc64_defconfig";
            kernelArch = "sparc";
            kernelAutoModules = false;
            kernelTarget = "zImage";
            uboot = null;
        };
      };
    };
}

Although it did not boot directly in qemu-system-sparc64:
[sparc64] Kernel already loaded
Unhandled Exception 0x0000000000000020
PC = 0x0000000000404000 NPC = 0x0000000000404004

svn path=/nixpkgs/trunk/; revision=20269
2010-02-27 00:52:48 +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
Marco Maggesi 99237e3da3 Updated nixpkgs/pkgs/os-specific/linux/dmtcp
svn path=/nixpkgs/trunk/; revision=20195
2010-02-23 16:00:37 +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
Marco Maggesi 0be3d18896 Updated nixkpkgs/pkgs/os-specific/linux/dmtcp/devel.nix
svn path=/nixpkgs/trunk/; revision=20116
2010-02-18 18:49:32 +00:00
Michael Raskin bf4f2769b1 Fix propagated dependencies in hal
svn path=/nixpkgs/trunk/; revision=20108
2010-02-18 15:44:01 +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 e9ad76a2ff * Upstart updated to 0.6.5.
* Added libnih (a dependency of Upstart).
* Removed the old Upstart 0.3.x.

svn path=/nixpkgs/trunk/; revision=20015
2010-02-15 15:55:39 +00:00
Marco Maggesi f1f60cef0d Add package dmtcp_devel
svn path=/nixpkgs/trunk/; revision=19972
2010-02-13 11:02:08 +00:00
Lluís Batlle i Rossell fab150b628 Updating acpid.
svn path=/nixpkgs/trunk/; revision=19942
2010-02-11 18:59:58 +00:00
Eelco Dolstra 2027b96de5 * Linux 2.6.32.8.
svn path=/nixpkgs/trunk/; revision=19933
2010-02-11 14:33:17 +00:00
Lluís Batlle i Rossell df0800e91d Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19825
2010-02-04 19:08:28 +00:00
Lluís Batlle i Rossell b8c1641515 Making pam_unix2 not link to libxcrypt under armv5tel, because libxcrypt does not build under it.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19824
2010-02-04 18:40:54 +00:00
Marco Maggesi 3ab915e1fc Add new package pkgs/os-specific/linux/dmtcp/
svn path=/nixpkgs/trunk/; revision=19819
2010-02-04 15:41:45 +00:00
Eelco Dolstra a709fd64e5 * Turn libxcrypt back on. Without it, it's impossible to login to
NixOS (because pam_unix2 then cannot handle the passwords in
  /etc/shadow).

svn path=/nixpkgs/branches/stdenv-updates/; revision=19810
2010-02-04 09:35:51 +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 41e5edb0b3 * qemu-kvm: link against libuuid.
svn path=/nixpkgs/trunk/; revision=19757
2010-02-01 18:44:08 +00:00
Eelco Dolstra b22880b12d * qemu-kvm: increase the size of the buffer used to build the smbd
command line.

svn path=/nixpkgs/trunk/; revision=19756
2010-02-01 18:11:53 +00:00
Eelco Dolstra 277e66450b * fuse updated to 2.8.2.
svn path=/nixpkgs/trunk/; revision=19755
2010-02-01 17:08:35 +00:00
Eelco Dolstra f719b5268e * qemu-kvm: honour $TMPDIR for the qemu-smb temporary directory. This
ensures that Nix cleans up the qemu-smb directory after a VM test
  run (which prevents failures like this one:
  http://hydra.nixos.org/build/275355/nixlog/31/raw).

svn path=/nixpkgs/trunk/; revision=19747
2010-02-01 15:12:49 +00:00
Lluís Batlle i Rossell 2dfeeb47bb Making kbd build in armv5tel-linux. gcc 4.4.3 issues a warning with it, and kbd was compiled with -Werror.
I switch off -Werror in armv5tel-linux.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19735
2010-01-29 21:30:09 +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 9f99223219 * Removed splashutils 1.3 (obsolete).
svn path=/nixpkgs/branches/stdenv-updates/; revision=19710
2010-01-27 14:35:38 +00:00
Eelco Dolstra bd14a5d297 * qemu-kvm 0.12.2.
svn path=/nixpkgs/trunk/; revision=19705
2010-01-27 10:51:23 +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
Lluís Batlle i Rossell 279ffaa621 Adding ecryptfs, and one of its dependencies: keyutils.
(I have not tried whether they work)

svn path=/nixpkgs/trunk/; revision=19645
2010-01-25 10:34:47 +00:00
Lluís Batlle i Rossell d8900100e5 Allowing linux-headers to be built for cross-compilations on non-linux platforms.
Updating the list of hydra cross-build jobs to something more ambitious.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19628
2010-01-23 09:41:50 +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
Eelco Dolstra 93b250b960 * Use the Linux 2.6.32 kernel headers.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19552
2010-01-19 18:02:37 +00:00
Marc Weber 3b37933dd4 second part of alsaLib patch + comment
svn path=/nixpkgs/branches/stdenv-updates/; revision=19529
2010-01-18 19:15:36 +00:00
Eelco Dolstra 7c7f9b63ad * kbd 1.15.1.
svn path=/nixpkgs/trunk/; revision=19514
2010-01-18 10:19:11 +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