Merge branch 'master' into i486

1 files changed, 14 insertions, 0 deletions

diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD
index 02cee487..baf567fc 100644
--- a/core/systemd/PKGBUILD
+++ b/core/systemd/PKGBUILD
@@ -7,3 +7,17 @@ eval "$(
       /patch.*0001.*/a patch -Np1 -i ../meson-rename-Ddebug-to-Ddebug-extra.patch
     '
 )"
+
+# i486-specific
+if [ "${CARCH}" = "i486" ]; then
+  # temporary, as there is no systemd-journal user for some reason!?
+  eval "$(
+    declare -f package_systemd | \
+      sed '
+        /install.*systemd-journal/d
+      '
+  )"
+
+  # tempoary failure, known upstream, see FS#60239
+  unset check
+fi