Skip to content

Commit

Permalink
Bump rousette to latest GIT hash
Browse files Browse the repository at this point in the history
Since we are using an old GCC we need to add a new requirement for rousette 'date'
this is included in GCC 14+.
  • Loading branch information
mattiaswal committed Sep 9, 2024
1 parent 1b46444 commit 3cd5f41
Show file tree
Hide file tree
Showing 19 changed files with 605 additions and 791 deletions.
1 change: 1 addition & 0 deletions package/Config.in
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,5 @@ source "$BR2_EXTERNAL_INFIX_PATH/package/libyang-cpp/Config.in"
source "$BR2_EXTERNAL_INFIX_PATH/package/sysrepo-cpp/Config.in"
source "$BR2_EXTERNAL_INFIX_PATH/package/rousette/Config.in"
source "$BR2_EXTERNAL_INFIX_PATH/package/nghttp2-asio/Config.in"
source "$BR2_EXTERNAL_INFIX_PATH/package/date/Config.in
endmenu
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
From c8ec120afa3a66674ef30b10490eeeb36d806eed Mon Sep 17 00:00:00 2001
From: Tomas Pecka <peckato1@fit.cvut.cz>
Date: Fri, 17 Feb 2023 13:50:17 +0100
Subject: [PATCH] Fix getting current timezone on ARM-based devices
Our software using date on buildroot ARM-based device terminates with an
uncaught exception.
terminate called after throwing an instance of 'std::runtime_error'
what(): posix/Etc/UTC not found in timezone database
I have applied workaround from [1].
[1] https://github.com/HowardHinnant/date/issues/252
Bug: https://github.com/HowardHinnant/date/issues/252
---
src/tz.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/tz.cpp b/src/tz.cpp
index bd9fad4..eea48ce 100644
--- a/src/tz.cpp
+++ b/src/tz.cpp
@@ -3925,7 +3925,7 @@ sniff_realpath(const char* timezone)
if (realpath(timezone, rp) == nullptr)
throw system_error(errno, system_category(), "realpath() failed");
auto result = extract_tz_name(rp);
- return result != "posixrules";
+ return result.find("posix") == decltype(result)::npos;
}

const time_zone*
--
2.39.2
5 changes: 5 additions & 0 deletions package/date/Config.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
config BR2_PACKAGE_DATE
bool "date"
help
A date and time library based on the C++11/14/17 <chrono> header
https://github.com/HowardHinnant/date
3 changes: 3 additions & 0 deletions package/date/date.hash
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Locally calculated
sha256 c90f6c00fb961170560299cbda28ca2d45804913aa8b2a9f36dbb8e0028d6930 LICENSE.txt
sha256 7a390f200f0ccd207e8cff6757e04817c1a0aec3e327b006b7eb451c57ee3538 date-3.0.1.tar.gz
10 changes: 10 additions & 0 deletions package/date/date.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
DATE_VERSION = 3.0.1
DATE_SITE = $(call github,HowardHinnant,date,v$(DATE_VERSION))
DATE_INSTALL_STAGING = YES
DATE_LICENSE = MIT
DATE_LICENSE_FILES = LICENSE.txt
DATE_CONF_OPTS = \
-DBUILD_TZ_LIB=ON \
-DUSE_SYSTEM_TZ_DB:BOOL=ON \
-DENABLE_DATE_TESTING=OFF
$(eval $(cmake-package))
2 changes: 1 addition & 1 deletion package/libyang-cpp/libyang-cpp.hash
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Locally calculated
sha256 82e3758011ec44c78e98d0777799d6e12aec5b8a64b32ebb20d0fe50e32488bb LICENSE
sha256 fc5ae5218d441afef697d4fc7912ddbe322060103c053d50fc2db829bd359458 libyang-cpp-b852ea3b9a2729da364f2c4122db05d882df37f2-br1.tar.gz
sha256 b1ae9848c9810462fdca89b83297d5992e9c0c00399c21f65a0eef183d4789b4 libyang-cpp-38e3399c99a82d3c0f693fb19ab1e1b3cd72aed9-br1.tar.gz
2 changes: 1 addition & 1 deletion package/libyang-cpp/libyang-cpp.mk
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# CPP bindings for libyang
#
################################################################################
LIBYANG_CPP_VERSION = b852ea3b9a2729da364f2c4122db05d882df37f2
LIBYANG_CPP_VERSION = 38e3399c99a82d3c0f693fb19ab1e1b3cd72aed9
LIBYANG_CPP_SITE = https://github.com/kernelkit/libyang-cpp.git
LIBYANG_CPP_SITE_METHOD = git
LIBYANG_CPP_LICENSE = BSD-3-Clause
Expand Down
2 changes: 1 addition & 1 deletion package/rousette/Config.in
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ config BR2_PACKAGE_ROUSETTE
bool "rousette"
depends on BR2_USE_MMU
select BR2_PACKAGE_BOOST
select BR2_PACKAGE_BOOST_ATOMIC
select BR2_PACKAGE_BOOST_THREAD
select BR2_PACKAGE_BOOST_SYSTEM
select BR2_PACKAGE_DOCOPT_CPP
Expand All @@ -11,5 +10,6 @@ config BR2_PACKAGE_ROUSETTE
select BR2_PACKAGE_NGHTTP2_ASIO
select BR2_PACKAGE_SPDLOG
select BR2_PACKAGE_SYSREPO_CPP
select BR2_PACKAGE_DATE
help
RESTconf server
2 changes: 1 addition & 1 deletion package/rousette/rousette.hash
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Locally calculated
sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE
sha256 74b0d3115e73335399c5f8847fb7baa4d23497be75d12fccf56a754015af4c76 rousette-226a2410376e5befd0bf6dc180618a108b11b256-br1.tar.gz
sha256 3ba8a5dedff9a55af0b41ef07c8ffa2400f5a08bb70dfb18f850fa0416829f5e rousette-cf7a1d6eafc29ea708f18833ceb2f297dc2b7f74-br1.tar.gz
4 changes: 2 additions & 2 deletions package/rousette/rousette.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
#
################################################################################

