diff --git a/extend_timeout_for_riscv.patch b/extend_timeout_for_riscv.patch new file mode 100644 index 0000000000000000000000000000000000000000..a57ce9ae9947b98fda41fb41dc9f1fdd0bd4db8b --- /dev/null +++ b/extend_timeout_for_riscv.patch @@ -0,0 +1,28 @@ +diff -up a/meson.build b/meson.build +--- a/meson.build 2021-03-31 04:59:02.000000000 +0800 ++++ b/meson.build 2021-12-10 10:59:07.586868800 +0800 +@@ -3076,6 +3076,7 @@ + if want_tests != 'false' + test('test-sysusers', + test_sysusers_sh, ++ timeout : 180, + # https://github.com/mesonbuild/meson/issues/2681 + args : exe.full_path()) + endif +@@ -3118,6 +3118,7 @@ + if want_tests != 'false' + test('test-systemd-tmpfiles', + test_systemd_tmpfiles_py, ++ timeout : 60, + # https://github.com/mesonbuild/meson/issues/2681 + args : exe.full_path()) + endif +@@ -3322,7 +3323,7 @@ + type = tuple.length() > 5 ? tuple[5] : '' + defs = tuple.length() > 6 ? tuple[6] : [] + parallel = tuple.length() > 7 ? tuple[7] : true +- timeout = 30 ++ timeout = 180 + + name = sources[0].split('/')[-1].split('.')[0] + if type.startswith('timeout=') diff --git a/systemd.spec b/systemd.spec index d2975f463ad9a7c1c2ba6ebfcc46310c730b228c..57f0aaed666258319b2a06068472ef76a7fb9217 100644 --- a/systemd.spec +++ b/systemd.spec @@ -20,7 +20,7 @@ Name: systemd Url: https://www.freedesktop.org/wiki/Software/systemd Version: 248 -Release: 15 +Release: 16 License: MIT and LGPLv2+ and GPLv2+ Summary: System and Service Manager @@ -71,6 +71,10 @@ Patch0021: backport-core-fix-free-undefined-pointer-when-strdup-failed-i.pa #openEuler Patch9000: disable-systemd-timesyncd-networkd-resolved-homed-us.patch +%ifarch riscv64 +Patch9001: extend_timeout_for_riscv.patch +%endif + BuildRequires: gcc, gcc-c++, rsync BuildRequires: libcap-devel, libmount-devel, pam-devel, libselinux-devel BuildRequires: audit-libs-devel, cryptsetup-devel, dbus-devel, libacl-devel @@ -1262,11 +1266,15 @@ fi /usr/lib/systemd/user/session.slice /usr/lib/sysusers.d/README /usr/lib/tmpfiles.d/README +%ifnarch riscv64 /usr/lib/udev/dmi_memory_id +%endif /usr/lib/udev/hwdb.d/20-dmi-id.hwdb /usr/lib/udev/hwdb.d/60-autosuspend-fingerprint-reader.hwdb /usr/lib/udev/hwdb.d/README +%ifnarch riscv64 /usr/lib/udev/rules.d/70-memory.rules +%endif /usr/lib/udev/rules.d/README /usr/share/bash-completion/completions/systemd-id128 /usr/share/zsh/site-functions/_systemd-path @@ -1554,6 +1562,9 @@ fi %exclude /usr/share/man/man3/* %changelog +* Fri Jan 14 2022 lvxiaoqian - 248-16 +- update for riscv + * Tue Dec 28 2021 licunlong - 248-15 - fix typo: disable not denable.