[gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/

[Mike Gilbert]

commit:     4eb56bda286f2d845477a287d1c69ef1c339b7dd
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 23 19:37:55 2024 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Mar 23 19:57:44 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4eb56bda

sys-apps/systemd-utils: fix kernel-install logic

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 sys-apps/systemd-utils/systemd-utils-254.10.ebuild | 8 ++++----
 sys-apps/systemd-utils/systemd-utils-254.8.ebuild  | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sys-apps/systemd-utils/systemd-utils-254.10.ebuild 
b/sys-apps/systemd-utils/systemd-utils-254.10.ebuild
index e0ac974de10f..93436b880f05 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.10.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.10.ebuild
@@ -446,8 +446,6 @@ multilib_src_install() {
                if use kernel-install; then
                        dobin kernel-install
                        doman man/kernel-install.8
-                       # copy the default set of plugins
-                       cp "${S}/src/kernel-install/"*.install 
src/kernel-install || die
                        exeinto usr/lib/kernel/install.d
                        doexe src/kernel-install/*.install
                fi
@@ -503,12 +501,14 @@ multilib_src_install_all() {
        einstalldocs
        if use boot; then
                into /usr
-               exeinto usr/lib/kernel/install.d
-               doexe src/kernel-install/*.install
                dobashcomp shell-completion/bash/bootctl
                insinto /usr/share/zsh/site-functions
                doins shell-completion/zsh/{_bootctl,_kernel-install}
        fi
+       if use kernel-install; then
+               exeinto usr/lib/kernel/install.d
+               doexe src/kernel-install/*.install
+       fi
        if use tmpfiles; then
                doinitd "${FILESDIR}"/systemd-tmpfiles-setup
                doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev

diff --git a/sys-apps/systemd-utils/systemd-utils-254.8.ebuild 
b/sys-apps/systemd-utils/systemd-utils-254.8.ebuild
index af0e5dfe3c6a..b73e1d640a89 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.8.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.8.ebuild
@@ -446,8 +446,6 @@ multilib_src_install() {
                if use kernel-install; then
                        dobin kernel-install
                        doman man/kernel-install.8
-                       # copy the default set of plugins
-                       cp "${S}/src/kernel-install/"*.install 
src/kernel-install || die
                        exeinto usr/lib/kernel/install.d
                        doexe src/kernel-install/*.install
                fi
@@ -504,12 +502,14 @@ multilib_src_install_all() {
        einstalldocs
        if use boot; then
                into /usr
-               exeinto usr/lib/kernel/install.d
-               doexe src/kernel-install/*.install
                dobashcomp shell-completion/bash/bootctl
                insinto /usr/share/zsh/site-functions
                doins shell-completion/zsh/{_bootctl,_kernel-install}
        fi
+       if use kernel-install; then
+               exeinto usr/lib/kernel/install.d
+               doexe src/kernel-install/*.install
+       fi
        if use tmpfiles; then
                doinitd "${FILESDIR}"/systemd-tmpfiles-setup
                doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev