linux-megous: fix eval error from aliased kernelPatches
have not completed a redeploy, so unsure if this has precisely the same meaning as it used to.
This commit is contained in:
parent
13ee861b0d
commit
1aed894d2e
|
@ -2,44 +2,49 @@
|
|||
, buildLinux
|
||||
, buildPackages
|
||||
, fetchFromGitHub
|
||||
, kernelPatches
|
||||
, modDirVersionArg ? null
|
||||
, nixosTests
|
||||
, perl
|
||||
, pkgs
|
||||
, ...
|
||||
} @ args:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
kernelPatches' = kernelPatches;
|
||||
base = "6.2.0";
|
||||
# set to empty if not a release candidate
|
||||
rc = "-rc5";
|
||||
in buildLinux (args // rec {
|
||||
version = base + rc;
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) + rc else modDirVersionArg;
|
||||
|
||||
# branchVersion needs to be x.y
|
||||
extraMeta.branch = versions.majorMinor version;
|
||||
|
||||
kernelPatches = [
|
||||
kernelPatches'.bridge_stp_helper
|
||||
kernelPatches'.request_key_helper
|
||||
# `pkgs.kernelPatches` is a set of common patches
|
||||
# while `kernelPatches` callarg is a list.
|
||||
# weird idiom, means we have to access pkgs.kernelPatches to access the actual patch directory:
|
||||
extraKernelPatches = [
|
||||
pkgs.kernelPatches.bridge_stp_helper
|
||||
pkgs.kernelPatches.request_key_helper
|
||||
];
|
||||
overridenArgs = args // rec {
|
||||
version = base + rc;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
# HOW TO UPDATE:
|
||||
# - `git fetch` from megous' github.
|
||||
# - there should be some new tag, like `orange-pi-6.1-blah`. use that.
|
||||
# - megi publishes release notes as the most recent commit on any stable branch, so just `git log`.
|
||||
# - orange-pi is listed as the "main integration branch".
|
||||
# - specific branches like `pp` (pinephone) are dev branches, and probably less stable.
|
||||
owner = "megous";
|
||||
repo = "linux";
|
||||
rev = "orange-pi-6.2-20230122-1624";
|
||||
hash = "sha256-Yma9LwlMEnP0QkUZpEl+UkTGvOWOMANBoDsmcTrPb1s=";
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) + rc else modDirVersionArg;
|
||||
|
||||
# branchVersion needs to be x.y
|
||||
extraMeta.branch = versions.majorMinor version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
# HOW TO UPDATE:
|
||||
# - `git fetch` from megous' github.
|
||||
# - there should be some new tag, like `orange-pi-6.1-blah`. use that.
|
||||
# - megi publishes release notes as the most recent commit on any stable branch, so just `git log`.
|
||||
# - orange-pi is listed as the "main integration branch".
|
||||
# - specific branches like `pp` (pinephone) are dev branches, and probably less stable.
|
||||
owner = "megous";
|
||||
repo = "linux";
|
||||
rev = "orange-pi-6.2-20230122-1624";
|
||||
hash = "sha256-Yma9LwlMEnP0QkUZpEl+UkTGvOWOMANBoDsmcTrPb1s=";
|
||||
};
|
||||
} // (args.argsOverride or { });
|
||||
finalArgs = overridenArgs // {
|
||||
kernelPatches = overridenArgs.kernelPatches or [] ++ extraKernelPatches;
|
||||
};
|
||||
} // (args.argsOverride or { }))
|
||||
in buildLinux finalArgs
|
||||
|
|
Loading…
Reference in New Issue
Block a user