move the architecture patches after Patch9800 (excluding Patch9800)

This commit is contained in:
h30032433 2024-03-04 16:24:35 +08:00
parent 9e3840e74e
commit 0b901a7650

View File

@ -21,7 +21,7 @@
Name: systemd
Url: https://www.freedesktop.org/wiki/Software/systemd
Version: 249
Release: 72
Release: 73
License: MIT and LGPLv2+ and GPLv2+
Summary: System and Service Manager
@ -667,39 +667,40 @@ Patch9028: revert-rpm-restart-services-in-posttrans.patch
Patch9029: Don-t-set-AlternativeNamesPolicy-by-default.patch
Patch9030: change-NTP-server-to-x.pool.ntp.org.patch
Patch9031: keep-weight-consistent-with-the-set-value.patch
Patch9032: Systemd-Add-sw64-architecture.patch
Patch9033: 0029-Add-support-for-the-LoongArch-architecture.patch
Patch9034: 0030-Add-LoongArch-dmi-virt-detection-and-testcase.patch
Patch9035: add-loongarch-for-missing_syscall_def.patch
Patch9036: core-update-arg_default_rlimit-in-bump_rlimit.patch
Patch9037: set-forwardtowall-no-to-avoid-emerg-log-shown-on-she.patch
Patch9038: core-cgroup-support-cpuset.patch
Patch9039: core-cgroup-support-freezer.patch
Patch9040: core-cgroup-support-memorysw.patch
Patch9041: systemd-core-Add-new-rules-for-lower-priority-events.patch
Patch9042: bugfix-also-stop-machine-when-a-machine-un.patch
Patch9043: print-the-process-status-to-console-when-shutdown.patch
Patch9044: Retry-to-handle-the-uevent-when-worker-is-terminated.patch
Patch9045: treat-hyphen-as-valid-hostname-char.patch
Patch9046: process-util-log-more-information-when-runnin.patch
Patch9047: fuser-print-umount-message-to-reboot-umount-msg.patch
Patch9048: shutdown-reboot-when-recieve-crash-signal.patch
Patch9049: core-add-OptionalLog-to-allow-users-change-log-level.patch
Patch9050: core-cgroup-support-default-slice-for-all-uni.patch
Patch9051: core-add-invalidate-cgroup-config.patch
Patch9052: let-the-child-of-one-unit-don-t-affect-each-other.patch
Patch9053: support-disable-cgroup-controllers-we-don-t-want.patch
Patch9054: fix-mount-failed-while-daemon-reexec.patch
Patch9055: bugfix-for-cgroup-Swap-cgroup-v1-deletion-and-migration.patch
Patch9056: delete-journal-files-except-system.journal-when-jour.patch
Patch9057: set-the-cpuset.cpus-mems-of-machine.slice-to-all-by-.patch
Patch9058: add-a-new-switch-to-control-whether-udev-complies-wi.patch
Patch9059: embedded-sysuesrs_dir-sysctl_dir-binfmt_dir-modules_.patch
Patch9060: embedded-modify-dns-server-address-to-avoid-security.patch
Patch9061: add-support-to-relabel-systemd-process-for-embedded.patch
Patch9062: embedded-add-noexec-mount-option-to-strenthen-tmp-pa.patch
Patch9063: embedded-use-yocto-configs.patch
Patch9064: embedded-add-cpuset-cgv1-and-freezer-cgv1-option.patch
Patch9032: core-update-arg_default_rlimit-in-bump_rlimit.patch
Patch9033: set-forwardtowall-no-to-avoid-emerg-log-shown-on-she.patch
Patch9034: core-cgroup-support-cpuset.patch
Patch9035: core-cgroup-support-freezer.patch
Patch9036: core-cgroup-support-memorysw.patch
Patch9037: systemd-core-Add-new-rules-for-lower-priority-events.patch
Patch9038: bugfix-also-stop-machine-when-a-machine-un.patch
Patch9039: print-the-process-status-to-console-when-shutdown.patch
Patch9040: Retry-to-handle-the-uevent-when-worker-is-terminated.patch
Patch9041: treat-hyphen-as-valid-hostname-char.patch
Patch9042: process-util-log-more-information-when-runnin.patch
Patch9043: fuser-print-umount-message-to-reboot-umount-msg.patch
Patch9044: shutdown-reboot-when-recieve-crash-signal.patch
Patch9045: core-add-OptionalLog-to-allow-users-change-log-level.patch
Patch9046: core-cgroup-support-default-slice-for-all-uni.patch
Patch9047: core-add-invalidate-cgroup-config.patch
Patch9048: let-the-child-of-one-unit-don-t-affect-each-other.patch
Patch9049: support-disable-cgroup-controllers-we-don-t-want.patch
Patch9050: fix-mount-failed-while-daemon-reexec.patch
Patch9051: bugfix-for-cgroup-Swap-cgroup-v1-deletion-and-migration.patch
Patch9052: delete-journal-files-except-system.journal-when-jour.patch
Patch9053: set-the-cpuset.cpus-mems-of-machine.slice-to-all-by-.patch
Patch9054: add-a-new-switch-to-control-whether-udev-complies-wi.patch
Patch9055: embedded-sysuesrs_dir-sysctl_dir-binfmt_dir-modules_.patch
Patch9056: embedded-modify-dns-server-address-to-avoid-security.patch
Patch9057: add-support-to-relabel-systemd-process-for-embedded.patch
Patch9058: embedded-add-noexec-mount-option-to-strenthen-tmp-pa.patch
Patch9059: embedded-use-yocto-configs.patch
Patch9060: embedded-add-cpuset-cgv1-and-freezer-cgv1-option.patch
Patch9801: Systemd-Add-sw64-architecture.patch
Patch9802: 0029-Add-support-for-the-LoongArch-architecture.patch
Patch9803: 0030-Add-LoongArch-dmi-virt-detection-and-testcase.patch
Patch9804: add-loongarch-for-missing_syscall_def.patch
BuildRequires: gcc, gcc-c++
BuildRequires: libcap-devel, libmount-devel, pam-devel, libselinux-devel
@ -882,14 +883,18 @@ Systemd PAM module registers the session with systemd-logind.
%package_help
%prep
%autosetup -n %{name}-%{version} -p1 -Sgit
%ifnarch sw_64
%patch9032 -R -p1
%autosetup -n %{name}-%{version} -p1 -Sgit -N
# DO NOT USE "%patch -R" TO REVERT A PATCH. If your patch is only used in
# specific scenarios or architectures, please put it after Patch9800 and
# use "%ifarch" to patch it after applying all other patches.
%autopatch -M 9800
%ifarch sw_64
%autopatch 9801
%endif
%ifnarch loongarch64
%patch9033 -R -p1
%patch9034 -R -p1
%patch9035 -R -p1
%ifarch loongarch64
%autopatch 9802
%autopatch 9803
%autopatch 9804
%endif
%build
@ -1734,7 +1739,6 @@ grep -q -E '^KEYMAP="?fi-latin[19]"?' /etc/vconsole.conf 2>/dev/null &&
%{_unitdir}/sockets.target.wants/systemd-journald-dev-log.socket
%{_unitdir}/sockets.target.wants/systemd-journald.socket
%{_unitdir}/sockets.target.wants/systemd-initctl.socket
%{_unitdir}/sockets.target.wants/systemd-coredump.socket
%{_unitdir}/blockdev@.target
%{_unitdir}/sys-kernel-tracing.mount
%{_unitdir}/sysinit.target.wants/sys-kernel-tracing.mount
@ -2136,6 +2140,10 @@ grep -q -E '^KEYMAP="?fi-latin[19]"?' /etc/vconsole.conf 2>/dev/null &&
%{_libdir}/security/pam_systemd.so
%changelog
* Mon Mar 4 2024 huyubiao <huyubiao@huawei.com> - 249-73
- move the architecture patches after Patch9800 (excluding Patch9800)
delete the duplicate systemd-coredump.socket
* Fri Mar 1 2024 shixin <shixin21@huawei.com> - 249-72
- embedded: add cpuset-cgv1 and freezer-cgv1 option and disable by default