ryantimwilson / rpms / systemd

Forked from rpms/systemd a month ago
Clone
Zbigniew Jędrzejewski-Szmek 5a7cc0
From d0515eec3c38c9b53a8e30397cf9b40cda5d6b94 Mon Sep 17 00:00:00 2001
Zbigniew Jędrzejewski-Szmek 5a7cc0
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Zbigniew Jędrzejewski-Szmek 5a7cc0
Date: Sun, 7 Apr 2024 10:39:20 +0200
Zbigniew Jędrzejewski-Szmek 5a7cc0
Subject: [PATCH] meson: do not fail build with newer kernel headers
Zbigniew Jędrzejewski-Szmek 5a7cc0
MIME-Version: 1.0
Zbigniew Jędrzejewski-Szmek 5a7cc0
Content-Type: text/plain; charset=UTF-8
Zbigniew Jędrzejewski-Szmek 5a7cc0
Content-Transfer-Encoding: 8bit
Zbigniew Jędrzejewski-Szmek 5a7cc0
Zbigniew Jędrzejewski-Szmek 5a7cc0
systemd-255 is failing a build with the latest kernel headers… Let's downgrade
Zbigniew Jędrzejewski-Szmek 5a7cc0
this warning, because it's fine if there's a file system we don't know about
Zbigniew Jędrzejewski-Szmek 5a7cc0
and it makes thing less brittle if we don't treat this as a hard error.
Zbigniew Jędrzejewski-Szmek 5a7cc0
Zbigniew Jędrzejewski-Szmek 5a7cc0
(I initially conditionalized this on BUILD_MODE, but I don't think we need a
Zbigniew Jędrzejewski-Szmek 5a7cc0
hard error there either. A warning will be noticed and fixed.)
Zbigniew Jędrzejewski-Szmek 5a7cc0
---
Zbigniew Jędrzejewski-Szmek 5a7cc0
 src/basic/meson.build | 2 +-
Zbigniew Jędrzejewski-Szmek 5a7cc0
 1 file changed, 1 insertion(+), 1 deletion(-)
Zbigniew Jędrzejewski-Szmek 5a7cc0
Zbigniew Jędrzejewski-Szmek 5a7cc0
diff --git a/src/basic/meson.build b/src/basic/meson.build
Zbigniew Jędrzejewski-Szmek 5a7cc0
index 1516a9f7af3e4..386d9ab6c9c50 100644
Zbigniew Jędrzejewski-Szmek 5a7cc0
--- a/src/basic/meson.build
Zbigniew Jędrzejewski-Szmek 5a7cc0
+++ b/src/basic/meson.build
Zbigniew Jędrzejewski-Szmek 5a7cc0
@@ -240,7 +240,7 @@ filesystem_includes = ['linux/magic.h',
Zbigniew Jędrzejewski-Szmek 5a7cc0
 check_filesystems = find_program('check-filesystems.sh')
Zbigniew Jędrzejewski-Szmek 5a7cc0
 r = run_command([check_filesystems, cpp, files('filesystems-gperf.gperf')] + filesystem_includes, check: false)
Zbigniew Jędrzejewski-Szmek 5a7cc0
 if r.returncode() != 0
Zbigniew Jędrzejewski-Szmek 5a7cc0
-        error('Unknown filesystems defined in kernel headers:\n\n' + r.stdout())
Zbigniew Jędrzejewski-Szmek 5a7cc0
+        warning('Unknown filesystems defined in kernel headers:\n\n' + r.stdout())
Zbigniew Jędrzejewski-Szmek 5a7cc0
 endif
Zbigniew Jędrzejewski-Szmek 5a7cc0
 
Zbigniew Jędrzejewski-Szmek 5a7cc0
 filesystems_gperf_h = custom_target(