commit ee3ee89dd8ee6336a070c57c015ac0eb79291e42 Author: Jakub Bogusz <qbo...@pld-linux.org> Date: Sat Feb 25 20:23:47 2023 +0100
- added glibc patch (workaround <sys/mount.h> vs <linux/mount.h> conflict) systemd-glibc.patch | 10 ++++++++++ systemd.spec | 2 ++ 2 files changed, 12 insertions(+) --- diff --git a/systemd.spec b/systemd.spec index f16a8f8..3ab9c2c 100644 --- 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 diff --git a/systemd-glibc.patch b/systemd-glibc.patch new file mode 100644 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" ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/systemd.git/commitdiff/ee3ee89dd8ee6336a070c57c015ac0eb79291e42 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit