HackENS/liminix-fork
5
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

add kernel.version param to allow for version-specific patches

Browse source 
default to 5.15.137 to avoid breaking the devices that don't declare it
This commit is contained in:
Daniel Barlow 2024-02-11 16:19:52 +00:00
parent 1206d02200
commit 812f497660
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/kernel.nix
View file

@ -27,6 +27,7 @@ in {
options = { options = {
kernel = { kernel = {
src = mkOption { type = types.path; } ; src = mkOption { type = types.path; } ;
version = mkOption { type = types.str; default = "5.15.137";} ;
modular = mkOption { modular = mkOption {
type = types.bool; type = types.bool;
default = true; default = true;
@ -79,7 +80,8 @@ in {
config.kernel.conditionalConfig; config.kernel.conditionalConfig;
k = liminix.builders.kernel.override { k = liminix.builders.kernel.override {
config = mergedConfig; config = mergedConfig;
inherit (config.kernel) src extraPatchPhase; version = builtins.trace config.kernel.version config.kernel.version;
inherit (config.kernel) src extraPatchPhase;
targets = config.kernel.makeTargets; targets = config.kernel.makeTargets;
}; };
in { in {

5
pkgs/kernel/default.nix
View file

@ -6,6 +6,7 @@
, config , config
, src , src
, version ? "0"
, extraPatchPhase ? "echo" , extraPatchPhase ? "echo"
, targets ? ["vmlinux"] , targets ? ["vmlinux"]
} : } :
@ -51,9 +52,9 @@ stdenv.mkDerivation rec {
patches = [ patches = [
./cmdline-cookie.patch ./cmdline-cookie.patch
./phram-allow-cached-mappings.patch
./mips-malta-fdt-from-bootloader.patch ./mips-malta-fdt-from-bootloader.patch
]; ] ++ lib.optional (lib.versionOlder version "5.18.0")
./phram-allow-cached-mappings.patch;
# this is here to work around what I think is a bug in nixpkgs # this is here to work around what I think is a bug in nixpkgs
# packaging of ncurses: it installs pkg-config data files which # packaging of ncurses: it installs pkg-config data files which