- added glibc patch (workaround <sys/mount.h> vs <linux/mount.h> conflict)

diff --git a/systemd-glibc.patch b/systemd-glibc.patch
new file mode 100644 (file)
index 0000000..1398e78
--- /dev/null
+++ b/systemd-glibc.patch
@@ -0,0 +1,10 @@
+--- systemd-stable-252.5/src/partition/growfs.c.orig   2023-01-26 09:12:21.000000000 +0100
++++ systemd-stable-252.5/src/partition/growfs.c        2023-02-25 20:05:31.824939843 +0100
+@@ -13,6 +13,7 @@
+  * See: https://github.com/systemd/systemd/issues/8507
+  * [0] https://github.com/torvalds/linux/commit/a28135303a669917002f569aecebd5758263e4aa
+  */
++#define _LINUX_MOUNT_H
+ #include <linux/btrfs.h>
+ 
+ #include "sd-device.h"

diff --git a/systemd.spec b/systemd.spec
index f16a8f87c9cf00a6f9b41f44e9cf792033e3fb6e..3ab9c2cbdc1e7e9e2c7196329fc4611431e78465 100644 (file)
--- a/systemd.spec
+++ b/systemd.spec
@@ -80,6 +80,7 @@ Patch13:      sysctl.patch
 Patch14:       pld-pam-%{name}-user.patch
 Patch15:       %{name}-x32.patch
 Patch16:       rpm-macros.patch
+Patch17:       %{name}-glibc.patch
 URL:           https://www.freedesktop.org/wiki/Software/systemd/
 BuildRequires: acl-devel
 %{?with_audit:BuildRequires:   audit-libs-devel}
@@ -806,6 +807,7 @@ Makra RPM-a definiujące ścieżki i skryptlety związane z systemd.
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
+%patch17 -p1
 
 cp -p %{SOURCE2} src/systemd_booted.c