From 1e8e64a6db652413a42cf46688c15a7e2af6ee77 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Tue, 21 Sep 2021 12:09:50 +0200 Subject: [PATCH] sys-apps/keyutils: Apply Flatcar modifications --- .../coreos-overlay/sys-apps/keyutils/README.md | 3 +++ .../sys-apps/keyutils/files/tmpfiles.d/keyutils.conf | 3 +++ .../sys-apps/keyutils/keyutils-1.6.1.ebuild | 8 +++++++- 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/keyutils/README.md create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/keyutils/files/tmpfiles.d/keyutils.conf diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/keyutils/README.md b/sdk_container/src/third_party/coreos-overlay/sys-apps/keyutils/README.md new file mode 100644 index 0000000000..2aab30e620 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/keyutils/README.md @@ -0,0 +1,3 @@ +We keep this package in overlay, because we install the keyutils +config file in /usr instead of /etc, and then establish some symlinks +during installation and with systemd's tmpfiles.d utility. diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/keyutils/files/tmpfiles.d/keyutils.conf b/sdk_container/src/third_party/coreos-overlay/sys-apps/keyutils/files/tmpfiles.d/keyutils.conf new file mode 100644 index 0000000000..4e88f2670a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/keyutils/files/tmpfiles.d/keyutils.conf @@ -0,0 +1,3 @@ +L /etc/request-key.conf - - - - ../usr/share/keyutils/request-key.conf +d /etc/request-key.d - - - - - +d /etc/keyutils - - - - - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/keyutils/keyutils-1.6.1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/keyutils/keyutils-1.6.1.ebuild index 96aead1e27..219ba006a0 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/keyutils/keyutils-1.6.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/keyutils/keyutils-1.6.1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit toolchain-funcs linux-info multilib-minimal usr-ldscript +inherit toolchain-funcs linux-info multilib-minimal usr-ldscript systemd DESCRIPTION="Linux Key Management Utilities" HOMEPAGE="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git" @@ -26,6 +26,8 @@ PATCHES=( "${FILESDIR}"/${PN}-1.5.9-header-extern-c.patch ) +MAKEOPTS+=" ETCDIR=/usr/share/keyutils" + pkg_setup() { # To prevent a failure in test phase and false positive bug reports # we are enforcing the following options because testsuite expects @@ -110,11 +112,15 @@ multilib_src_test() { } multilib_src_install() { + systemd_dotmpfilesd "${FILESDIR}/tmpfiles.d/keyutils.conf" # Possibly undo the setting for USE=static (see src_compile). export NO_ARLIB=$(usex static-libs 0 1) default use static || gen_usr_ldscript -a keyutils + dosym ../usr/share/keyutils/request-key.conf /etc/request-key.conf + dodir /etc/request-key.d + dodir /etc/keyutils } multilib_src_install_all() {