Merge pull request #43637 from qolii/hardkernel_update_and_defconfig

linux-hardkernel: 4.14.47-139 -> 4.14.55-146. Additionally, use vendo…
This commit is contained in:
xeji 2018-08-01 12:18:27 +02:00 committed by GitHub
commit 299db53476
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,10 +1,10 @@
{ stdenv, buildPackages, hostPlatform, fetchFromGitHub, perl, buildLinux, libelf, utillinux, ... } @ args: { stdenv, buildPackages, hostPlatform, fetchFromGitHub, perl, buildLinux, libelf, utillinux, ... } @ args:
buildLinux (args // rec { buildLinux (args // rec {
version = "4.14.47-139"; version = "4.14.55-146";
# modDirVersion needs to be x.y.z. # modDirVersion needs to be x.y.z.
modDirVersion = "4.14.47"; modDirVersion = "4.14.55";
# branchVersion needs to be x.y. # branchVersion needs to be x.y.
extraMeta.branch = "4.14"; extraMeta.branch = "4.14";
@ -13,7 +13,19 @@ buildLinux (args // rec {
owner = "hardkernel"; owner = "hardkernel";
repo = "linux"; repo = "linux";
rev = version; 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 {})) } // (args.argsOverride or {}))