raspberrypi-tools: Init at 2018-02-05

This commit is contained in:
Tuomas Tynkkynen 2018-04-02 23:19:20 +03:00
parent 33202137bf
commit 434722ba62
3 changed files with 52 additions and 0 deletions

View file

@ -0,0 +1,20 @@
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)

View file

@ -0,0 +1,31 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig }:
stdenv.mkDerivation rec {
name = "raspberrypi-tools-${version}";
version = "2018-02-05";
src = fetchFromGitHub {
owner = "raspberrypi";
repo = "userland";
rev = "a343dcad1dae4e93f4bfb99496697e207f91027e";
sha256 = "1z4qrwjb7x3a45mx978q8vyhnx068sgzhymm4z0ayhckji4ngal1";
};
patches = [ ./tools-dont-install-sysv-init-scripts.patch ];
nativeBuildInputs = [ cmake pkgconfig ];
preConfigure = ''
cmakeFlagsArray+=("-DVMCS_INSTALL_PREFIX=$out")
'' + stdenv.lib.optionalString stdenv.isAarch64 ''
cmakeFlagsArray+=("-DARM64=1")
'';
meta = with stdenv.lib; {
description = "Userland tools for the Raspberry Pi board";
homepage = https://github.com/raspberrypi/userland;
license = licenses.bsd3;
platforms = [ "armv6l-linux" "armv7l-linux" "aarch64-linux" ];
maintainers = with maintainers; [ dezgeg viric tavyc ];
};
}

View file

@ -13852,6 +13852,7 @@ with pkgs;
radeontop = callPackage ../os-specific/linux/radeontop { };
raspberrypifw = callPackage ../os-specific/linux/firmware/raspberrypi {};
raspberrypi-tools = callPackage ../os-specific/linux/firmware/raspberrypi/tools.nix {};
regionset = callPackage ../os-specific/linux/regionset { };