From 42db547558e7c4117a91e85d2a9bb2a0b86604e9 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 4 Jun 2024 19:59:51 +0200 Subject: Merging debian version 2.9.5-2. Signed-off-by: Daniel Baumann --- debian/changelog | 6 ++++++ debian/rules | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/debian/changelog b/debian/changelog index cc20fbb..e8a1832 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +sssd (2.9.5-2) unstable; urgency=medium + + * rules: Don't fail tests on armel, armhf for now. + + -- Timo Aaltonen Tue, 04 Jun 2024 15:00:53 +0300 + sssd (2.9.5-1~progress7.99u1) graograman-backports; urgency=medium * Uploading to graograman-backports, remaining changes: diff --git a/debian/rules b/debian/rules index cff6d75..7da1f9f 100755 --- a/debian/rules +++ b/debian/rules @@ -54,7 +54,11 @@ override_dh_auto_configure: override_dh_auto_test: ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),) export CK_TIMEOUT_MULTIPLIER=10 + ifneq (,$(filter $(DEB_HOST_ARCH), armel armhf)) dh_auto_test -- VERBOSE=yes + else + dh_auto_test -- VERBOSE=yes || true + endif unset CK_TIMEOUT_MULTIPLIER endif -- cgit v1.2.3