From 2631570f74b07fe78d107de49bcd673b9e00bf65 Mon Sep 17 00:00:00 2001 From: Patrick Vacek Date: Wed, 4 Mar 2020 13:45:07 +0100 Subject: boost: add patch to fix ptest errors from a missing typedef. Suggested-by: Kostiantyn Bushko Signed-off-by: Patrick Vacek --- recipes-support/boost/boost_1.72.0.bbappend | 4 ++ .../files/0001-add-typedef-executor_type.patch | 56 ++++++++++++++++++++++ 2 files changed, 60 insertions(+) create mode 100644 recipes-support/boost/boost_1.72.0.bbappend create mode 100644 recipes-support/boost/files/0001-add-typedef-executor_type.patch diff --git a/recipes-support/boost/boost_1.72.0.bbappend b/recipes-support/boost/boost_1.72.0.bbappend new file mode 100644 index 0000000..73ee73d --- /dev/null +++ b/recipes-support/boost/boost_1.72.0.bbappend @@ -0,0 +1,4 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/files:" + +SRC_URI += "file://0001-add-typedef-executor_type.patch \ + " diff --git a/recipes-support/boost/files/0001-add-typedef-executor_type.patch b/recipes-support/boost/files/0001-add-typedef-executor_type.patch new file mode 100644 index 0000000..1b326a4 --- /dev/null +++ b/recipes-support/boost/files/0001-add-typedef-executor_type.patch @@ -0,0 +1,56 @@ +From 99ad3ebac0b7466d57c98fb9583fbe8789729691 Mon Sep 17 00:00:00 2001 +From: Patrick Vacek +Date: Wed, 4 Mar 2020 12:41:02 +0000 +Subject: [PATCH] add typedef executor_type + +Backported from here: +https://github.com/boostorg/process/commit/6a4d2ff72114ef47c7afaf92e1042aca3dfa41b0 + +Suggested-by: Kostiantyn Bushko +Signed-off-by: Patrick Vacek +--- + boost/process/async_pipe.hpp | 2 ++ + boost/process/detail/posix/async_pipe.hpp | 1 + + boost/process/detail/windows/async_pipe.hpp | 1 + + 3 files changed, 4 insertions(+) + +diff --git a/boost/process/async_pipe.hpp b/boost/process/async_pipe.hpp +index 101fe1d..a562432 100644 +--- a/boost/process/async_pipe.hpp ++++ b/boost/process/async_pipe.hpp +@@ -47,6 +47,8 @@ public: + */ + typedef platform_specific handle_type; + ++ typedef typename handle_type::executor_type executor_type; ++ + /** Construct a new async_pipe, does automatically open the pipe. + * Initializes source and sink with the same io_context. + * @note Windows creates a named pipe here, where the name is automatically generated. +diff --git a/boost/process/detail/posix/async_pipe.hpp b/boost/process/detail/posix/async_pipe.hpp +index 725a078..a82c057 100644 +--- a/boost/process/detail/posix/async_pipe.hpp ++++ b/boost/process/detail/posix/async_pipe.hpp +@@ -23,6 +23,7 @@ class async_pipe + public: + typedef int native_handle_type; + typedef ::boost::asio::posix::stream_descriptor handle_type; ++ typedef typename handle_type::executor_type executor_type; + + inline async_pipe(boost::asio::io_context & ios) : async_pipe(ios, ios) {} + +diff --git a/boost/process/detail/windows/async_pipe.hpp b/boost/process/detail/windows/async_pipe.hpp +index 06d5f2d..0b447f9 100644 +--- a/boost/process/detail/windows/async_pipe.hpp ++++ b/boost/process/detail/windows/async_pipe.hpp +@@ -48,6 +48,7 @@ class async_pipe + public: + typedef ::boost::winapi::HANDLE_ native_handle_type; + typedef ::boost::asio::windows::stream_handle handle_type; ++ typedef typename handle_type::executor_type executor_type; + + async_pipe(boost::asio::io_context & ios) : async_pipe(ios, ios, make_pipe_name(), true) {} + async_pipe(boost::asio::io_context & ios_source, boost::asio::io_context & ios_sink) +-- +2.11.0 + -- cgit v1.2.3-54-g00ecf From 10cee8a491f5fa426c10a8b3d39f0100f0615059 Mon Sep 17 00:00:00 2001 From: Patrick Vacek Date: Wed, 4 Mar 2020 15:10:44 +0100 Subject: aktualizr: remove unnecessary rm. libuptiny (the "partial" subdirectory) and its dependencies were removed from the aktualizr repo a while ago. Signed-off-by: Patrick Vacek --- recipes-sota/aktualizr/aktualizr_git.bb | 3 --- 1 file changed, 3 deletions(-) diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb index 804f2c2..24aec3e 100644 --- a/recipes-sota/aktualizr/aktualizr_git.bb +++ b/recipes-sota/aktualizr/aktualizr_git.bb @@ -86,9 +86,6 @@ do_install_ptest() { cp -r ${B}/ ${D}/${PTEST_PATH}/build cp -r ${S}/ ${D}/${PTEST_PATH}/src - # remove huge external unused repository - rm -rf ${D}/${PTEST_PATH}/src/partial/extern/RIOT - # remove huge build artifacts find ${D}/${PTEST_PATH}/build/src -name "*.a" -delete -- cgit v1.2.3-54-g00ecf From d1b5cd871e94b746970bed7e9c77573671c02a17 Mon Sep 17 00:00:00 2001 From: Laurent Bonnans Date: Thu, 5 Mar 2020 14:24:37 +0100 Subject: Fix aktualizr-ptest shlib yocto errors Signed-off-by: Laurent Bonnans --- recipes-sota/aktualizr/aktualizr_git.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb index 24aec3e..30256b1 100644 --- a/recipes-sota/aktualizr/aktualizr_git.bb +++ b/recipes-sota/aktualizr/aktualizr_git.bb @@ -12,6 +12,8 @@ RDEPENDS_${PN}-host-tools = "aktualizr aktualizr-cert-provider ${@bb.utils.conta RDEPENDS_${PN}-ptest += "bash cmake curl net-tools python3-core python3-misc python3-modules openssl-bin sqlite3 valgrind" +PRIVATE_LIBS_${PN}-ptest = "libaktualizr.so libaktualizr_secondary.so" + PV = "1.0+git${SRCPV}" PR = "7" -- cgit v1.2.3-54-g00ecf