From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id ABF16158041 for ; Sat, 23 Mar 2024 19:57:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F158DE2A77; Sat, 23 Mar 2024 19:57:49 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D9FC6E2A77 for ; Sat, 23 Mar 2024 19:57:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1A7C734164C for ; Sat, 23 Mar 2024 19:57:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 87E931564 for ; Sat, 23 Mar 2024 19:57:47 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1711223864.4eb56bda286f2d845477a287d1c69ef1c339b7dd.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/systemd-utils/systemd-utils-254.10.ebuild sys-apps/systemd-utils/systemd-utils-254.8.ebuild X-VCS-Directories: sys-apps/systemd-utils/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 4eb56bda286f2d845477a287d1c69ef1c339b7dd X-VCS-Branch: master Date: Sat, 23 Mar 2024 19:57:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 180b8e35-060c-4a69-b608-396c6a71f466 X-Archives-Hash: 31be6d56bcca47e9cd48e62b661430c0 commit: 4eb56bda286f2d845477a287d1c69ef1c339b7dd Author: Mike Gilbert gentoo org> AuthorDate: Sat Mar 23 19:37:55 2024 +0000 Commit: Mike Gilbert gentoo 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 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