From 58f89a887711d08b61e4836cb32e10f7915e6ab8 Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Tue, 29 Aug 2006 17:48:04 +0000 Subject: [PATCH] change kernel-headers. Now we can build this on powerpc-linux too... svn path=/nixpkgs/trunk/; revision=6310 --- pkgs/os-specific/linux/kernel-headers/builder.sh | 12 +++++++++--- .../linux/kernel-headers/kernel-headers-2.6.14.3.nix | 4 ++-- .../linux/kernel-headers/kernel-headers-2.6.17.6.nix | 4 ++-- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/kernel-headers/builder.sh b/pkgs/os-specific/linux/kernel-headers/builder.sh index f4920edd355c..da349125da89 100644 --- a/pkgs/os-specific/linux/kernel-headers/builder.sh +++ b/pkgs/os-specific/linux/kernel-headers/builder.sh @@ -11,9 +11,15 @@ buildPhase=buildPhase installPhase() { mkdir $out mkdir $out/include - cp -prvd include/linux include/asm-i386 include/asm-generic $out/include - cd $out/include - ln -s asm-i386 asm + if test $system = "i686-linux"; then + cp -prvd include/linux include/asm-i386 include/asm-generic $out/include + cd $out/include + ln -s asm-i386 asm + elif test $system = "powerpc-linux"; then + cp -prvd include/linux include/asm-ppc include/asm-generic $out/include + cd $out/include + ln -s asm-ppc asm + fi echo -n > $out/include/linux/autoconf.h } diff --git a/pkgs/os-specific/linux/kernel-headers/kernel-headers-2.6.14.3.nix b/pkgs/os-specific/linux/kernel-headers/kernel-headers-2.6.14.3.nix index 9d311201a193..f1b21e712ca3 100644 --- a/pkgs/os-specific/linux/kernel-headers/kernel-headers-2.6.14.3.nix +++ b/pkgs/os-specific/linux/kernel-headers/kernel-headers-2.6.14.3.nix @@ -1,9 +1,9 @@ {stdenv, fetchurl}: -assert stdenv.system == "i686-linux"; +assert stdenv.isLinux; stdenv.mkDerivation { - name = "linux-headers-2.6.14.3-i386"; + name = "linux-headers-2.6.14.3"; builder = ./builder.sh; src = fetchurl { url = http://nix.cs.uu.nl/dist/tarballs/linux-2.6.14.3.tar.bz2; diff --git a/pkgs/os-specific/linux/kernel-headers/kernel-headers-2.6.17.6.nix b/pkgs/os-specific/linux/kernel-headers/kernel-headers-2.6.17.6.nix index a8ff480e101f..33c55c02858a 100644 --- a/pkgs/os-specific/linux/kernel-headers/kernel-headers-2.6.17.6.nix +++ b/pkgs/os-specific/linux/kernel-headers/kernel-headers-2.6.17.6.nix @@ -1,9 +1,9 @@ {stdenv, fetchurl}: -assert stdenv.system == "i686-linux"; +assert stdenv.isLinux; stdenv.mkDerivation { - name = "linux-headers-2.6.17.6-i386"; + name = "linux-headers-2.6.17.6"; builder = ./builder.sh; src = fetchurl { url = ftp://ftp.nluug.nl/pub/os/Linux/system/kernel/v2.6/linux-2.6.17.6.tar.bz2;