fix Pi build and CI pipeline ordering
- Fix Pi kernel build: disable includeDefaultModules in initrd. NixOS all-hardware.nix includes dw-hdmi which doesn't exist in the RPi4 kernel 6.12, causing module-shrunk to fail. - Fix CI: SD image build now depends on build-hosts instead of flake-check, so it won't run if the Pi build fails. - Apply same fix to raspberry-pi template.
This commit is contained in:
parent
4e36cca637
commit
6ad46e7452
3 changed files with 19 additions and 11 deletions
|
|
@ -29,7 +29,7 @@ jobs:
|
||||||
run: nix build .#nixosConfigurations.cryodev-pi.config.system.build.toplevel --impure
|
run: nix build .#nixosConfigurations.cryodev-pi.config.system.build.toplevel --impure
|
||||||
|
|
||||||
build-pi-images:
|
build-pi-images:
|
||||||
needs: flake-check
|
needs: build-hosts
|
||||||
runs-on: host
|
runs-on: host
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
|
|
|
||||||
|
|
@ -3,11 +3,15 @@
|
||||||
{
|
{
|
||||||
boot = {
|
boot = {
|
||||||
kernelPackages = pkgs.linuxKernel.packages.linux_rpi4;
|
kernelPackages = pkgs.linuxKernel.packages.linux_rpi4;
|
||||||
initrd.availableKernelModules = [
|
initrd = {
|
||||||
"xhci_pci"
|
availableKernelModules = [
|
||||||
"usbhid"
|
"xhci_pci"
|
||||||
"usb_storage"
|
"usbhid"
|
||||||
];
|
"usb_storage"
|
||||||
|
];
|
||||||
|
# Disable default x86 modules that don't exist in the Pi kernel (e.g. dw-hdmi)
|
||||||
|
includeDefaultModules = false;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems = {
|
fileSystems = {
|
||||||
|
|
|
||||||
|
|
@ -3,11 +3,15 @@
|
||||||
{
|
{
|
||||||
boot = {
|
boot = {
|
||||||
kernelPackages = pkgs.linuxKernel.packages.linux_rpi4;
|
kernelPackages = pkgs.linuxKernel.packages.linux_rpi4;
|
||||||
initrd.availableKernelModules = [
|
initrd = {
|
||||||
"xhci_pci"
|
availableKernelModules = [
|
||||||
"usbhid"
|
"xhci_pci"
|
||||||
"usb_storage"
|
"usbhid"
|
||||||
];
|
"usb_storage"
|
||||||
|
];
|
||||||
|
# Disable default x86 modules that don't exist in the Pi kernel (e.g. dw-hdmi)
|
||||||
|
includeDefaultModules = false;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems = {
|
fileSystems = {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue