diff --git a/32134.patch b/32134.patch deleted file mode 100644 index 690bd09..0000000 --- a/32134.patch +++ /dev/null @@ -1,31 +0,0 @@ -From d0515eec3c38c9b53a8e30397cf9b40cda5d6b94 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Sun, 7 Apr 2024 10:39:20 +0200 -Subject: [PATCH] meson: do not fail build with newer kernel headers -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -systemd-255 is failing a build with the latest kernel headers… Let's downgrade -this warning, because it's fine if there's a file system we don't know about -and it makes thing less brittle if we don't treat this as a hard error. - -(I initially conditionalized this on BUILD_MODE, but I don't think we need a -hard error there either. A warning will be noticed and fixed.) ---- - src/basic/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/basic/meson.build b/src/basic/meson.build -index 1516a9f7af3e4..386d9ab6c9c50 100644 ---- a/src/basic/meson.build -+++ b/src/basic/meson.build -@@ -240,7 +240,7 @@ filesystem_includes = ['linux/magic.h', - check_filesystems = find_program('check-filesystems.sh') - r = run_command([check_filesystems, cpp, files('filesystems-gperf.gperf')] + filesystem_includes, check: false) - if r.returncode() != 0 -- error('Unknown filesystems defined in kernel headers:\n\n' + r.stdout()) -+ warning('Unknown filesystems defined in kernel headers:\n\n' + r.stdout()) - endif - - filesystems_gperf_h = custom_target( diff --git a/sources b/sources index 3dc0d2e..498b802 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (systemd-255.4.tar.gz) = 8a2bde11a55f7f788ba7751789a5e9be6ce9634e88d54e49f6e832c4c49020c6cacaf2a610fe26f92998b0cbf43c6c2150a96b2c0953d23261009f57d71ea979 +SHA512 (systemd-255.5.tar.gz) = 9c0b39379e9ef2af983d885ec3cac0377c90435846341bb4e22abf33c00cc1c9f40abba1d6f598300ffac18e2b27bf917eea41885b1413f63cb9902d2efe9bcc diff --git a/systemd.spec b/systemd.spec index a4ded85..99a1ccf 100644 --- a/systemd.spec +++ b/systemd.spec @@ -36,7 +36,7 @@ Name: systemd Url: https://systemd.io # Allow users to specify the version and release when building the rpm by # setting the %%version_override and %%release_override macros. -Version: %{?version_override}%{!?version_override:255.4} +Version: %{?version_override}%{!?version_override:255.5} Release: %{?release_override:%{release_override}%{?dist}}%{!?release_override:%autorelease} %global stable %(c="%version"; [ "$c" = "${c#*.*}" ]; echo $?) @@ -104,8 +104,6 @@ GIT_DIR=../../src/systemd/.git git diffab -M v233..master@{2017-06-15} -- hwdb/[ # Drop when dracut-060 is available. Patch0001: https://github.com/systemd/systemd/pull/26494.patch -Patch0002: https://github.com/systemd/systemd/pull/32134.patch - # Those are downstream-only patches, but we don't want them in packit builds: # https://bugzilla.redhat.com/show_bug.cgi?id=1738828