From b5713961424d36cf5cbb5764e0ef62a613d2ebdc Mon Sep 17 00:00:00 2001 From: Harald Sitter Date: Sun, 31 Mar 2024 19:30:28 +0200 Subject: [PATCH] install systemd-bootchart to ease boot performance debugging --- mkosi.extra/usr/lib/initcpio/install/systemd-extension | 6 ++++-- mkosi.postinst.chroot | 5 ++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/mkosi.extra/usr/lib/initcpio/install/systemd-extension b/mkosi.extra/usr/lib/initcpio/install/systemd-extension index d399b51..814bf33 100644 --- a/mkosi.extra/usr/lib/initcpio/install/systemd-extension +++ b/mkosi.extra/usr/lib/initcpio/install/systemd-extension @@ -6,9 +6,11 @@ build() { map add_binary \ /usr/lib/systemd/systemd-volatile-root \ /usr/bin/_kdeos-overlay \ - /usr/lib/systemd/system-generators/kdeos-live-generator + /usr/lib/systemd/system-generators/kdeos-live-generator \ + /usr/lib/systemd/systemd-bootchart map add_systemd_unit \ systemd-volatile-root.service \ - kdeos-overlay.service + kdeos-overlay.service \ + systemd-bootchart.service } diff --git a/mkosi.postinst.chroot b/mkosi.postinst.chroot index 659da2a..3493370 100755 --- a/mkosi.postinst.chroot +++ b/mkosi.postinst.chroot @@ -44,10 +44,13 @@ su - builder -c "git clone https://aur.archlinux.org/yay.git /tmp/yay-build/yay" su - builder -c "cd /tmp/yay-build/yay && makepkg --noconfirm" pacman --noconfirm --upgrade /tmp/yay-build/yay/*.pkg.tar.* pacman --noconfirm --sync libinih libnsl liburcu lzo python apparmor autoconf-archive go-tools python-docutils squashfs-tools xfsprogs +# For build deps for systemd-bootchart +pacman --noconfirm --sync intltool docbook-xsl # FIXME: something breaks with snap-confines setuid bit, it doesn't arrive in the final image -su - builder -c "yay --noconfirm --sync --sudo /bin/true snapd steam-devices-git" +su - builder -c "yay --noconfirm --sync --sudo /bin/true snapd steam-devices-git systemd-bootchart" pacman --noconfirm --upgrade /home/builder/.cache/yay/snapd/*.pkg.tar.* pacman --noconfirm --upgrade /home/builder/.cache/yay/steam-devices-git/*.pkg.tar.* +pacman --noconfirm --upgrade /home/builder/.cache/yay/systemd-bootchart/*.pkg.tar.* touch /var/lib/snapd/apparmor/snap-confine/.keep # this has been gotten lost in the past for unknown reasons userdel --remove builder rm /etc/sudoers.d/builder