summary refs log tree commit diff
path: root/pkgs/os-specific
diff options
context:
space:
mode:
authorxeji <36407913+xeji@users.noreply.github.com>2018-08-01 12:18:27 +0200
committerGitHub <noreply@github.com>2018-08-01 12:18:27 +0200
commit299db53476fa76af668cff195e9ae5bcfb3d9215 (patch)
tree3d2c646ab89adfa2b9c0c54cb3c0ab35fd97c72f /pkgs/os-specific
parentc7c3c1663ffdc209843a53e74f845328af7f42c9 (diff)
parent5ac73349506894059871d94b7418e411c812f717 (diff)
downloadnixpkgs-299db53476fa76af668cff195e9ae5bcfb3d9215.tar
nixpkgs-299db53476fa76af668cff195e9ae5bcfb3d9215.tar.gz
nixpkgs-299db53476fa76af668cff195e9ae5bcfb3d9215.tar.bz2
nixpkgs-299db53476fa76af668cff195e9ae5bcfb3d9215.tar.lz
nixpkgs-299db53476fa76af668cff195e9ae5bcfb3d9215.tar.xz
nixpkgs-299db53476fa76af668cff195e9ae5bcfb3d9215.tar.zst
nixpkgs-299db53476fa76af668cff195e9ae5bcfb3d9215.zip
Merge pull request #43637 from qolii/hardkernel_update_and_defconfig
linux-hardkernel: 4.14.47-139 -> 4.14.55-146. Additionally, use vendo…
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r--pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix18
1 files changed, 15 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix b/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix
index 6855c5c5f90..3fc08e64287 100644
--- a/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix
@@ -1,10 +1,10 @@
 { stdenv, buildPackages, hostPlatform, fetchFromGitHub, perl, buildLinux, libelf, utillinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.14.47-139";
+  version = "4.14.55-146";
 
   # modDirVersion needs to be x.y.z.
-  modDirVersion = "4.14.47";
+  modDirVersion = "4.14.55";
 
   # branchVersion needs to be x.y. 
   extraMeta.branch = "4.14";
@@ -13,7 +13,19 @@ buildLinux (args // rec {
     owner = "hardkernel";
     repo = "linux";
     rev = version;
-    sha256 = "0jjgrmvi1h8zs8snnvghnjd422yfmn7jv9y1n7xikmfv4nvwqrkv";
+    sha256 = "1bm1njng4rwfylgnqv06vabkvybm9rikqj1lsb7p9qcs3y1kw6mh";
   };
 
+  defconfig = "odroidxu4_defconfig";
+
+  # This extraConfig is (only) required because the gator module fails to build as-is.
+  extraConfig = ''
+
+    GATOR n
+
+    # This attempted fix applies correctly but does not fix the build.
+    #GATOR_MALI_MIDGARD_PATH ${src}/drivers/gpu/arm/midgard
+
+  '' + (args.extraConfig or "");
+
 } // (args.argsOverride or {}))