linux-allwinner: init

NixOS · Oct 26, 2017 · a424887 · a424887
1 parent 10cb051
commit a424887
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 2 deletions.
diff --git a/pkgs/os-specific/linux/kernel/linux-allwinner.nix b/pkgs/os-specific/linux/kernel/linux-allwinner.nix
@@ -0,0 +1,18 @@
+{ stdenv, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args:
+
+import ./generic.nix (args // rec {
+  version = "4.14-rc5-next-20171018";
+  modDirVersion = "4.14.0-rc5-next-20171018";
+  extraMeta.branch = "4.14";
+
+  src = fetchFromGitHub {
+    owner = "montjoie";
+    repo = "linux";
+    rev = "575e2c13a742899221689abba85f221f494761b4";
+    sha256 = "1v0qdazawdqp4vv48mqs58fa2m3zk120ysara4zs21wjdnrz7pwm";
+  };
+
+  # Should the testing kernels ever be built on Hydra?
+  extraMeta.hydraPlatforms = [];
+
+} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -1,4 +1,4 @@
-{ runCommand, nettools, bc, perl, gmp, libmpc, mpfr, kmod, openssl
+{ runCommand, nettools, bc, perl, gmp, libmpc, mpfr, kmod, openssl, utillinux
 , writeTextFile, ubootChooser
 , hostPlatform
 }:
@@ -224,7 +224,7 @@ stdenv.mkDerivation ((drvAttrs config stdenv.platform (kernelPatches ++ nativeKe
 
   enableParallelBuilding = true;
 
-  nativeBuildInputs = [ perl bc nettools openssl gmp libmpc mpfr ] ++ optional (stdenv.platform.uboot != null)
+  nativeBuildInputs = [ perl bc nettools openssl gmp libmpc mpfr utillinux ] ++ optional (stdenv.platform.uboot != null)
     (ubootChooser stdenv.platform.uboot);
 
   hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" ];

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -12299,6 +12299,18 @@ with pkgs;
       ];
   };
 
+  linux_allwinner = callPackage ../os-specific/linux/kernel/linux-allwinner.nix {
+    kernelPatches = [
+      kernelPatches.bridge_stp_helper
+      kernelPatches.p9_fixes
+      kernelPatches.modinst_arg_list_too_long
+    ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [
+      kernelPatches.mips_fpureg_emu
+      kernelPatches.mips_fpu_sigill
+      kernelPatches.mips_ext3_n32
+    ];
+  };
+
   linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix {
     kernelPatches = [
       kernelPatches.bridge_stp_helper
@@ -12497,6 +12509,7 @@ with pkgs;
 
   # Intentionally lacks recurseIntoAttrs, as -rc kernels will quite likely break out-of-tree modules and cause failed Hydra builds.
   linuxPackages_testing = linuxPackagesFor pkgs.linux_testing;
+  linuxPackages_allwinner = recurseIntoAttrs (linuxPackagesFor pkgs.linux_allwinner);
 
   linuxPackages_custom = { version, src, configfile }:
     recurseIntoAttrs (linuxPackagesFor (pkgs.linuxManualConfig {