ROUSETTE_VERSION = 226a2410376e5befd0bf6dc180618a108b11b256
ROUSETTE_VERSION = cf7a1d6eafc29ea708f18833ceb2f297dc2b7f74
ROUSETTE_SITE = https://github.com/kernelkit/rousette.git
ROUSETTE_SITE_METHOD = git
ROUSETTE_LICENSE = Apache-2.0
ROUSETTE_LICENSE_FILES = LICENSE
ROUSETTE_DEPENDENCIES = boost docopt-cpp nghttp2-asio spdlog sysrepo-cpp linux-pam
ROUSETTE_DEPENDENCIES = boost docopt-cpp nghttp2-asio spdlog sysrepo-cpp linux-pam date

ROUSETTE_CONF_OPTS = \
-DTESTAR=on \
Expand Down
2 changes: 1 addition & 1 deletion package/sysrepo-cpp/sysrepo-cpp.hash
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Locally calculated
sha256 82e3758011ec44c78e98d0777799d6e12aec5b8a64b32ebb20d0fe50e32488bb LICENSE
sha256 74d7d89307c9fc188c7f23ae5128fe320a569f455a325286122eaa927a0d95ed sysrepo-cpp-99747f74e57a09c664251ea1f4e059e3f4f8e66a-br1.tar.gz
sha256 f675acde97f95058252b2b9338e9d05e755dd4bf394ab8d68ea6edbb8cd9d75c sysrepo-cpp-e59193c772fa0e5963eff216b4fbb574383a64f2-br1.tar.gz
2 changes: 1 addition & 1 deletion package/sysrepo-cpp/sysrepo-cpp.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
################################################################################

SYSREPO_CPP_VERSION = 99747f74e57a09c664251ea1f4e059e3f4f8e66a
SYSREPO_CPP_VERSION = e59193c772fa0e5963eff216b4fbb574383a64f2
SYSREPO_CPP_SITE = https://github.com/kernelkit/sysrepo-cpp.git
SYSREPO_CPP_SITE_METHOD = git
SYSREPO_CPP_LICENSE = BSD-3-Clause
Expand Down
Loading

0 comments on commit 3cd5f41

Please sign in to comment.