linux_beagleboard: 4.9.61-ti-r76 -> 4.14.12-ti-r23

This commit is contained in:
Drew Hess 2018-01-14 20:03:19 -08:00 committed by Tuomas Tynkkynen
parent c61a9dfd2e
commit 83a85b60ad
2 changed files with 17 additions and 9 deletions

View File

@ -1,10 +1,10 @@
{ stdenv, buildPackages, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args: { stdenv, buildPackages, hostPlatform, fetchFromGitHub, perl, buildLinux, ubootTools, dtc, ... } @ args:
let let
modDirVersion = "4.9.61"; modDirVersion = "4.14.12";
tag = "r76"; tag = "r23";
in in
import ./generic.nix (args // rec { stdenv.lib.overrideDerivation (import ./generic.nix (args // rec {
version = "${modDirVersion}-ti-${tag}"; version = "${modDirVersion}-ti-${tag}";
inherit modDirVersion; inherit modDirVersion;
@ -12,7 +12,7 @@ import ./generic.nix (args // rec {
owner = "beagleboard"; owner = "beagleboard";
repo = "linux"; repo = "linux";
rev = "${version}"; rev = "${version}";
sha256 = "0hcz4fwjyic42mrn8qsvzm4jq1g5k51awjj3d2das7k8frjalaby"; sha256 = "07hdv2h12gsgafxsqqr7b0fir10rv9k66riklpjba2cg6x0p2nr4";
}; };
kernelPatches = args.kernelPatches; kernelPatches = args.kernelPatches;
@ -21,5 +21,14 @@ import ./generic.nix (args // rec {
efiBootStub = false; efiBootStub = false;
} // (args.features or {}); } // (args.features or {});
extraMeta.hydraPlatforms = []; extraMeta.hydraPlatforms = [ "armv7l-linux" ];
} // (args.argsOverride or {})) } // (args.argsOverride or {}))) (oldAttrs: {
# This kernel will run mkuboot.sh.
postPatch = ''
patchShebangs scripts/
'';
nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ dtc ubootTools ];
})

View File

@ -12792,8 +12792,7 @@ with pkgs;
linux_beagleboard = callPackage ../os-specific/linux/kernel/linux-beagleboard.nix { linux_beagleboard = callPackage ../os-specific/linux/kernel/linux-beagleboard.nix {
kernelPatches = kernelPatches =
[ kernelPatches.bridge_stp_helper [ kernelPatches.bridge_stp_helper
kernelPatches.p9_fixes kernelPatches.cpu-cgroup-v2."4.11"
kernelPatches.cpu-cgroup-v2."4.9"
kernelPatches.modinst_arg_list_too_long kernelPatches.modinst_arg_list_too_long
]; ];
}; };