nix-community/raspberry-pi-nix
1
0
Fork 0
mirror of https://github.com/nix-community/raspberry-pi-nix.git synced 2025-11-08 19:46:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: fix targets for flake, add kernel 6.6.34

Browse source
This commit is contained in:
adminy 2024-06-23 16:43:11 +01:00
parent 57a532319e
commit b027897628
7 changed files with 97 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

58
flake.lock generated
View file

@ -1,22 +1,5 @@
{ {
"nodes": { "nodes": {
"libcamera-apps-src": {
"flake": false,
"locked": {
"lastModified": 1717081637,
"narHash": "sha256-s4zJh6r3VhiquO54KWZ78dVCH1BmlphY9zEB9BidNyo=",
"owner": "raspberrypi",
"repo": "rpicam-apps",
"rev": "49344f2a8d1817558d4e6463032fcf11be618b38",
"type": "github"
},
"original": {
"owner": "raspberrypi",
"ref": "v1.5.0",
"repo": "rpicam-apps",
"type": "github"
}
},
"libcamera-src": { "libcamera-src": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -69,14 +52,15 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"libcamera-apps-src": "libcamera-apps-src",
"libcamera-src": "libcamera-src", "libcamera-src": "libcamera-src",
"libpisp-src": "libpisp-src", "libpisp-src": "libpisp-src",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"rpi-bluez-firmware-src": "rpi-bluez-firmware-src", "rpi-bluez-firmware-src": "rpi-bluez-firmware-src",
"rpi-firmware-nonfree-src": "rpi-firmware-nonfree-src", "rpi-firmware-nonfree-src": "rpi-firmware-nonfree-src",
"rpi-firmware-src": "rpi-firmware-src", "rpi-firmware-src": "rpi-firmware-src",
"rpi-linux-6_6-src": "rpi-linux-6_6-src", "rpi-linux-6_6_31-src": "rpi-linux-6_6_31-src",
"rpi-linux-6_6_34-src": "rpi-linux-6_6_34-src",
"rpicam-apps-src": "rpicam-apps-src",
"u-boot-src": "u-boot-src" "u-boot-src": "u-boot-src"
} }
}, },
@ -131,7 +115,7 @@
"type": "github" "type": "github"
} }
}, },
"rpi-linux-6_6-src": { "rpi-linux-6_6_31-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1716545726, "lastModified": 1716545726,
@ -148,6 +132,40 @@
"type": "github" "type": "github"
} }
}, },
"rpi-linux-6_6_34-src": {
"flake": false,
"locked": {
"lastModified": 1718967581,
"narHash": "sha256-RMKvgdhHQQPSmGjAOpYYB7YpClPVks6f6Dw381qDYHY=",
"owner": "raspberrypi",
"repo": "linux",
"rev": "7af85d54e39733bb9a236b95ea5ed1ab8277d560",
"type": "github"
},
"original": {
"owner": "raspberrypi",
"ref": "rpi-6.6.y",
"repo": "linux",
"type": "github"
}
},
"rpicam-apps-src": {
"flake": false,
"locked": {
"lastModified": 1717081637,
"narHash": "sha256-s4zJh6r3VhiquO54KWZ78dVCH1BmlphY9zEB9BidNyo=",
"owner": "raspberrypi",
"repo": "rpicam-apps",
"rev": "49344f2a8d1817558d4e6463032fcf11be618b38",
"type": "github"
},
"original": {
"owner": "raspberrypi",
"ref": "v1.5.0",
"repo": "rpicam-apps",
"type": "github"
}
},
"u-boot-src": { "u-boot-src": {
"flake": false, "flake": false,
"locked": { "locked": {

13
flake.nix
View file

@ -7,10 +7,14 @@
flake = false; flake = false;
url = "https://ftp.denx.de/pub/u-boot/u-boot-2024.04.tar.bz2"; url = "https://ftp.denx.de/pub/u-boot/u-boot-2024.04.tar.bz2";
}; };
rpi-linux-6_6-src = { rpi-linux-6_6_31-src = {
flake = false; flake = false;
url = "github:raspberrypi/linux/stable_20240529"; url = "github:raspberrypi/linux/stable_20240529";
}; };
rpi-linux-6_6_34-src = {
flake = false;
url = "github:raspberrypi/linux/rpi-6.6.y";
};
rpi-firmware-src = { rpi-firmware-src = {
flake = false; flake = false;
url = "github:raspberrypi/firmware/1.20240529"; url = "github:raspberrypi/firmware/1.20240529";
@ -23,7 +27,7 @@
flake = false; flake = false;
url = "github:RPi-Distro/bluez-firmware/bookworm"; url = "github:RPi-Distro/bluez-firmware/bookworm";
}; };
libcamera-apps-src = { rpicam-apps-src = {
flake = false; flake = false;
url = "github:raspberrypi/rpicam-apps/v1.5.0"; url = "github:raspberrypi/rpicam-apps/v1.5.0";
}; };
@ -55,8 +59,9 @@
libcamera-overlay = self.overlays.libcamera; libcamera-overlay = self.overlays.libcamera;
}; };
packages.aarch64-linux = { packages.aarch64-linux = {
linux_2711 = pinned.rpi-kernels.v6_6_31.bcm2711; kernels = pinned.rpi-kernels;
linux_2712 = pinned.rpi-kernels.v6_6_31.bcm2712; # linux_2711 = pinned.rpi-kernels.v6_6_31.bcm2711;
# linux_2712 = pinned.rpi-kernels.v6_6_31.bcm2712;
firmware = pinned.raspberrypifw; firmware = pinned.raspberrypifw;
wireless-firmware = pinned.raspberrypiWirelessFirmware; wireless-firmware = pinned.raspberrypiWirelessFirmware;
uboot-rpi-arm64 = pinned.uboot-rpi-arm64; uboot-rpi-arm64 = pinned.uboot-rpi-arm64;

65
overlays/default.nix
View file

@ -1,5 +1,6 @@
{ u-boot-src { u-boot-src
, rpi-linux-6_6-src , rpi-linux-6_6_31-src
, rpi-linux-6_6_34-src
, rpi-firmware-src , rpi-firmware-src
, rpi-firmware-nonfree-src , rpi-firmware-nonfree-src
, rpi-bluez-firmware-src , rpi-bluez-firmware-src
@ -8,19 +9,43 @@
final: prev: final: prev:
let let
versions = { versions = {
v6_6_31 = rpi-linux-6_6-src; v6_6_31 = {
src = rpi-linux-6_6_31-src;
patches = [
# Fix compilation errors due to incomplete patch backport.
# https://github.com/raspberrypi/linux/pull/6223
{
name = "gpio-pwm_-_pwm_apply_might_sleep.patch";
patch = prev.fetchpatch {
url = "https://github.com/peat-psuwit/rpi-linux/commit/879f34b88c60dd59765caa30576cb5bfb8e73c56.patch";
hash = "sha256-HlOkM9EFmlzOebCGoj7lNV5hc0wMjhaBFFZvaRCI0lI=";
};
}
{
name = "ir-rx51_-_pwm_apply_might_sleep.patch";
patch = prev.fetchpatch {
url = "https://github.com/peat-psuwit/rpi-linux/commit/23431052d2dce8084b72e399fce82b05d86b847f.patch";
hash = "sha256-UDX/BJCJG0WVndP/6PbPK+AZsfU3vVxDCrpn1kb1kqE=";
};
}
];
};
v6_6_34.src = rpi-linux-6_6_34-src;
}; };
boards = [ "bcmrpi" "bcm2709" "bcmrpi3" "bcm2711" "bcm2712" ]; boards = [ "bcmrpi" "bcm2709" "bcmrpi3" "bcm2711" "bcm2712" ];
# Helpers for building the `pkgs.rpi-kernels' map. # Helpers for building the `pkgs.rpi-kernels' map.
rpi-kernel = { version, board }: { rpi-kernel = { version, board }: let
kernel = versions[version];
version-slug = builtins.replaceStrings [ "v" "_" ] [ "" "." ] version;
in {
"${version}"."${board}" = prev.lib.overrideDerivation (prev.buildLinux { "${version}"."${board}" = prev.lib.overrideDerivation (prev.buildLinux {
modDirVersion = version; modDirVersion = version-slug;
inherit version; version = version-slug;
pname = "linux-rpi"; pname = "linux-rpi";
src = versions[version]; src = kernel.src;
defconfig = "${board}_defconfig"; defconfig = "${board}_defconfig";
structuredExtraConfig = with lib.kernel; { structuredExtraConfig = with prev.lib.kernel; {
# Workaround https://github.com/raspberrypi/linux/issues/6198 # Workaround https://github.com/raspberrypi/linux/issues/6198
# Needed because NixOS 24.05+ sets DRM_SIMPLEDRM=y which pulls in # Needed because NixOS 24.05+ sets DRM_SIMPLEDRM=y which pulls in
# DRM_KMS_HELPER=y. # DRM_KMS_HELPER=y.
@ -51,24 +76,7 @@ let
sed -i $buildRoot/include/config/auto.conf -e 's/^CONFIG_LOCALVERSION=.*/CONFIG_LOCALVERSION=""/' sed -i $buildRoot/include/config/auto.conf -e 's/^CONFIG_LOCALVERSION=.*/CONFIG_LOCALVERSION=""/'
''; '';
postFixup = ""; postFixup = "";
kernelPatches = [ kernelPatches = if kernel.patches != null then kernel.patches else [];
# Fix compilation errors due to incomplete patch backport.
# https://github.com/raspberrypi/linux/pull/6223
{
name = "gpio-pwm_-_pwm_apply_might_sleep.patch";
patch = fetchpatch {
url = "https://github.com/peat-psuwit/rpi-linux/commit/879f34b88c60dd59765caa30576cb5bfb8e73c56.patch";
hash = "sha256-HlOkM9EFmlzOebCGoj7lNV5hc0wMjhaBFFZvaRCI0lI=";
};
}
{
name = "ir-rx51_-_pwm_apply_might_sleep.patch";
patch = fetchpatch {
url = "https://github.com/peat-psuwit/rpi-linux/commit/23431052d2dce8084b72e399fce82b05d86b847f.patch";
hash = "sha256-UDX/BJCJG0WVndP/6PbPK+AZsfU3vVxDCrpn1kb1kqE=";
};
}
];
}); });
}; };
rpi-kernels = builtins.foldl' (b: a: b // rpi-kernel a) { }; rpi-kernels = builtins.foldl' (b: a: b // rpi-kernel a) { };
@ -80,7 +88,7 @@ in
compressFirmwareZstd = x: x; compressFirmwareZstd = x: x;
# provide generic rpi arm64 u-boot # provide generic rpi arm64 u-boot
uboot_rpi_arm64 = prev.buildUBoot rec { uboot-rpi-arm64 = prev.buildUBoot rec {
defconfig = "rpi_arm64_defconfig"; defconfig = "rpi_arm64_defconfig";
extraMeta.platforms = [ "aarch64-linux" ]; extraMeta.platforms = [ "aarch64-linux" ];
filesToInstall = [ "u-boot.bin" ]; filesToInstall = [ "u-boot.bin" ];
@ -115,8 +123,7 @@ in
# #
# For example: `pkgs.rpi-kernels.v6_6_31.bcm2712' # For example: `pkgs.rpi-kernels.v6_6_31.bcm2712'
rpi-kernels = rpi-kernels ( rpi-kernels = rpi-kernels (
prev.lib.lists.crossLists prev.lib.cartesianProductOfSets # this gets renamed yet again to cartesianProduct in April 19 2024
(board: version: { inherit board version; }) { board = boards; version = (builtins.attrNames versions); }
[boards (builtins.attrNames versions)]
); );
} }

7
overlays/libcamera.nix
View file

@ -1,13 +1,13 @@
{ libcamera-apps-src { rpicam-apps-src
, libcamera-src , libcamera-src
, libpisp-src , libpisp-src
, ... , ...
}: }:
final: prev: final: prev:
{ {
# A recent known working version of libcamera-apps # A recent known working version of rpicam-apps
libcamera-apps = libcamera-apps =
final.callPackage ./libcamera-apps.nix { inherit libcamera-apps-src; }; final.callPackage ./rpicam-apps.nix { inherit rpicam-apps-src; };
libpisp = final.stdenv.mkDerivation { libpisp = final.stdenv.mkDerivation {
name = "libpisp"; name = "libpisp";
@ -46,6 +46,5 @@ final: prev:
"-Ddocumentation=enabled" "-Ddocumentation=enabled"
"-Dpycamera=enabled" "-Dpycamera=enabled"
]; ];
}); });
} }

0
overlays/libcamera-apps.nix → overlays/rpicam-apps.nix
View file

10
rpi/default.nix
View file

@ -4,7 +4,7 @@
let let
cfg = config.raspberry-pi-nix; cfg = config.raspberry-pi-nix;
board = cfg.board; board = cfg.board;
version = cfg.kernel_version; version = cfg.kernel-version;
kernel = pkgs.rpi-kernels."${version}"."${board}"; kernel = pkgs.rpi-kernels."${version}"."${board}";
in in
{ {
@ -12,7 +12,7 @@ in
options = with lib; { options = with lib; {
raspberry-pi-nix = { raspberry-pi-nix = {
kernel_version = mkOption { kernel-version = mkOption {
default = "v6_6_31"; default = "v6_6_31";
type = types.str; type = types.str;
description = '' description = ''
@ -115,7 +115,7 @@ in
TARGET_FIRMWARE_DIR="${firmware-path}" TARGET_FIRMWARE_DIR="${firmware-path}"
TARGET_OVERLAYS_DIR="$TARGET_FIRMWARE_DIR/overlays" TARGET_OVERLAYS_DIR="$TARGET_FIRMWARE_DIR/overlays"
TMPFILE="$TARGET_FIRMWARE_DIR/tmp" TMPFILE="$TARGET_FIRMWARE_DIR/tmp"
UBOOT="${pkgs.uboot_rpi_arm64}/u-boot.bin" UBOOT="${pkgs.uboot-rpi-arm64}/u-boot.bin"
KERNEL="${kernel}/Image" KERNEL="${kernel}/Image"
SHOULD_UBOOT=${if cfg.uboot.enable then "1" else "0"} SHOULD_UBOOT=${if cfg.uboot.enable then "1" else "0"}
SRC_FIRMWARE_DIR="${pkgs.raspberrypifw}/share/raspberrypi/boot" SRC_FIRMWARE_DIR="${pkgs.raspberrypifw}/share/raspberrypi/boot"
@ -133,7 +133,7 @@ in
cp "$UBOOT" "$TMPFILE" cp "$UBOOT" "$TMPFILE"
mv -T "$TMPFILE" "$TARGET_FIRMWARE_DIR/u-boot-rpi-arm64.bin" mv -T "$TMPFILE" "$TARGET_FIRMWARE_DIR/u-boot-rpi-arm64.bin"
echo "${ echo "${
builtins.toString pkgs.uboot_rpi_arm64 builtins.toString pkgs.uboot-rpi-arm64
}" > "$STATE_DIRECTORY/uboot-version" }" > "$STATE_DIRECTORY/uboot-version"
rm "$STATE_DIRECTORY/uboot-migration-in-progress" rm "$STATE_DIRECTORY/uboot-migration-in-progress"
} }
@ -194,7 +194,7 @@ in
} }
if [[ "$SHOULD_UBOOT" -eq 1 ]] && [[ -f "$STATE_DIRECTORY/uboot-migration-in-progress" || ! -f "$STATE_DIRECTORY/uboot-version" || $(< "$STATE_DIRECTORY/uboot-version") != ${ if [[ "$SHOULD_UBOOT" -eq 1 ]] && [[ -f "$STATE_DIRECTORY/uboot-migration-in-progress" || ! -f "$STATE_DIRECTORY/uboot-version" || $(< "$STATE_DIRECTORY/uboot-version") != ${
builtins.toString pkgs.uboot_rpi_arm64 builtins.toString pkgs.uboot-rpi-arm64
} ]]; then } ]]; then
migrate_uboot migrate_uboot
fi fi

11
sd-image/default.nix
View file

@ -19,13 +19,14 @@
${lib.strings.concatStringsSep " " config.boot.kernelParams} ${lib.strings.concatStringsSep " " config.boot.kernelParams}
''; '';
}; };
board = config.raspberry-pi-nix.board; cfg = config.raspberry-pi-nix;
version = config.raspberry-pi-nix.kernel_version; board = cfg.board;
version = cfg.kernel-version;
kernel = pkgs.rpi-kernels."${version}"."${board}"; kernel = pkgs.rpi-kernels."${version}"."${board}";
populate-kernel = populate-kernel =
if config.raspberry-pi-nix.uboot.enable if cfg.uboot.enable
then '' then ''
cp ${pkgs.uboot_rpi_arm64}/u-boot.bin firmware/u-boot-rpi-arm64.bin cp ${pkgs.uboot-rpi-arm64}/u-boot.bin firmware/u-boot-rpi-arm64.bin
'' ''
else '' else ''
cp "${kernel}/Image" firmware/kernel.img cp "${kernel}/Image" firmware/kernel.img
@ -39,7 +40,7 @@
cp ${config.hardware.raspberry-pi.config-output} firmware/config.txt cp ${config.hardware.raspberry-pi.config-output} firmware/config.txt
''; '';
populateRootCommands = populateRootCommands =
if config.raspberry-pi-nix.uboot.enable if cfg.uboot.enable
then '' then ''
mkdir -p ./files/boot mkdir -p ./files/boot
${config.boot.loader.generic-extlinux-compatible.populateCmd} -c ${config.system.build.toplevel} -d ./files/boot ${config.boot.loader.generic-extlinux-compatible.populateCmd} -c ${config.system.build.toplevel} -d ./files/boot