From 827bd376e34aa76ff04dfdff2ae3d7d1b841452a Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 9 Nov 2021 08:10:01 +0100 Subject: [PATCH] package/tpm2-tss: override auto-detection of groupadd and systemd tpm2-tss is looking for systemd_sysusers and systemd_tmpfiles, but those two are not mandatory. However, it might find those from the host. But that is not an issue in the end, because they are only used to instanciate the users and create the tmpfiles. At build time on the host, we do not need them, and on the target, if systemd is being used, then they will be instanciated/created at boot. If they are not found, then the fallback paths are taken, and those fallback paths are those using the setfacl and groupadd and useradd tools, which we already know are going to fail but that we do not care. So, we can safely force those two to =no to avoid the install trying to use the system-wide tools, or even the ones we build as part of host-systemd ourselves. Eventually, when systemd-tmpfiles of systemd-sysusers are missing, the fallback paths use useradd, and configure unconditionally checks for it, so as for groupadd and setfacl in commits d9123dd79956 (package/tpm2-tss: fix build on host without setfacl) and c8f847c4f4dd (package/tpm2-tss: fix build on host without groupadd), we just fake the detection of groupadd. Fixes: - http://autobuild.buildroot.org/results//97bfa8f7dcb12e36bd63c9d06fb39418070d840b Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/tpm2-tss/tpm2-tss.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/tpm2-tss/tpm2-tss.mk b/package/tpm2-tss/tpm2-tss.mk index 88ec892f20..71aa3feb96 100644 --- a/package/tpm2-tss/tpm2-tss.mk +++ b/package/tpm2-tss/tpm2-tss.mk @@ -16,9 +16,17 @@ TPM2_TSS_DEPENDENCIES = liburiparser openssl host-pkgconf # 0001-configure-Only-use-CXX-when-fuzzing.patch TPM2_TSS_AUTORECONF = YES +# systemd-sysusers and systemd-tmpfiles are only used at install time +# to trigger the creation of users adn tmpfiles, which we do not care +# about at build time. groupadd, useradd, and setfacl are used in the +# fallback path when systemd-sysusers or systemd-tmpfiles are missing +# and their failure is ignored anyway. TPM2_TSS_CONF_OPTS = \ ac_cv_prog_result_groupadd=yes \ ac_cv_prog_result_setfacl=yes \ + ac_cv_prog_systemd_sysusers=no \ + ac_cv_prog_systemd_tmpfiles=no \ + ac_cv_prog_result_useradd=yes \ --with-crypto=ossl \ --disable-doxygen-doc \ --disable-defaultflags