gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #292880 from peat-psuwit/for-upstream/linux-rpi_20240124

Browse Source 
linux-rpi: stable_20231123 -> stable_20240124, raspberrypifw: stable_20231123 -> 1.20240529, raspberrypiWirelessFirmware: unstable-2023-11-15 -> unstable-2024-02-26
This commit is contained in:
Aleksana
2024-06-19 01:11:09 +08:00
committed by GitHub
parent e2086a7585 02b05c0d32
commit cdba71c00f
3 changed files with 26 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix
+5 -5
View File
@@ -2,22 +2,22 @@
stdenvNoCC.mkDerivation {
pname = "raspberrypi-wireless-firmware";
version = "unstable-2023-11-15";
version = "unstable-2024-02-26";
srcs = [
(fetchFromGitHub {
name = "bluez-firmware";
owner = "RPi-Distro";
repo = "bluez-firmware";
rev = "d9d4741caba7314d6500f588b1eaa5ab387a4ff5";
hash = "sha256-CjbZ3t3TW/iJ3+t9QKEtM9NdQU7SwcUCDYuTmFEwvhU=";
rev = "78d6a07730e2d20c035899521ab67726dc028e1c";
hash = "sha256-KakKnOBeWxh0exu44beZ7cbr5ni4RA9vkWYb9sGMb8Q=";
})
(fetchFromGitHub {
name = "firmware-nonfree";
owner = "RPi-Distro";
repo = "firmware-nonfree";
rev = "88aa085bfa1a4650e1ccd88896f8343c22a24055";
hash = "sha256-Yynww79LPPkau4YDSLI6IMOjH64nMpHUdGjnCfIR2+M=";
rev = "223ccf3a3ddb11b3ea829749fbbba4d65b380897";
hash = "sha256-BGq0+cr+xBRwQM/LqiQuRWuZpQsKM5jfcrNCqWMuVzM=";
})
];
pkgs/os-specific/linux/firmware/raspberrypi/default.nix
+3 -6
View File
@@ -3,16 +3,13 @@
stdenvNoCC.mkDerivation rec {
# NOTE: this should be updated with linux_rpi
pname = "raspberrypi-firmware";
# raspberrypi/firmware no longers tag the releases. However, since each commit
# on the stable branch corresponds to a tag in raspberrypi/linux repo, we
# assume they are cut together.
version = "stable_20231123";
version = "1.20240529";
src = fetchFromGitHub {
owner = "raspberrypi";
repo = "firmware";
rev = "524247ac6d8b1f4ddd53730e978a70c76a320bd6";
hash = "sha256-rESwkR7pc5MTwIZ8PaMUPXuzxfv+jVpdRp8ijvxHGcg=";
rev = version;
hash = "sha256-KsCo7ZG6vKstxRyFljZtbQvnDSqiAPdUza32xTY/tlA=";
};
installPhase = ''
pkgs/os-specific/linux/kernel/linux-rpi.nix
+18 -17
View File
@@ -2,8 +2,8 @@
let
# NOTE: raspberrypifw & raspberryPiWirelessFirmware should be updated with this
modDirVersion = "6.1.63";
tag = "stable_20231123";
modDirVersion = "6.6.31";
tag = "stable_20240529";
in
lib.overrideDerivation (buildLinux (args // {
version = "${modDirVersion}-${tag}";
@@ -14,7 +14,7 @@ lib.overrideDerivation (buildLinux (args // {
owner = "raspberrypi";
repo = "linux";
rev = tag;
hash = "sha256-4Rc57y70LmRFwDnOD4rHoHGmfxD9zYEAwYm9Wvyb3no=";
hash = "sha256-UWUTeCpEN7dlFSQjog6S3HyEWCCnaqiUqV5KxCjYink=";
};
defconfig = {
@@ -24,32 +24,33 @@ lib.overrideDerivation (buildLinux (args // {
"4" = "bcm2711_defconfig";
}.${toString rpiVersion};
structuredExtraConfig = (args.structuredExtraConfig or {}) // (with lib.kernel; {
# Workaround https://github.com/raspberrypi/linux/issues/6198
# Needed because NixOS 24.05+ sets DRM_SIMPLEDRM=y which pulls in
# DRM_KMS_HELPER=y.
BACKLIGHT_CLASS_DEVICE = yes;
});
features = {
efiBootStub = false;
} // (args.features or {});
kernelPatches = (args.kernelPatches or []) ++ [
# Fix "WARNING: unmet direct dependencies detected for MFD_RP1", and
# subsequent build failure.
# https://github.com/NixOS/nixpkgs/pull/268280#issuecomment-1911839809
# https://github.com/raspberrypi/linux/pull/5900
# Fix compilation errors due to incomplete patch backport.
# https://github.com/raspberrypi/linux/pull/6223
{
name = "drm-rp1-depends-on-instead-of-select-MFD_RP1.patch";
name = "gpio-pwm_-_pwm_apply_might_sleep.patch";
patch = fetchpatch {
url = "https://github.com/peat-psuwit/rpi-linux/commit/6de0bb51929cd3ad4fa27b2a421a2af12e6468f5.patch";
hash = "sha256-9pHcbgWTiztu48SBaLPVroUnxnXMKeCGt5vEo9V8WGw=";
url = "https://github.com/peat-psuwit/rpi-linux/commit/879f34b88c60dd59765caa30576cb5bfb8e73c56.patch";
hash = "sha256-HlOkM9EFmlzOebCGoj7lNV5hc0wMjhaBFFZvaRCI0lI=";
};
}
# Fix `ERROR: modpost: missing MODULE_LICENSE() in <...>/bcm2712-iommu.o`
# by preventing such code from being built as module.
# https://github.com/NixOS/nixpkgs/pull/284035#issuecomment-1913015802
# https://github.com/raspberrypi/linux/pull/5910
{
name = "iommu-bcm2712-don-t-allow-building-as-module.patch";
name = "ir-rx51_-_pwm_apply_might_sleep.patch";
patch = fetchpatch {
url = "https://github.com/peat-psuwit/rpi-linux/commit/693a5e69bddbcbe1d1b796ebc7581c3597685b1b.patch";
hash = "sha256-8BYYQDM5By8cTk48ASYKJhGVQnZBIK4PXtV70UtfS+A=";
url = "https://github.com/peat-psuwit/rpi-linux/commit/23431052d2dce8084b72e399fce82b05d86b847f.patch";
hash = "sha256-UDX/BJCJG0WVndP/6PbPK+AZsfU3vVxDCrpn1kb1kqE=";
};
}
];