From b7896875070ad9f671951a454ce9af5c6c10a6cf Mon Sep 17 00:00:00 2001 From: hongjinghao Date: Fri, 22 Mar 2024 11:00:00 +0800 Subject: [PATCH] disable libcryptsetup --- systemd.spec | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/systemd.spec b/systemd.spec index 61c30ef5..5f93734d 100644 --- a/systemd.spec +++ b/systemd.spec @@ -21,7 +21,7 @@ Name: systemd Url: https://www.freedesktop.org/wiki/Software/systemd Version: 249 -Release: 71 +Release: 72 License: MIT and LGPLv2+ and GPLv2+ Summary: System and Service Manager @@ -703,7 +703,7 @@ Patch9804: add-loongarch-for-missing_syscall_def.patch BuildRequires: gcc, gcc-c++ BuildRequires: libcap-devel, libmount-devel, pam-devel, libselinux-devel -BuildRequires: audit-libs-devel, cryptsetup-devel, dbus-devel, libacl-devel +BuildRequires: audit-libs-devel, dbus-devel, libacl-devel BuildRequires: gobject-introspection-devel, libblkid-devel, xz-devel, xz BuildRequires: lz4-devel, lz4, bzip2-devel, libidn2-devel BuildRequires: kmod-devel, libgcrypt-devel, libgpg-error-devel @@ -920,7 +920,7 @@ CONFIGURE_OPTS=( -Dgcrypt=true -Daudit=true -Delfutils=false - -Dlibcryptsetup=true + -Dlibcryptsetup=false -Dqrencode=false -Dgnutls=true -Dmicrohttpd=false @@ -1558,7 +1558,6 @@ grep -q -E '^KEYMAP="?fi-latin[19]"?' /etc/vconsole.conf 2>/dev/null && %{_systemddir}/systemd %dir %{_systemddir}/user-preset %{_systemddir}/systemd-coredump -%{_systemddir}/systemd-veritysetup %{_systemddir}/systemd-network-generator %{_systemddir}/systemd-binfmt %{_systemddir}/user-preset/90-systemd.preset @@ -1741,7 +1740,6 @@ grep -q -E '^KEYMAP="?fi-latin[19]"?' /etc/vconsole.conf 2>/dev/null && %{_unitdir}/blockdev@.target %{_unitdir}/sys-kernel-tracing.mount %{_unitdir}/sysinit.target.wants/sys-kernel-tracing.mount -%{_unitdir}/system-systemd\x2dcryptsetup.slice %{_unitdir}/systemd-journald-varlink@.socket %{_unitdir}/systemd-journald@.service %{_unitdir}/systemd-journald@.socket @@ -1750,7 +1748,6 @@ grep -q -E '^KEYMAP="?fi-latin[19]"?' /etc/vconsole.conf 2>/dev/null && %{_systemddir}/system-generators/systemd-sysv-generator %{_systemddir}/system-generators/systemd-rc-local-generator %{_systemddir}/system-generators/systemd-debug-generator -%{_systemddir}/system-generators/systemd-veritysetup-generator %{_systemddir}/system-generators/systemd-run-generator %{_systemddir}/system-generators/systemd-system-update-generator %{_systemddir}/system-generators/systemd-getty-generator @@ -1835,16 +1832,9 @@ grep -q -E '^KEYMAP="?fi-latin[19]"?' /etc/vconsole.conf 2>/dev/null && %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf /usr/lib/rpm/macros.d/macros.systemd -/usr/bin/systemd-cryptenroll /usr/lib/modprobe.d/README /usr/lib/sysctl.d/README /usr/lib/systemd/system/first-boot-complete.target -/usr/lib/systemd/system/initrd-root-device.target.wants/remote-cryptsetup.target -/usr/lib/systemd/system/initrd-root-device.target.wants/remote-veritysetup.target -/usr/lib/systemd/system/remote-veritysetup.target -/usr/lib/systemd/system/sysinit.target.wants/veritysetup.target -/usr/lib/systemd/system/veritysetup-pre.target -/usr/lib/systemd/system/veritysetup.target /usr/lib/systemd/user/app.slice /usr/lib/systemd/user/background.slice /usr/lib/systemd/user/session.slice @@ -1918,7 +1908,6 @@ grep -q -E '^KEYMAP="?fi-latin[19]"?' /etc/vconsole.conf 2>/dev/null && %{_systemddir}/systemd-hibernate-resume %{_systemddir}/systemd-random-seed %{_systemddir}/systemd-sleep -%{_systemddir}/systemd-cryptsetup %{_systemddir}/systemd-udevd %{_systemddir}/systemd-vconsole-setup %{_unitdir}/systemd-udevd.service @@ -1937,7 +1926,6 @@ grep -q -E '^KEYMAP="?fi-latin[19]"?' /etc/vconsole.conf 2>/dev/null && %{_unitdir}/suspend.target %{_unitdir}/systemd-hybrid-sleep.service %{_unitdir}/systemd-suspend-then-hibernate.service -%{_unitdir}/cryptsetup-pre.target %{_unitdir}/hybrid-sleep.target %{_unitdir}/systemd-hwdb-update.service %{_unitdir}/systemd-hibernate-resume@.service @@ -1945,8 +1933,6 @@ grep -q -E '^KEYMAP="?fi-latin[19]"?' /etc/vconsole.conf 2>/dev/null && %{_unitdir}/sleep.target %{_unitdir}/kmod-static-nodes.service %{_unitdir}/systemd-udevd-kernel.socket -%{_unitdir}/remote-cryptsetup.target -%{_unitdir}/cryptsetup.target %{_unitdir}/systemd-udev-trigger.service %{_unitdir}/sysinit.target.wants/systemd-udevd.service %{_unitdir}/sysinit.target.wants/systemd-modules-load.service @@ -1954,12 +1940,10 @@ grep -q -E '^KEYMAP="?fi-latin[19]"?' /etc/vconsole.conf 2>/dev/null && %{_unitdir}/sysinit.target.wants/systemd-random-seed.service %{_unitdir}/sysinit.target.wants/systemd-hwdb-update.service %{_unitdir}/sysinit.target.wants/kmod-static-nodes.service -%{_unitdir}/sysinit.target.wants/cryptsetup.target %{_unitdir}/sysinit.target.wants/systemd-udev-trigger.service %{_unitdir}/systemd-udev-trigger.service.d/systemd-udev-trigger-no-reload.conf %{_unitdir}/sockets.target.wants/systemd-udevd-control.socket %{_unitdir}/sockets.target.wants/systemd-udevd-kernel.socket -%{_systemddir}/system-generators/systemd-cryptsetup-generator %{_systemddir}/system-generators/systemd-hibernate-resume-generator %{_systemddir}/system-generators/systemd-gpt-auto-generator %{_systemddir}/network/99-default.link @@ -2139,6 +2123,9 @@ grep -q -E '^KEYMAP="?fi-latin[19]"?' /etc/vconsole.conf 2>/dev/null && %{_libdir}/security/pam_systemd.so %changelog +* Fri Mar 22 2024 hongjinghao - 249-72 +- disable libcryptsetup + * Fri Mar 22 2024 hongjinghao - 249-71 - Revert backport-units-modprobe-.service-don-t-unescape-instance-name.patch -- Gitee