diff options
| author |   Christopher Byrne <salah.coronya@gmail.com> | 2023-06-27 11:42:24 +0200 |
|---|---|---|
| committer |   David Seifert <soap@gentoo.org> | 2023-06-27 11:42:24 +0200 |
| commit | e4ede124b4acd0e235ea0ad0087456851a10d845 (patch) | |
| tree | b1cd0475e95e81d6e30c94a406b45f0827e48da9 /app-crypt | |
| parent | app-misc/jdupes: add 1.25.2 (diff) | |
| download | gentoo-e4ede124b4acd0e235ea0ad0087456851a10d845.tar.gz gentoo-e4ede124b4acd0e235ea0ad0087456851a10d845.tar.bz2 gentoo-e4ede124b4acd0e235ea0ad0087456851a10d845.zip | |
app-crypt/tpm2-tss: Fix leftover "imageno" directory
Closes: https://github.com/gentoo/gentoo/pull/31444
Signed-off-by: Christopher Byrne <salah.coronya@gmail.com>
Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'app-crypt')
| -rw-r--r-- | app-crypt/tpm2-tss/files/tpm2-tss-4.0.1-Make-sysusers-and-tmpfiles-optional.patch | 50 | ||||
| -rw-r--r-- | app-crypt/tpm2-tss/tpm2-tss-4.0.1.ebuild | 1 |
2 files changed, 51 insertions, 0 deletions
diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-4.0.1-Make-sysusers-and-tmpfiles-optional.patch b/app-crypt/tpm2-tss/files/tpm2-tss-4.0.1-Make-sysusers-and-tmpfiles-optional.patch new file mode 100644 index 000000000000..d93fcf9ef2d6 --- /dev/null +++ b/app-crypt/tpm2-tss/files/tpm2-tss-4.0.1-Make-sysusers-and-tmpfiles-optional.patch @@ -0,0 +1,50 @@ +From 75f53cf7eab591870ce735203995d01d2f577187 Mon Sep 17 00:00:00 2001 +From: Christopher Byrne <salah.coronya@gmail.com> +Date: Tue, 13 Jun 2023 21:40:56 -0500 +Subject: [PATCH] configure.ac: Make sysusers and tmpfiles optional + +Signed-off-by: Christopher Byrne <salah.coronya@gmail.com> +--- + Makefile.am | 6 +++++- + configure.ac | 4 ++-- + 2 files changed, 7 insertions(+), 3 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 2c81cfa9..98965fa7 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -563,10 +563,14 @@ fapi-config.json: dist/fapi-config.json.in + -e 's|[@]sysmeasurements@|$(sysmeasurements)|g' \ + < "$<" > "$@" + ++if SYSD_SYSUSERS + sysusers_DATA = dist/sysusers.d/tpm2-tss.conf +-tmpfiles_DATA = tpm2-tss-fapi.conf ++endif + ++if SYSD_TMPFILES ++tmpfiles_DATA = tpm2-tss-fapi.conf + CLEANFILES += tpm2-tss-fapi.conf ++endif + + # We have to do this ourselves, in order to get absolute paths + tpm2-tss-fapi.conf: dist/tmpfiles.d/tpm2-tss-fapi.conf.in +diff --git a/configure.ac b/configure.ac +index b6550278..2d478147 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -550,9 +550,9 @@ AS_IF([test "x$enable_integration" = "xyes" && test "x$enable_self_generated_cer + + # Check for systemd helper tools used by make install + AC_CHECK_PROG(systemd_sysusers, systemd-sysusers, yes) +-AM_CONDITIONAL(SYSD_SYSUSERS, test "x$systemd_sysusers" = "xyes") ++AM_CONDITIONAL([SYSD_SYSUSERS], [test "x$systemd_sysusers" = "xyes" && test "x$sysusersdir" != "xno"]) + AC_CHECK_PROG(systemd_tmpfiles, systemd-tmpfiles, yes) +-AM_CONDITIONAL(SYSD_TMPFILES, test "x$systemd_tmpfiles" = "xyes") ++AM_CONDITIONAL([SYSD_TMPFILES], [test "x$systemd_tmpfiles" = "xyes" && test "x$tmpfilesdir" != "xno"]) + + # Check all tools used by make install + AS_IF([test "$HOSTOS" = "Linux" && test "x$systemd_sysusers" != "xyes"], +-- +2.39.3 + diff --git a/app-crypt/tpm2-tss/tpm2-tss-4.0.1.ebuild b/app-crypt/tpm2-tss/tpm2-tss-4.0.1.ebuild index a9dd55409584..3e27adc524f7 100644 --- a/app-crypt/tpm2-tss/tpm2-tss-4.0.1.ebuild +++ b/app-crypt/tpm2-tss/tpm2-tss-4.0.1.ebuild @@ -39,6 +39,7 @@ BDEPEND="sys-apps/acl PATCHES=( "${FILESDIR}/${PN}-4.0.0-Dont-install-files-into-run.patch" + "${FILESDIR}/${PN}-4.0.1-Make-sysusers-and-tmpfiles-optional.patch" ) pkg_setup() { |