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

Reply via email to