From 9b2982813bdb1241e2149bd48893d03e139d24bb Mon Sep 17 00:00:00 2001 From: Burt P Date: Wed, 19 Jul 2017 00:55:42 -0500 Subject: device tree: reworked and cleaned up * Moved device tree functions to modules/devices/devicetree/dt_util.c * The dtr_* functions usable from outside devicetree.c, for example in get_motherboard(). Must #include "dt_util.h" * Now possible to use an alternate device tree root for testing -DOVRDTRROOT=\"/some/path\" * Alternately, pass dtr_new() an alternate base path. * Abandoned the tuple grouping and inherited properties stuff for now. Signed-off-by: Burt P --- CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index aa146e8c..765c8c89 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,6 +6,7 @@ set(HARDINFO_VERSION "0.6-alpha") option(HARDINFO_NOSYNC "Disable database sync via libsoup" 1) set(OVRARCH "" CACHE STRING "Override HARDINFO_ARCH value") set(OVRCPUINFO "" CACHE STRING "Specify a different file for /proc/cpuinfo") +set(OVRDTRROOT "" CACHE STRING "Specify a different path for /proc/device-tree") SET( CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ) include(GNUInstallDirs) @@ -58,6 +59,10 @@ if (OVRCPUINFO) add_definitions(-DPROC_CPUINFO=${OVRCPUINFO}) message(STATUS "/proc/cpuinfo override: ${OVRCPUINFO}") endif() +if (OVRDTRROOT) + add_definitions(-DDTR_ROOT=${OVRDTRROOT}) + message(STATUS "/proc/device-tree override: ${OVRDTRROOT}") +endif() add_definitions(-DLOCALEDIR="${CMAKE_INSTALL_PREFIX}/share/locale") message(STATUS "LOCALEDIR = ${CMAKE_INSTALL_PREFIX}/share/locale") @@ -125,6 +130,7 @@ set(MODULE_devices_SOURCES modules/devices/devmemory.c modules/devices/dmi.c modules/devices/devicetree.c + modules/devices/devicetree/dt_util.c modules/devices/inputdevices.c modules/devices/pci.c modules/devices/printers.c -- cgit v1.2.3