From 73c5dc6662f9729bd63b24c8854935aef35cb4e3 Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Wed, 23 Feb 2022 13:37:10 +0100 Subject: [PATCH] swupdate: add explicit libgcc runtime dependency In meta-openembedded commit 35d249bb9a575a5a48491052896e121266d515f0, libconfig, one of swupdate's dependencies, was split into two packages: one for the C library and another for the C++ one. swupdate depends only on the C library, but the C++ library was implicitly pulling in other dependencies, such as libgcc. After the commit mentioned above, libgcc stopped being pulled into our recovery image, causing the following error to appear when swupdate terminates: libgcc_s.so.1 must be installed for pthread_cancel to work Aborting Even if the action carried out by swupdate is successful, our recovery script detects this as an error and aborts the update operation. Avoid this by explicitly adding libgcc as a runtime dependency for swupdate. Signed-off-by: Gabriel Valcazar --- .../recipes-support/swupdate/swupdate_2021.11.bbappend | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta-digi-dey/recipes-support/swupdate/swupdate_2021.11.bbappend b/meta-digi-dey/recipes-support/swupdate/swupdate_2021.11.bbappend index 7fc819560..e4a87a9b1 100644 --- a/meta-digi-dey/recipes-support/swupdate/swupdate_2021.11.bbappend +++ b/meta-digi-dey/recipes-support/swupdate/swupdate_2021.11.bbappend @@ -1,7 +1,10 @@ -# Copyright (C) 2016-2021 Digi International Inc. +# Copyright (C) 2016-2022 Digi International Inc. FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +# Without libgcc, swupdate generates an error signal when terminating +RDEPENDS_${PN} += "libgcc" + do_configure_append() { # If Trustfence is enabled, enable the signing support in the # '.config' file.