Skip to content

Commit a197f44

Browse files
committed
systemd: build cryptsetup
1 parent 338bedf commit a197f44

File tree

3 files changed

+63
-5
lines changed

3 files changed

+63
-5
lines changed

Cargo.lock

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/systemd-257/Cargo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@ kmod = { path = "../kmod" }
2121
libacl = { path = "../libacl" }
2222
libattr = { path = "../libattr" }
2323
libcap = { path = "../libcap" }
24+
libcrypto = { path = "../libcrypto" }
25+
libcryptsetup = { path = "../libcryptsetup" }
2426
libseccomp = { path = "../libseccomp" }
2527
libselinux = { path = "../libselinux" }
28+
libtss2 = { path = "../libtss2" }
2629
libxcrypt = { path = "../libxcrypt" }
2730
util-linux = { path = "../util-linux" }

packages/systemd-257/systemd-257.spec

Lines changed: 57 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33

44
%global package_priority_epoch 0
55

6+
# Disable OpenSSL UI since aws-lc does not support it.
7+
%global _cross_cflags %{_cross_cflags} -DOPENSSL_NO_UI_CONSOLE=1
8+
69
Name: %{_cross_os}systemd-257
710
Version: 257.9
811
Release: 1%{?dist}
@@ -84,10 +87,13 @@ BuildRequires: %{_cross_os}libacl-devel
8487
BuildRequires: %{_cross_os}libattr-devel
8588
BuildRequires: %{_cross_os}libblkid-devel
8689
BuildRequires: %{_cross_os}libcap-devel
90+
BuildRequires: %{_cross_os}libcrypto-devel
91+
BuildRequires: %{_cross_os}libcryptsetup-devel
8792
BuildRequires: %{_cross_os}libfdisk-devel
8893
BuildRequires: %{_cross_os}libmount-devel
8994
BuildRequires: %{_cross_os}libseccomp-devel
9095
BuildRequires: %{_cross_os}libselinux-devel
96+
BuildRequires: %{_cross_os}libtss2-devel
9197
BuildRequires: %{_cross_os}libuuid-devel
9298
BuildRequires: %{_cross_os}libxcrypt-devel
9399

@@ -96,10 +102,13 @@ Requires: %{_cross_os}libacl
96102
Requires: %{_cross_os}libattr
97103
Requires: %{_cross_os}libblkid
98104
Requires: %{_cross_os}libcap
105+
Requires: %{_cross_os}libcrypto
106+
Requires: %{_cross_os}libcryptsetup
99107
Requires: %{_cross_os}libfdisk
100108
Requires: %{_cross_os}libmount
101109
Requires: %{_cross_os}libseccomp
102110
Requires: %{_cross_os}libselinux
111+
Requires: %{_cross_os}libtss2
103112
Requires: %{_cross_os}libuuid
104113
Requires: %{_cross_os}libxcrypt
105114

@@ -302,11 +311,12 @@ CONFIGURE_OPTS=(
302311
-Dstoragetm=false
303312
-Dukify=disabled
304313

305-
-Dlibcryptsetup=disabled
306-
-Dlibcryptsetup-plugins=disabled
307-
-Dopenssl=disabled
308-
-Dtpm2=disabled
309-
-Dtpm=false
314+
-Dlibcryptsetup=enabled
315+
-Dlibcryptsetup-plugins=enabled
316+
-Dopenssl=enabled
317+
-Dtpm2=enabled
318+
-Dtpm=true
319+
-Dsbsign=false
310320
)
311321

312322
%cross_meson "${CONFIGURE_OPTS[@]}"
@@ -803,3 +813,45 @@ install -p -m 0644 %{S:2} %{buildroot}%{_cross_bootconfigdir}/21-cgroup-enable-l
803813
%{_cross_datadir}/dbus-1/system.d/org.freedesktop.resolve1.conf
804814
%exclude %{_cross_bindir}/systemd-resolve
805815
%exclude %{_cross_sbindir}/resolvconf
816+
817+
%files cryptsetup
818+
%{_cross_bindir}/systemd-cryptenroll
819+
%{_cross_bindir}/systemd-cryptsetup
820+
%{_cross_libdir}/cryptsetup/libcryptsetup-token-systemd-tpm2.so
821+
%{_cross_libdir}/pcrlock.d/350-action-efi-application.pcrlock
822+
%{_cross_libdir}/pcrlock.d/400-secureboot-separator.pcrlock.d/300-0x00000000.pcrlock
823+
%{_cross_libdir}/pcrlock.d/400-secureboot-separator.pcrlock.d/600-0xffffffff.pcrlock
824+
%{_cross_libdir}/pcrlock.d/500-separator.pcrlock.d/300-0x00000000.pcrlock
825+
%{_cross_libdir}/pcrlock.d/500-separator.pcrlock.d/600-0xffffffff.pcrlock
826+
%{_cross_libdir}/pcrlock.d/700-action-efi-exit-boot-services.pcrlock.d/300-present.pcrlock
827+
%{_cross_libdir}/pcrlock.d/700-action-efi-exit-boot-services.pcrlock.d/600-absent.pcrlock
828+
%{_cross_libdir}/pcrlock.d/750-enter-initrd.pcrlock
829+
%{_cross_libdir}/pcrlock.d/800-leave-initrd.pcrlock
830+
%{_cross_libdir}/pcrlock.d/850-sysinit.pcrlock
831+
%{_cross_libdir}/pcrlock.d/900-ready.pcrlock
832+
%{_cross_libdir}/pcrlock.d/950-shutdown.pcrlock
833+
%{_cross_libdir}/pcrlock.d/990-final.pcrlock
834+
%{_cross_libdir}/systemd/system-generators/systemd-cryptsetup-generator
835+
%{_cross_libdir}/systemd/system-generators/systemd-integritysetup-generator
836+
%{_cross_libdir}/systemd/system-generators/systemd-veritysetup-generator
837+
%{_cross_libdir}/systemd/system/cryptsetup-pre.target
838+
%{_cross_libdir}/systemd/system/cryptsetup.target
839+
%{_cross_libdir}/systemd/system/initrd-root-device.target.wants/remote-cryptsetup.target
840+
%{_cross_libdir}/systemd/system/initrd-root-device.target.wants/remote-veritysetup.target
841+
%{_cross_libdir}/systemd/system/integritysetup-pre.target
842+
%{_cross_libdir}/systemd/system/integritysetup.target
843+
%{_cross_libdir}/systemd/system/remote-cryptsetup.target
844+
%{_cross_libdir}/systemd/system/remote-veritysetup.target
845+
%{_cross_libdir}/systemd/system/sysinit.target.wants/cryptsetup.target
846+
%{_cross_libdir}/systemd/system/sysinit.target.wants/integritysetup.target
847+
%{_cross_libdir}/systemd/system/sysinit.target.wants/veritysetup.target
848+
%{_cross_libdir}/systemd/system/system-systemd\x2dcryptsetup.slice
849+
%{_cross_libdir}/systemd/system/system-systemd\x2dveritysetup.slice
850+
%{_cross_libdir}/systemd/system/veritysetup-pre.target
851+
%{_cross_libdir}/systemd/system/veritysetup.target
852+
%{_cross_libdir}/systemd/systemd-cryptsetup
853+
%{_cross_libdir}/systemd/systemd-integritysetup
854+
%{_cross_libdir}/systemd/systemd-keyutil
855+
%{_cross_libdir}/systemd/systemd-measure
856+
%{_cross_libdir}/systemd/systemd-pcrlock
857+
%{_cross_libdir}/systemd/systemd-veritysetup

0 commit comments

Comments
 (0)