commit: 698837bbaa56181021b9a82794b870304d9d02e4 Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> AuthorDate: Tue Jul 11 17:31:29 2023 +0000 Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> CommitDate: Thu Jul 20 11:32:15 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=698837bb
sys-apps/systemd: use secureboot.eclass to sign efi files Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org> sys-apps/systemd/systemd-253.5-r1.ebuild | 8 +++++--- sys-apps/systemd/systemd-253.6.ebuild | 8 +++++--- sys-apps/systemd/systemd-253.7.ebuild | 8 +++++--- sys-apps/systemd/systemd-254_rc2.ebuild | 7 ++++--- sys-apps/systemd/systemd-9999.ebuild | 7 ++++--- 5 files changed, 23 insertions(+), 15 deletions(-) diff --git a/sys-apps/systemd/systemd-253.5-r1.ebuild b/sys-apps/systemd/systemd-253.5-r1.ebuild index 302a40317155..684c214f6aaa 100644 --- a/sys-apps/systemd/systemd-253.5-r1.ebuild +++ b/sys-apps/systemd/systemd-253.5-r1.ebuild @@ -26,8 +26,8 @@ else KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi -inherit bash-completion-r1 linux-info meson-multilib pam -inherit python-any-r1 systemd toolchain-funcs udev usr-ldscript +inherit bash-completion-r1 linux-info meson-multilib pam python-any-r1 +inherit secureboot systemd toolchain-funcs udev usr-ldscript DESCRIPTION="System and service manager for Linux" HOMEPAGE="http://systemd.io/" @@ -222,7 +222,7 @@ pkg_pretend() { } pkg_setup() { - : + use gnuefi && secureboot_pkg_setup } src_unpack() { @@ -409,6 +409,8 @@ multilib_src_install_all() { fi gen_usr_ldscript -a systemd udev + + use gnuefi && secureboot_auto_sign } migrate_locale() { diff --git a/sys-apps/systemd/systemd-253.6.ebuild b/sys-apps/systemd/systemd-253.6.ebuild index 9196c2effc6c..448f69d1f790 100644 --- a/sys-apps/systemd/systemd-253.6.ebuild +++ b/sys-apps/systemd/systemd-253.6.ebuild @@ -26,8 +26,8 @@ else KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86" fi -inherit bash-completion-r1 linux-info meson-multilib pam -inherit python-any-r1 systemd toolchain-funcs udev usr-ldscript +inherit bash-completion-r1 linux-info meson-multilib pam python-any-r1 +inherit secureboot systemd toolchain-funcs udev usr-ldscript DESCRIPTION="System and service manager for Linux" HOMEPAGE="http://systemd.io/" @@ -222,7 +222,7 @@ pkg_pretend() { } pkg_setup() { - : + use gnuefi && secureboot_pkg_setup } src_unpack() { @@ -408,6 +408,8 @@ multilib_src_install_all() { fi gen_usr_ldscript -a systemd udev + + use gnuefi && secureboot_auto_sign } migrate_locale() { diff --git a/sys-apps/systemd/systemd-253.7.ebuild b/sys-apps/systemd/systemd-253.7.ebuild index 72824b08e850..cf50cf37cc92 100644 --- a/sys-apps/systemd/systemd-253.7.ebuild +++ b/sys-apps/systemd/systemd-253.7.ebuild @@ -26,8 +26,8 @@ else KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi -inherit bash-completion-r1 linux-info meson-multilib pam -inherit python-any-r1 systemd toolchain-funcs udev usr-ldscript +inherit bash-completion-r1 linux-info meson-multilib pam python-any-r1 +inherit secureboot systemd toolchain-funcs udev usr-ldscript DESCRIPTION="System and service manager for Linux" HOMEPAGE="http://systemd.io/" @@ -222,7 +222,7 @@ pkg_pretend() { } pkg_setup() { - : + use gnuefi && secureboot_pkg_setup } src_unpack() { @@ -408,6 +408,8 @@ multilib_src_install_all() { fi gen_usr_ldscript -a systemd udev + + use gnuefi && secureboot_auto_sign } migrate_locale() { diff --git a/sys-apps/systemd/systemd-254_rc2.ebuild b/sys-apps/systemd/systemd-254_rc2.ebuild index 934ffc6b8a6b..79a152ddc472 100644 --- a/sys-apps/systemd/systemd-254_rc2.ebuild +++ b/sys-apps/systemd/systemd-254_rc2.ebuild @@ -26,8 +26,8 @@ else #KEYWORDS="~amd64 ~arm ~arm64 ~x86" fi -inherit bash-completion-r1 linux-info meson-multilib pam -inherit python-single-r1 systemd toolchain-funcs udev usr-ldscript +inherit bash-completion-r1 linux-info meson-multilib pam python-single-r1 +inherit secureboot systemd toolchain-funcs udev usr-ldscript DESCRIPTION="System and service manager for Linux" HOMEPAGE="http://systemd.io/" @@ -230,7 +230,7 @@ pkg_pretend() { } pkg_setup() { - : + use boot && secureboot_pkg_setup } src_unpack() { @@ -416,6 +416,7 @@ multilib_src_install_all() { if use boot; then python_fix_shebang "${ED}" + secureboot_auto_sign fi } diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index 683026ece4c8..1b78026dc881 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -26,8 +26,8 @@ else KEYWORDS="~amd64 ~arm ~arm64 ~x86" fi -inherit bash-completion-r1 linux-info meson-multilib pam -inherit python-single-r1 systemd toolchain-funcs udev usr-ldscript +inherit bash-completion-r1 linux-info meson-multilib pam python-single-r1 +inherit secureboot systemd toolchain-funcs udev usr-ldscript DESCRIPTION="System and service manager for Linux" HOMEPAGE="http://systemd.io/" @@ -230,7 +230,7 @@ pkg_pretend() { } pkg_setup() { - : + use boot && secureboot_pkg_setup } src_unpack() { @@ -416,6 +416,7 @@ multilib_src_install_all() { if use boot; then python_fix_shebang "${ED}" + secureboot_auto_sign fi }