raspberrypi-tools: 2018-10-03 -> 2020-5-28

This commit is contained in:
Ada Avery 2020-06-06 02:46:57 -07:00 committed by Michael Bishop
parent 4612927ad2
commit cd0cfb2ed1
No known key found for this signature in database
GPG key ID: DF6388A85A7C8D6E
2 changed files with 3 additions and 25 deletions

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)

View file

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