dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #89717 from SquircleSpace/rpi4-8gb

Browse Source 
Support Raspberry Pi 4 (8 GB)
This commit is contained in:
Samuel Dionne-Riel 2020-06-16 13:26:20 -04:00 committed by GitHub
commit c62d060648
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 14 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/libraspberrypi/default.nix
View File

@ -2,12 +2,12 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libraspberrypi"; name = "libraspberrypi";
version = "2019-10-22"; version = "2020-05-28";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "raspberrypi"; owner = "raspberrypi";
repo = "userland"; repo = "userland";
rev = "5070cb7fc150fc98f1ed64a7739c3356970d9f76"; rev = "f97b1af1b3e653f9da2c1a3643479bfd469e3b74";
sha256 = "08yfzwn9s7lhrblcsxyag9p5lj5vk3n66b1pv3f7r3hah7qcggyq"; sha256 = "1r7n05rv96hqjq0rn0qzchmfqs0j7vh3p8jalgh66s6l0vms5mwy";
}; };
cmakeFlags = if (stdenv.targetPlatform.system == "aarch64-linux") cmakeFlags = if (stdenv.targetPlatform.system == "aarch64-linux")

6
pkgs/development/misc/rpiboot/unstable.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, libusb1 }: { stdenv, fetchFromGitHub, libusb1 }:
let let
version = "2018-03-27"; version = "2020-05-11";
name = "rpiboot-unstable-${version}"; name = "rpiboot-unstable-${version}";
in stdenv.mkDerivation { in stdenv.mkDerivation {
inherit name; inherit name;
@ -9,8 +9,8 @@ in stdenv.mkDerivation {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "raspberrypi"; owner = "raspberrypi";
repo = "usbboot"; repo = "usbboot";
rev = "fb86716935f2e820333b037a2ff93a338ad9b695"; rev = "c650cd747c1d0597487dcf319bf95b5ba775d78b";
sha256 = "163g7iw7kf6ra71adx6lf1xzf3kv20bppva15ljwn54jlah5mv98"; sha256 = "17kapny79dh05vfmrniqdvz6xhpwnqnw0511ycfx4qcjh4krxh8n";
}; };
nativeBuildInputs = [ libusb1 ]; nativeBuildInputs = [ libusb1 ];

4
pkgs/os-specific/linux/firmware/raspberrypi/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "raspberrypi-firmware"; pname = "raspberrypi-firmware";
version = "1.20190925"; version = "1.20200601";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "raspberrypi"; owner = "raspberrypi";
repo = "firmware"; repo = "firmware";
rev = version; rev = version;
sha256 = "0xyj3f04dcfnl9hp8hakgwcb1msqh7934n0pclcmzy47xjkz7ris"; sha256 = "1vm038f9digwg8gdxl2bypzlip3ycjb6bl56274gh5i9abl6wjvf";
}; };
installPhase = '' installPhase = ''

20
pkgs/os-specific/linux/firmware/raspberrypi/tools-dont-install-sysv-init-scripts.patch
View File

@ -1,20 +0,0 @@
diff --git a/interface/vmcs_host/linux/vcfiled/CMakeLists.txt b/interface/vmcs_host/linux/vcfiled/CMakeLists.txt
index aed0e83..b325676 100644
--- a/interface/vmcs_host/linux/vcfiled/CMakeLists.txt
+++ b/interface/vmcs_host/linux/vcfiled/CMakeLists.txt
@@ -17,15 +17,6 @@ target_link_libraries(vcfiled
install(TARGETS vcfiled
RUNTIME DESTINATION sbin)
-configure_file (etc/init.d/vcfiled ${PROJECT_BINARY_DIR}/etc/init.d/vcfiled)
-
-# script to start up vcfiled at start of day
-install(PROGRAMS ${PROJECT_BINARY_DIR}/etc/init.d/vcfiled
- DESTINATION /etc/init.d)
-# install locally to the installation directory too
-install(PROGRAMS ${PROJECT_BINARY_DIR}/etc/init.d/vcfiled
- DESTINATION ${VMCS_INSTALL_PREFIX}/share/install)
-
# test program for vcfiled_check library
add_executable(vcfiled_lock_test vcfiled_lock_test.c)
target_link_libraries(vcfiled_lock_test vcfiled_check)

8
pkgs/os-specific/linux/firmware/raspberrypi/tools.nix
View File

@ -2,17 +2,15 @@
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "raspberrypi-tools"; pname = "raspberrypi-tools";
version = "2018-10-03"; version = "2020-05-28";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "raspberrypi"; owner = "raspberrypi";
repo = "userland"; repo = "userland";
rev = "de4a7f2e3c391e2d3bc76af31864270e7802d9ac"; rev = "f97b1af1b3e653f9da2c1a3643479bfd469e3b74";
sha256 = "0w96xa98ngdk9m6wv185w8waa7wm2hkn2bhxz52zd477hchzrxlg"; sha256 = "1r7n05rv96hqjq0rn0qzchmfqs0j7vh3p8jalgh66s6l0vms5mwy";
}; };
patches = [ ./tools-dont-install-sysv-init-scripts.patch ];
nativeBuildInputs = [ cmake pkgconfig ]; nativeBuildInputs = [ cmake pkgconfig ];
preConfigure = '' preConfigure = ''

6
pkgs/os-specific/linux/kernel/linux-rpi.nix
View File

@ -1,8 +1,8 @@
{ stdenv, lib, buildPackages, fetchFromGitHub, perl, buildLinux, rpiVersion, ... } @ args: { stdenv, lib, buildPackages, fetchFromGitHub, perl, buildLinux, rpiVersion, ... } @ args:
let let
modDirVersion = "4.19.75"; modDirVersion = "4.19.118";
tag = "1.20190925"; tag = "1.20200601";
in in
lib.overrideDerivation (buildLinux (args // { lib.overrideDerivation (buildLinux (args // {
version = "${modDirVersion}-${tag}"; version = "${modDirVersion}-${tag}";
@ -12,7 +12,7 @@ lib.overrideDerivation (buildLinux (args // {
owner = "raspberrypi"; owner = "raspberrypi";
repo = "linux"; repo = "linux";
rev = "raspberrypi-kernel_${tag}-1"; rev = "raspberrypi-kernel_${tag}-1";
sha256 = "0l91kb4jjxg4fcp7d2aqm1fj34ns137rys93k907mdgnarcliafs"; sha256 = "11jzsmnd1qry2ir9vmsv0nfdzjpgkn5yab5ylxcz406plc073anp";
}; };
defconfig = { defconfig = {