magic_rb/dotfiles
1
0
Fork 0
mirror of https://git.sr.ht/~magic_rb/dotfiles synced 2024-11-25 17:46:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

hela: update kernel

Browse source 
Signed-off-by: magic_rb <magic_rb@redalder.org>
This commit is contained in:
magic_rb 2024-11-09 17:05:11 +01:00
parent 9e42017a99
commit bf78a7d618
No known key found for this signature in database
GPG key ID: 08D5287CC5DDCA0E
3 changed files with 24 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
nixos/common/nixpkgs.nix
View file

@ -1,6 +1,7 @@
{ {
inputs', inputs',
lib, lib,
config,
... ...
}: let }: let
inherit inherit
@ -24,6 +25,14 @@ in {
trusted-public-keys = [ trusted-public-keys = [
"redalder-nix-cache-1:8t4zBJWgVtrfAOJ45iNHEqA/dDFV47Sr1sGa8ME9ru0=" "redalder-nix-cache-1:8t4zBJWgVtrfAOJ45iNHEqA/dDFV47Sr1sGa8ME9ru0="
]; ];
experimental-features = ["flakes" "nix-command" "ca-derivations" "recursive-nix" "dynamic-derivations" "pipe-operators"]; experimental-features =
[
"flakes"
"nix-command"
"ca-derivations"
"recursive-nix"
"dynamic-derivations"
]
++ (lib.optional (lib.versionAtLeast config.nix.package.version "2.24") "pipe-operators");
}; };
} }

26
nixos/systems/hela/default.nix
View file

@ -81,7 +81,7 @@ in {
ppp-slan = mkMtuOption (mtu.slan-vlan - 24); ppp-slan = mkMtuOption (mtu.slan-vlan - 24);
}; };
ethaddr = { ethaddr = {
sw = mkEthAddrOption "5e:f3:21:5a:80:f6"; sw = mkEthAddrOption "ea:34:07:e4:7c:6a";
sfp0 = mkEthAddrOption "86:a9:22:2c:dd:6c"; sfp0 = mkEthAddrOption "86:a9:22:2c:dd:6c";
sfp1 = mkEthAddrOption "16:5c:7f:42:c7:76"; sfp1 = mkEthAddrOption "16:5c:7f:42:c7:76";
wan = mkEthAddrOption "fe:39:64:d0:e4:9b"; wan = mkEthAddrOption "fe:39:64:d0:e4:9b";
@ -153,6 +153,11 @@ in {
mac-address = [${config.bananapi.ethaddr.lan1.space}]; mac-address = [${config.bananapi.ethaddr.lan1.space}];
label = "lan1"; label = "lan1";
}; };
port@6 {
mac-address = [${config.bananapi.ethaddr.sw.space}];
label = "sw";
};
}; };
}; };
@ -161,14 +166,17 @@ in {
__overlay__ { __overlay__ {
mac@0 { mac@0 {
mac-address = [${config.bananapi.ethaddr.sw.space}]; mac-address = [${config.bananapi.ethaddr.sw.space}];
label = "sw";
}; };
mac@1 { mac@1 {
mac-address = [${config.bananapi.ethaddr.sfp0.space}]; mac-address = [${config.bananapi.ethaddr.sfp0.space}];
label = "sfp0";
}; };
mac@2 { mac@2 {
mac-address = [${config.bananapi.ethaddr.sfp1.space}]; mac-address = [${config.bananapi.ethaddr.sfp1.space}];
label = "sfp1";
}; };
}; };
}; };
@ -198,22 +206,6 @@ in {
"pstore_blk.kmsg_size=128" "pstore_blk.kmsg_size=128"
"best_effort=y" "best_effort=y"
]; ];
boot.kernelPatches = [
{
name = "Add software padding processing in Ethernet Tx path.";
patch = pkgs.fetchpatch {
url = "https://github.com/frank-w/BPI-Router-Linux/commit/e24807c0681f795246656fed01b9d2d39558f45c.patch";
hash = "sha256-cOa2KSnjeTTWY2TXim/jeYAyPzDqsNStNXdg4dVwAlI=";
};
}
{
name = "Fix software padding processing in Ethernet Tx path.";
patch = pkgs.fetchpatch {
url = "https://github.com/frank-w/BPI-Router-Linux/commit/dc4afd4c934f0a3d3c7a0131d6d0d8078565dcb6.patch";
hash = "sha256-PDB8i/dogBKgH8x7cy4/BZTAgmI5CsGLSBXbvOyMndo=";
};
}
];
disko.rootMountPoint = "/mnt/bpi-r4"; disko.rootMountPoint = "/mnt/bpi-r4";
disko.devices = { disko.devices = {

10
overlays/linux/bpi-r4.nix
View file

@ -5,14 +5,14 @@
... ...
} @ args: (buildLinux (args } @ args: (buildLinux (args
// { // {
version = "6.10-bpi-r4"; version = "6.11-bpi-r4";
modDirVersion = "6.10.0-bpi-r4"; modDirVersion = "6.11.0-bpi-r4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "frank-w"; owner = "frank-w";
repo = "BPI-Router-Linux"; repo = "BPI-Router-Linux";
rev = "a5f209f3f88daf5bacaab883ca30d16d88ff0506"; rev = "7a99830e634e841ea97796c35bbe0cf8e038ad9f";
hash = "sha256-bcgDdJrmHBWBhoy4TynODwG6BRL38tVKHAO6J8GR7IY="; hash = "sha256-6ng5eY8yM01asQjyF6IE1UGuZ6KeEsH2bwkVKwgx1xg=";
}; };
defconfig = "mt7988a_bpi-r4_defconfig"; defconfig = "mt7988a_bpi-r4_defconfig";
@ -33,5 +33,5 @@
NFT_LOG = module; NFT_LOG = module;
}; };
extraMeta.branch = "6.10-main"; extraMeta.branch = "6.11-main";
})) }))