Author: viric
Date: Mon Dec 6 15:30:19 2010
New Revision: 25005
URL: https://svn.nixos.org/websvn/nix/?rev=25005&sc=1
Log:
Adding the nanonote openwrt 2.6.36 kernel
Added:
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/linux-nanonote-jz-2.6.36.nix
- copied, changed from r24970,
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/linux-nanonote-jz-2.6.35.nix
Modified:
nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
Copied and modified:
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/linux-nanonote-jz-2.6.36.nix
(from r24970,
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/linux-nanonote-jz-2.6.35.nix)
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/linux-nanonote-jz-2.6.35.nix
Sat Dec 4 21:43:24 2010 (r24970, copy source)
+++
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/linux-nanonote-jz-2.6.36.nix
Mon Dec 6 15:30:19 2010 (r25005)
@@ -194,30 +194,30 @@
import ./generic.nix (
rec {
- version = "qi_lb60-2.6.35-openwrt-22513";
+ version = "qi_lb60-2.6.35-openwrt-24283";
src = fetchurl {
- url = "mirror://kernel/linux/kernel/v2.6/linux-2.6.35.tar.bz2";
- sha256 = "1kxz87nwksx4hvq1i45i9w1zq1fb09rvf8i6jin3cbh36v1y5chq";
+ url = "mirror://kernel/linux/kernel/v2.6/linux-2.6.36.tar.bz2";
+ sha256 =
"15a076d1a435a6bf8e92834eba4b390b4ec094ce06d47f89d071ca9e5788ce04";
};
srcPatch = fetchsvn {
url = "svn://svn.openwrt.org/openwrt/trunk/target/linux";
- rev = 22530;
- sha256 = "1j5ls7dg0pvdxh6isczmq4r0lkwhz1c1s46mvdkcjsm3qq633fpc";
+ rev = 24283;
+ sha256 =
"4e30266bbaf004acb10b5c182d0c01c7aba685956d36e76ea7c24dd55ae51c10";
};
preConfigure = ''
cp -R ${srcPatch}/generic/files/* .
chmod +w -R *
GLOBIGNORE='.:..:*preinit_as_init*'
- for a in ${srcPatch}/generic/patches-2.6.35/*
${srcPatch}/xburst/patches-2.6.35/* ; do
+ for a in ${srcPatch}/generic/patches-2.6.36/*
${srcPatch}/xburst/patches-2.6.36/* ; do
echo applying patch $a
patch -p1 < $a
done
unset GLOBIGNORE
- cat ${srcPatch}/generic/config-2.6.35 ${srcPatch}/xburst/config-2.6.35 \
- ${srcPatch}/xburst/qi_lb60/config-2.6.35 >
arch/mips/configs/qi_lb60_defconfig
+ cat ${srcPatch}/generic/config-2.6.36 ${srcPatch}/xburst/config-2.6.36 \
+ ${srcPatch}/xburst/qi_lb60/config-2.6.36 >
arch/mips/configs/qi_lb60_defconfig
'';
postInstall = ''
@@ -226,7 +226,7 @@
KERNEL_ENTRY="0x`$crossConfig-nm $out/vmlinux 2>/dev/null |
grep " kernel_entry" | cut -f1 -d ' '`"
mkimage -A mips -O linux -T kernel -a 0x80010000 -C gzip \
- -e $KERNEL_ENTRY -n "MIPS Nix Linux-2.6.35" \
+ -e $KERNEL_ENTRY -n "MIPS Nix Linux-2.6.36" \
-d $out/vmlinux.bin.gz $out/uImage
set +x
'';
Modified: nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Mon Dec
6 15:29:38 2010 (r25004)
+++ nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Mon Dec
6 15:30:19 2010 (r25005)
@@ -4777,6 +4777,17 @@
inherit fetchurl fetchsvn stdenv perl mktemp module_init_tools
ubootChooser;
};
+ linux_nanonote_jz_2_6_36 = makeOverridable
+ (import ../os-specific/linux/kernel/linux-nanonote-jz-2.6.36.nix) {
+ inherit fetchurl fetchsvn stdenv perl mktemp module_init_tools
ubootChooser;
+ kernelPatches =
+ [ #kernelPatches.fbcondecor_2_6_35
+ kernelPatches.sec_perm_2_6_24
+ #kernelPatches.aufs2_2_6_35
+ kernelPatches.mips_restart_2_6_36
+ ];
+ };
+
linux_2_6_35_oldI686 = linux_2_6_35.override {
extraConfig = ''
HIGHMEM64G? n
@@ -4912,6 +4923,7 @@
linuxPackages_2_6_36 = recurseIntoAttrs (linuxPackagesFor linux_2_6_36
pkgs.linuxPackages_2_6_36);
linuxPackages_nanonote_jz_2_6_34 = recurseIntoAttrs (linuxPackagesFor
linux_nanonote_jz_2_6_34 pkgs.linuxPackages_nanonote_jz_2_6_34);
linuxPackages_nanonote_jz_2_6_35 = recurseIntoAttrs (linuxPackagesFor
linux_nanonote_jz_2_6_35 pkgs.linuxPackages_nanonote_jz_2_6_35);
+ linuxPackages_nanonote_jz_2_6_36 = recurseIntoAttrs (linuxPackagesFor
linux_nanonote_jz_2_6_36 pkgs.linuxPackages_nanonote_jz_2_6_36);
# The current default kernel / kernel modules.
linux = linux_2_6_32;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
