From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1517702-garchives=archives.gentoo.org@lists.gentoo.org>
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) server-digest SHA256)
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id C0C65158649
for <garchives@archives.gentoo.org>; Fri, 12 May 2023 01:00:53 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id E5694E0B0F;
Fri, 12 May 2023 01:00:52 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(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 C6614E0B0F
for <gentoo-commits@lists.gentoo.org>; Fri, 12 May 2023 01:00:52 +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) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id ACD06335C87
for <gentoo-commits@lists.gentoo.org>; Fri, 12 May 2023 01:00:51 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id EC4EEA60
for <gentoo-commits@lists.gentoo.org>; Fri, 12 May 2023 01:00:49 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1683853241.ac60912193f3a50953946c79ad10e71e209d836f.sam@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-253.4-r1.ebuild sys-apps/systemd-utils/systemd-utils-253.4.ebuild
X-VCS-Directories: sys-apps/systemd-utils/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: ac60912193f3a50953946c79ad10e71e209d836f
X-VCS-Branch: master
Date: Fri, 12 May 2023 01:00:49 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 53ce0b99-aaad-42fb-8c6e-392bbcd98778
X-Archives-Hash: 08421ccc795244de746d22d93bd110f5
commit: ac60912193f3a50953946c79ad10e71e209d836f
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri May 12 00:59:37 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May 12 01:00:41 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac609121
sys-apps/systemd-utils: install 90-loaderentry.install for USE=boot
This fixes installkernel/kernel-install with systemd-utils-253[boot]:
```
* CMP: =sys-apps/systemd-utils-253.4 with sys-apps/systemd-utils-253.4/image
* FILES:+usr/lib/kernel/install.d/90-loaderentry.install
* SIZE: 62.81MiB -> 62.82MiB, 119 -> 120 files
* ------> FILES(+1) SIZE(+0.00%)
```
90-loaderentry.install is generated from 90-loaderentry.install.in so it's
in the build dir, not the source dir, so we didn't pick it up. Also add it
to the targets as it's a custom_target.
Without this, 'kernel' wouldn't be installed to /boot, just 'initrd'.
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../{systemd-utils-253.4.ebuild => systemd-utils-253.4-r1.ebuild} | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/sys-apps/systemd-utils/systemd-utils-253.4.ebuild b/sys-apps/systemd-utils/systemd-utils-253.4-r1.ebuild
similarity index 98%
rename from sys-apps/systemd-utils/systemd-utils-253.4.ebuild
rename to sys-apps/systemd-utils/systemd-utils-253.4-r1.ebuild
index ad372c33f20e..f196ebea3aa4 100644
--- a/sys-apps/systemd-utils/systemd-utils-253.4.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-253.4-r1.ebuild
@@ -277,6 +277,7 @@ multilib_src_compile() {
kernel-install
man/bootctl.1
man/kernel-install.8
+ 90-loaderentry.install
src/boot/efi/linux$(efi_arch).{efi,elf}.stub
src/boot/efi/systemd-boot$(efi_arch).efi
)
@@ -414,6 +415,9 @@ multilib_src_install() {
into /usr
dobin bootctl kernel-install
doman man/{bootctl.1,kernel-install.8}
+ # 90-loaderentry.install is generated from 90-loaderentry.install.in
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
insinto usr/lib/systemd/boot/efi
doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
fi