Bump buildroot to 2019.02
This commit is contained in:
20
bsp/buildroot/package/domoticz/0001-Bumped-version.patch
Normal file
20
bsp/buildroot/package/domoticz/0001-Bumped-version.patch
Normal file
@@ -0,0 +1,20 @@
|
||||
From 98723b7da9467a49222b8a7ffaae276c5bc075c1 Mon Sep 17 00:00:00 2001
|
||||
From: gizmocuz <gizmocuz@users.noreply.github.com>
|
||||
Date: Thu, 28 Jun 2018 08:00:58 +0200
|
||||
Subject: [PATCH] Bumped version
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Retrieved from https://github.com/domoticz/domoticz/commit/98723b7da9467a49222b8a7ffaae276c5bc075c1]
|
||||
---
|
||||
appversion.default | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/appversion.default b/appversion.default
|
||||
index beaa069bb..7d3530590 100644
|
||||
--- a/appversion.default
|
||||
+++ b/appversion.default
|
||||
@@ -1,3 +1,3 @@
|
||||
-#define APPVERSION 5876
|
||||
+#define APPVERSION 9700
|
||||
#define APPHASH "b97777b"
|
||||
#define APPDATE 1478691222
|
||||
@@ -1,56 +0,0 @@
|
||||
From b9481d3382d416d72f523a0442d662e49b4192d1 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Sun, 14 Jan 2018 18:18:32 +0100
|
||||
Subject: [PATCH] Fix compilation with boost 1.66
|
||||
|
||||
Patch fetch from one of the answer of
|
||||
https://github.com/domoticz/domoticz/issues/2034
|
||||
(issue still opened, no official PR sent upstream)
|
||||
|
||||
Boost asio changed its API:
|
||||
- http://www.boost.org/doc/libs/1_66_0/doc/html/boost_asio/net_ts.html
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
webserver/proxyclient.cpp | 2 +-
|
||||
webserver/server.cpp | 4 ++--
|
||||
2 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/webserver/proxyclient.cpp b/webserver/proxyclient.cpp
|
||||
index 203ee619..efc9815a 100644
|
||||
--- a/webserver/proxyclient.cpp
|
||||
+++ b/webserver/proxyclient.cpp
|
||||
@@ -639,7 +639,7 @@ namespace http {
|
||||
void CProxyManager::StartThread()
|
||||
{
|
||||
try {
|
||||
- boost::asio::ssl::context ctx(io_service, boost::asio::ssl::context::sslv23);
|
||||
+ boost::asio::ssl::context ctx(boost::asio::ssl::context::sslv23);
|
||||
ctx.set_verify_mode(boost::asio::ssl::verify_none);
|
||||
|
||||
proxyclient.reset(new CProxyClient(io_service, ctx, m_pWebEm));
|
||||
diff --git a/webserver/server.cpp b/webserver/server.cpp
|
||||
index 5255aa34..0c1af08a 100644
|
||||
--- a/webserver/server.cpp
|
||||
+++ b/webserver/server.cpp
|
||||
@@ -148,7 +148,7 @@ void server::handle_accept(const boost::system::error_code& e) {
|
||||
ssl_server::ssl_server(const ssl_server_settings & ssl_settings, request_handler & user_request_handler) :
|
||||
server_base(ssl_settings, user_request_handler),
|
||||
settings_(ssl_settings),
|
||||
- context_(io_service_, ssl_settings.get_ssl_method())
|
||||
+ context_(ssl_settings.get_ssl_method())
|
||||
{
|
||||
#ifdef DEBUG_WWW
|
||||
_log.Log(LOG_STATUS, "[web:%s] create ssl_server using ssl_server_settings : %s", ssl_settings.listening_port.c_str(), ssl_settings.to_string().c_str());
|
||||
@@ -161,7 +161,7 @@ ssl_server::ssl_server(const ssl_server_settings & ssl_settings, request_handler
|
||||
ssl_server::ssl_server(const server_settings & settings, request_handler & user_request_handler) :
|
||||
server_base(settings, user_request_handler),
|
||||
settings_(dynamic_cast<ssl_server_settings const &>(settings)),
|
||||
- context_(io_service_, dynamic_cast<ssl_server_settings const &>(settings).get_ssl_method()) {
|
||||
+ context_(dynamic_cast<ssl_server_settings const &>(settings).get_ssl_method()) {
|
||||
#ifdef DEBUG_WWW
|
||||
_log.Log(LOG_STATUS, "[web:%s] create ssl_server using server_settings : %s", settings.listening_port.c_str(), settings.to_string().c_str());
|
||||
#endif
|
||||
--
|
||||
2.14.1
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
From 4b77662232c806b8aba7680405144ad51ac3671b Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Thu, 29 Nov 2018 00:36:00 +0100
|
||||
Subject: [PATCH] CMakeLists.txt: fix build with python and cmake <= 3.7
|
||||
|
||||
domoticz will fail to build with python and older cmake
|
||||
Indeed, find_package(PythonLibs 3.4) will not recognize python 3.7 until
|
||||
cmake 3.7 and the following commit:
|
||||
https://github.com/Kitware/CMake/commit/c31573b9641e0f1bc7a34149506db51f3494323b
|
||||
|
||||
To fix this, add a call to find_package(PythonInterp 3.4). Indeed, if
|
||||
FindPythonInterp has already found the major and minor version, that
|
||||
version will be inserted between the user supplied versions and the
|
||||
stock version list since cmake in version 3.1 and
|
||||
https://github.com/Kitware/CMake/commit/3816cd2dc7a7cc220e4f1b1e87fee986545b9cb3
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/8e82501a7b49da628ec026132ffca44c0c813040
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status: https://github.com/domoticz/domoticz/pull/2889]
|
||||
---
|
||||
CMakeLists.txt | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index f4e38b88..41003a0c 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -125,6 +125,7 @@ ENDIF(USE_BUILTIN_SQLITE)
|
||||
|
||||
option(USE_PYTHON "Use Python for Plugins and Event-Scripts" YES)
|
||||
IF(USE_PYTHON)
|
||||
+ find_package(PythonInterp 3.4)
|
||||
find_package(PythonLibs 3.4)
|
||||
IF(PYTHONLIBS_FOUND)
|
||||
MESSAGE(STATUS "Python3 includes found at: ${PYTHON_INCLUDE_PATH}")
|
||||
--
|
||||
2.14.1
|
||||
|
||||
@@ -3,11 +3,12 @@ config BR2_PACKAGE_DOMOTICZ
|
||||
depends on BR2_USE_MMU # mosquitto
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4 # mosquitto
|
||||
depends on !BR2_STATIC_LIBS # mosquitto
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # sleep_for
|
||||
# pthread_condattr_setclock
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_USE_WCHAR
|
||||
depends on BR2_PACKAGE_LUA_5_2 || BR2_PACKAGE_LUA_5_3
|
||||
depends on BR2_PACKAGE_LUA_5_3
|
||||
depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # exception_ptr
|
||||
select BR2_PACKAGE_BOOST
|
||||
select BR2_PACKAGE_BOOST_DATE_TIME
|
||||
@@ -27,13 +28,14 @@ config BR2_PACKAGE_DOMOTICZ
|
||||
|
||||
http://domoticz.com
|
||||
|
||||
comment "domoticz needs lua >= 5.2 and a toolchain w/ C++, NPTL, wchar, dynamic library"
|
||||
comment "domoticz needs lua 5.3 and a toolchain w/ C++, gcc >= 4.8, NPTL, wchar, dynamic library"
|
||||
depends on BR2_USE_MMU
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4
|
||||
depends on !BR2_INSTALL_LIBSTDCPP || \
|
||||
!BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \
|
||||
!BR2_TOOLCHAIN_HAS_THREADS_NPTL || \
|
||||
!BR2_USE_WCHAR || BR2_STATIC_LIBS || \
|
||||
!(BR2_PACKAGE_LUA_5_2 || BR2_PACKAGE_LUA_5_3)
|
||||
!BR2_PACKAGE_LUA_5_3
|
||||
|
||||
comment "domoticz needs exception_ptr"
|
||||
depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# Locally computed:
|
||||
sha256 5ea8f37f2ef900e9bd17b1b5375e75bfdec4f09001e3e2e0b647a260989d014c domoticz-3.8153.tar.gz
|
||||
sha256 c31f185a1ffac01b86a77bf33e059a4403d814e826c9d6639c63c2e9afa55a46 domoticz-4.9700.tar.gz
|
||||
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 License.txt
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
DOMOTICZ_VERSION = 3.8153
|
||||
DOMOTICZ_VERSION = 4.9700
|
||||
DOMOTICZ_SITE = $(call github,domoticz,domoticz,$(DOMOTICZ_VERSION))
|
||||
DOMOTICZ_LICENSE = GPL-3.0
|
||||
DOMOTICZ_LICENSE_FILES = License.txt
|
||||
@@ -18,32 +18,18 @@ DOMOTICZ_DEPENDENCIES = \
|
||||
sqlite \
|
||||
zlib
|
||||
|
||||
# Fixes:
|
||||
# http://autobuild.buildroot.org/results/454c0ea393615bae2d1b44be9920f25b5c49fc33
|
||||
# There is an issue with powerpc64le and boost::uuids::random_generator on the
|
||||
# following line of code (from include/boost/uuid/seed_rng.hpp):
|
||||
# sha.process_bytes( (unsigned char const*)&std::rand, sizeof( void(*)() ) )
|
||||
# This line "inspects the first couple bytes (here eight) of the std::rand
|
||||
# function to seed some rng. Due to the implementation of process_bytes and
|
||||
# inlining happening, it seems that one of the loops therein uses &rand-1 as
|
||||
# some boundary, compiling with -O0 makes that reloc come out as 'rand + 0' and
|
||||
# the link will succeed."
|
||||
# See: https://bugzilla.suse.com/show_bug.cgi?id=955832#c7
|
||||
ifeq ($(BR2_powerpc64le),y)
|
||||
DOMOTICZ_CXXFLAGS += -O0
|
||||
endif
|
||||
|
||||
# Due to the dependency on mosquitto, domoticz depends on
|
||||
# !BR2_STATIC_LIBS so set USE_STATIC_BOOST to OFF
|
||||
DOMOTICZ_CONF_OPTS += -DUSE_STATIC_BOOST=OFF
|
||||
# !BR2_STATIC_LIBS so set USE_STATIC_BOOST and USE_OPENSSL_STATIC to OFF
|
||||
DOMOTICZ_CONF_OPTS += \
|
||||
-DUSE_STATIC_BOOST=OFF \
|
||||
-DUSE_OPENSSL_STATIC=OFF
|
||||
|
||||
# Do not use any built-in libraries which are enabled by default for
|
||||
# lua, sqlite and mqtt
|
||||
DOMOTICZ_CONF_OPTS += \
|
||||
-DUSE_BUILTIN_LUA=OFF \
|
||||
-DUSE_BUILTIN_SQLITE=OFF \
|
||||
-DUSE_BUILTIN_MQTT=OFF \
|
||||
-DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) $(DOMOTICZ_CXXFLAGS)"
|
||||
-DUSE_BUILTIN_MQTT=OFF
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBUSB),y)
|
||||
DOMOTICZ_DEPENDENCIES += libusb
|
||||
|
||||
Reference in New Issue
Block a user