a0871be6c0
* Update buildroot-patches for 2020.11-rc1 buildroot * Update buildroot to 2020.11-rc1 Signed-off-by: Stefan Agner <stefan@agner.ch> * Don't rely on sfdisk --list-free output The --list-free (-F) argument does not allow machine readable mode. And it seems that the output format changes over time (different spacing, using size postfixes instead of raw blocks). Use sfdisk json output and calculate free partition space ourselfs. This works for 2.35 and 2.36 and is more robust since we rely on output which is meant for scripts to parse. * Migrate defconfigs for Buildroot 2020.11-rc1 In particular, rename BR2_TARGET_UBOOT_BOOT_SCRIPT(_SOURCE) to BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT(_SOURCE). * Rebase/remove systemd patches for systemd 246 * Drop apparmor/libapparmor from buildroot-external * hassos-persists: use /run as directory for lockfiles The U-Boot tools use /var/lock by default which is not created any more by systemd by default (it is under tmpfiles legacy.conf, which we no longer install). * Disable systemd-update-done.service The service is not suited for pure read-only systems. In particular the service needs to be able to write a file in /etc and /var. Remove the service. Note: This is a static service and cannot be removed using systemd-preset. * Disable apparmor.service for now The service loads all default profiles. Some might actually cause problems. E.g. the profile for ping seems not to match our setup for /etc/resolv.conf: [85503.634653] audit: type=1400 audit(1605286002.684:236): apparmor="DENIED" operation="open" profile="ping" name="/run/resolv.conf" pid=27585 comm="ping" requested_mask="r" denied_mask="r" fsuid=0 ouid=0
56 lines
2.0 KiB
Diff
56 lines
2.0 KiB
Diff
From 2cd95289939b4a7c2576176c7f6268028aa093b2 Mon Sep 17 00:00:00 2001
|
|
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
Date: Fri, 24 May 2019 21:50:16 +0200
|
|
Subject: [PATCH] Revert "Updating CMake configuration file to use
|
|
version 3.14 as minimum and added boost dependency targets"
|
|
|
|
This reverts commit 4e4ee999c4b323514c0ba81ab1ff3afb10d2f1cd to avoid
|
|
bumping host-cmake requirement version from 3.8 to 3.14 in buildroot.
|
|
|
|
[Fabrice: Updated for 2020.1]
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
---
|
|
CMakeLists.txt | 8 +++-----
|
|
1 file changed, 3 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index c5b7832ff..a21f5b87b 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -1,5 +1,5 @@
|
|
-#set to minimum version that supports clean build
|
|
-cmake_minimum_required(VERSION 3.14.0)
|
|
+#set to minimum version that supports clean build on cygwin
|
|
+cmake_minimum_required(VERSION 2.8.4)
|
|
|
|
project(domoticz)
|
|
|
|
@@ -583,6 +583,7 @@ set(Boost_USE_STATIC_LIBS ${USE_STATIC_BOOST})
|
|
set(Boost_USE_MULTITHREADED ON)
|
|
unset(Boost_INCLUDE_DIR CACHE)
|
|
unset(Boost_LIBRARY_DIRS CACHE)
|
|
+find_package(Boost REQUIRED COMPONENTS thread system)
|
|
|
|
if(USE_STATIC_BOOST)
|
|
message(STATUS "Linking against boost static libraries")
|
|
@@ -590,16 +591,6 @@ else(USE_STATIC_BOOST)
|
|
message(STATUS "Linking against boost dynamic libraries")
|
|
endif(USE_STATIC_BOOST)
|
|
|
|
-find_package(Boost REQUIRED COMPONENTS thread system)
|
|
-if(Boost_FOUND)
|
|
- MESSAGE(STATUS "BOOST libraries found at: ${Boost_LIBRARY_DIRS}")
|
|
- MESSAGE(STATUS "Boost includes found at: ${Boost_INCLUDE_DIR}")
|
|
-else(Boost_FOUND)
|
|
- MESSAGE(FATAL_ERROR "Boost thread/system library not found on your system, try to get this installed.")
|
|
-endif(Boost_FOUND)
|
|
-
|
|
-target_link_libraries(domoticz Boost::thread Boost::system)
|
|
-
|
|
# compare found vs required libBoost version
|
|
if(Boost_VERSION VERSION_LESS DOMO_MIN_LIBBOOST_VERSION)
|
|
message(FATAL_ERROR "Found libBoost version ${Boost_VERSION}, ${DOMO_MIN_LIBBOOST_VERSION} or newer required")
|
|
--
|
|
2.20.1
|
|
|