Submitted By: Xi Ruoyao Date: 2021-04-28 Initial Package Version: 248 Origin: Upstream Upstream Status: Applied Description: Fixes two issues causing FTBFS, one triggered by linux-5.11.14 API header changes, another triggered by meson-0.57.2 changes. From 7c5fd25119a495009ea62f79e5daec34cc464628 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 12 Apr 2021 14:03:32 +0200 Subject: [PATCH] meson: do not fail if rsync is not installed with meson 0.57.2 https://github.com/mesonbuild/meson/issues/8641 Our CI started to fail. Even if the change is reverted in meson, we need a quick workaround here. --- man/meson.build | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/man/meson.build b/man/meson.build index 3cae8446cda..f9c4b83dc81 100644 --- a/man/meson.build +++ b/man/meson.build @@ -184,17 +184,20 @@ html = custom_target( depends : html_pages, command : ['echo']) -run_target( - 'doc-sync', - depends : man_pages + html_pages, - command : ['rsync', '-rlv', - '--delete-excluded', - '--include=man', - '--include=*.html', - '--exclude=*', - '--omit-dir-times', - meson.current_build_dir(), - get_option('www-target')]) +rsync = find_program('rsync', required : false) +if rsync.found() + run_target( + 'doc-sync', + depends : man_pages + html_pages, + command : [rsync, '-rlv', + '--delete-excluded', + '--include=man', + '--include=*.html', + '--exclude=*', + '--omit-dir-times', + meson.current_build_dir(), + get_option('www-target')]) +endif ############################################################ From ab1aa6368a883bce88e3162fee2bea14aacedf23 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Tue, 13 Apr 2021 13:17:53 +0100 Subject: [PATCH] rfkill: add some casts to silence -Werror=sign-compare --- src/rfkill/rfkill.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/rfkill/rfkill.c b/src/rfkill/rfkill.c index e2d1a1be5fa..bff1a2886be 100644 --- a/src/rfkill/rfkill.c +++ b/src/rfkill/rfkill.c @@ -177,7 +177,7 @@ static int load_state(Context *c, const struct rfkill_event *event) { ssize_t l = write(c->rfkill_fd, &we, sizeof we); if (l < 0) return log_error_errno(errno, "Failed to restore rfkill state for %i: %m", event->idx); - if (l < RFKILL_EVENT_SIZE_V1) + if ((size_t)l < RFKILL_EVENT_SIZE_V1) /* l cannot be < 0 here. Cast to fix -Werror=sign-compare */ return log_error_errno(SYNTHETIC_ERRNO(EIO), "Couldn't write rfkill event structure, too short (wrote %zd of %zu bytes).", l, sizeof we); @@ -335,9 +335,9 @@ static int run(int argc, char *argv[]) { break; } - if (l < RFKILL_EVENT_SIZE_V1) - return log_error_errno(SYNTHETIC_ERRNO(EIO), "Short read of struct rfkill_event: (%zd < %d)", - l, RFKILL_EVENT_SIZE_V1); + if ((size_t)l < RFKILL_EVENT_SIZE_V1) /* l cannot be < 0 here. Cast to fix -Werror=sign-compare */ + return log_error_errno(SYNTHETIC_ERRNO(EIO), "Short read of struct rfkill_event: (%zd < %zu)", + l, (size_t) RFKILL_EVENT_SIZE_V1); /* Casting necessary to make compiling with different kernel versions happy */ log_debug("Reading struct rfkill_event: got %zd bytes.", l); /* The event structure has more fields. We only care about the first few, so it's OK if we