Revert "Build and install full rpi-userland"
This reverts commit 5a719b7a10.
This commit is contained in:
j1nx
parent
16dbe4d757
commit
7d92ee29cc
|
|
@ -0,0 +1,142 @@
|
|||
From 54c913784e94825d604e3e4323bf4979f399037a Mon Sep 17 00:00:00 2001
|
||||
From: j1nx <p.steenbergen@j1nx.nl>
|
||||
Date: Tue, 4 Aug 2020 15:12:49 +0200
|
||||
Subject: [PATCH 1/1] Linux tools only
|
||||
|
||||
---
|
||||
CMakeLists.txt | 68 +++++++++++++-------------
|
||||
host_applications/linux/CMakeLists.txt | 10 ++--
|
||||
2 files changed, 39 insertions(+), 39 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index fe67fc8..9496af0 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -22,20 +22,20 @@ set(VCOS_PTHREADS_BUILD_SHARED TRUE)
|
||||
|
||||
include(makefiles/cmake/global_settings.cmake)
|
||||
include(makefiles/cmake/arm-linux.cmake)
|
||||
-include(makefiles/cmake/vmcs.cmake)
|
||||
+#include(makefiles/cmake/vmcs.cmake)
|
||||
|
||||
enable_language(ASM)
|
||||
|
||||
# Global include paths
|
||||
include_directories(host_applications/framework)
|
||||
include_directories(${PROJECT_SOURCE_DIR})
|
||||
-include_directories(interface/vcos/pthreads)
|
||||
-include_directories(interface/vmcs_host/linux)
|
||||
-include_directories(interface/vmcs_host)
|
||||
-include_directories(interface/vmcs_host/khronos)
|
||||
-include_directories(interface/khronos/include)
|
||||
-include_directories(${PROJECT_BINARY_DIR})
|
||||
-include_directories(interface/vchiq_arm)
|
||||
+#include_directories(interface/vcos/pthreads)
|
||||
+#include_directories(interface/vmcs_host/linux)
|
||||
+#include_directories(interface/vmcs_host)
|
||||
+#include_directories(interface/vmcs_host/khronos)
|
||||
+#include_directories(interface/khronos/include)
|
||||
+#include_directories(${PROJECT_BINARY_DIR})
|
||||
+#include_directories(interface/vchiq_arm)
|
||||
#include_directories(tools/inet_transport)
|
||||
include_directories(host_support/include)
|
||||
|
||||
@@ -63,28 +63,28 @@ if(KHRONOS_EGL_PLATFORM MATCHES "openwfc")
|
||||
endif()
|
||||
|
||||
# List of subsidiary CMakeLists
|
||||
-add_subdirectory(interface/vcos)
|
||||
-add_subdirectory(interface/vmcs_host)
|
||||
-add_subdirectory(interface/vchiq_arm)
|
||||
-if(NOT ARM64)
|
||||
- add_subdirectory(interface/khronos)
|
||||
-endif()
|
||||
+#add_subdirectory(interface/vcos)
|
||||
+#add_subdirectory(interface/vmcs_host)
|
||||
+#add_subdirectory(interface/vchiq_arm)
|
||||
+#if(NOT ARM64)
|
||||
+# add_subdirectory(interface/khronos)
|
||||
+#endif()
|
||||
|
||||
#add_subdirectory(opensrc/tools/lua)
|
||||
-if(BUILD_MMAL)
|
||||
- include_directories(interface/mmal)
|
||||
- add_subdirectory(interface/mmal)
|
||||
- add_subdirectory(containers)
|
||||
-endif()
|
||||
+#if(BUILD_MMAL)
|
||||
+# include_directories(interface/mmal)
|
||||
+# add_subdirectory(interface/mmal)
|
||||
+# add_subdirectory(containers)
|
||||
+#endif()
|
||||
|
||||
# VidTex supports Android and Linux
|
||||
-if(BUILD_MMAL_APPS)
|
||||
-add_subdirectory(host_applications/android/apps/vidtex)
|
||||
-endif(BUILD_MMAL_APPS)
|
||||
+#if(BUILD_MMAL_APPS)
|
||||
+#add_subdirectory(host_applications/android/apps/vidtex)
|
||||
+#endif(BUILD_MMAL_APPS)
|
||||
|
||||
-if(NOT ARM64)
|
||||
- add_subdirectory(middleware/openmaxil)
|
||||
-endif()
|
||||
+#if(NOT ARM64)
|
||||
+# add_subdirectory(middleware/openmaxil)
|
||||
+#endif()
|
||||
|
||||
# 3d demo code
|
||||
#if(NOT ANDROID)
|
||||
@@ -118,15 +118,15 @@ add_subdirectory(helpers/dtoverlay)
|
||||
set(vmcs_host_apps_VERSION_MAJOR 1)
|
||||
set(vmcs_host_apps_VERSION_MINOR 0)
|
||||
|
||||
-include_directories("${PROJECT_BINARY_DIR}")
|
||||
-include(FindPkgConfig QUIET)
|
||||
-if(PKG_CONFIG_FOUND)
|
||||
+#include_directories("${PROJECT_BINARY_DIR}")
|
||||
+#include(FindPkgConfig QUIET)
|
||||
+#if(PKG_CONFIG_FOUND)
|
||||
# Produce a pkg-config file
|
||||
- foreach(PCFILE bcm_host.pc brcmegl.pc brcmglesv2.pc brcmvg.pc vcsm.pc mmal.pc)
|
||||
- configure_file("pkgconfig/${PCFILE}.in" "${PCFILE}" @ONLY)
|
||||
- install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PCFILE}"
|
||||
- DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig")
|
||||
- endforeach()
|
||||
-endif()
|
||||
+# foreach(PCFILE bcm_host.pc brcmegl.pc brcmglesv2.pc brcmvg.pc vcsm.pc mmal.pc)
|
||||
+# configure_file("pkgconfig/${PCFILE}.in" "${PCFILE}" @ONLY)
|
||||
+# install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PCFILE}"
|
||||
+# DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig")
|
||||
+# endforeach()
|
||||
+#endif()
|
||||
# Remove cache entry, if one added by command line
|
||||
unset(KHRONOS_EGL_PLATFORM CACHE)
|
||||
diff --git a/host_applications/linux/CMakeLists.txt b/host_applications/linux/CMakeLists.txt
|
||||
index 928b637..9ef9cab 100644
|
||||
--- a/host_applications/linux/CMakeLists.txt
|
||||
+++ b/host_applications/linux/CMakeLists.txt
|
||||
@@ -1,15 +1,15 @@
|
||||
# linux apps
|
||||
|
||||
-add_subdirectory(libs/bcm_host)
|
||||
-add_subdirectory(apps/gencmd)
|
||||
-add_subdirectory(apps/tvservice)
|
||||
-add_subdirectory(apps/vcmailbox)
|
||||
+#add_subdirectory(libs/bcm_host)
|
||||
+#add_subdirectory(apps/gencmd)
|
||||
+#add_subdirectory(apps/tvservice)
|
||||
+#add_subdirectory(apps/vcmailbox)
|
||||
if(NOT ARM64)
|
||||
add_subdirectory(apps/raspicam)
|
||||
add_subdirectory(libs/sm)
|
||||
add_subdirectory(apps/smem)
|
||||
endif()
|
||||
-add_subdirectory(libs/debug_sym)
|
||||
+#add_subdirectory(libs/debug_sym)
|
||||
add_subdirectory(apps/dtoverlay)
|
||||
add_subdirectory(apps/dtmerge)
|
||||
|
||||
--
|
||||
2.20.1
|
||||
|
||||
Loading…
Reference in New Issue