From 617decbbc3faa9ffe73a20cc0ee07b4d0bb458b2 Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Thu, 3 Jul 2025 16:55:07 +0100 Subject: [PATCH 1/2] sys-kernel/coreos-kernel: Tighten dependencies to ensure working initrd In particular, sys-fs/lvm2 includes dmsetup, and systemd will fail to recognise /dev/mapper/usr if that is built without udev support. This is not a problem in CI, but a fresh SDK will have board packages installed without their final USE flags in place due to cyclic dependencies. Signed-off-by: James Le Cuirot --- .../sys-kernel/coreos-kernel/coreos-kernel-6.12.35.ebuild | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-6.12.35.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-6.12.35.ebuild index a8b19410cb..cea1123a3e 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-6.12.35.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-6.12.35.ebuild @@ -37,10 +37,12 @@ DEPEND=" sys-apps/shadow sys-apps/systemd[cryptsetup] sys-apps/seismograph - sys-apps/util-linux + sys-apps/util-linux[cryptsetup,udev] sys-block/open-iscsi sys-fs/btrfs-progs + sys-fs/cryptsetup[udev] sys-fs/e2fsprogs + sys-fs/lvm2[udev] sys-fs/mdadm sys-fs/xfsprogs >=sys-kernel/bootengine-0.0.38-r37:= From d78421a362cb7ca8eeb75852f74f9760f7851356 Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Wed, 28 May 2025 17:46:06 +0100 Subject: [PATCH 2/2] grub_install.sh: Ensure shim packages are installed Without these, build_image will fail in a fresh SDK instance. Signed-off-by: James Le Cuirot --- build_library/grub_install.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build_library/grub_install.sh b/build_library/grub_install.sh index 61e2fc6fb8..0c0dfe0bb0 100755 --- a/build_library/grub_install.sh +++ b/build_library/grub_install.sh @@ -75,7 +75,9 @@ esac info "Updating GRUB in ${BOARD_ROOT}" emerge-${BOARD} \ --nodeps --select --verbose --update --getbinpkg --usepkgonly --newuse \ - sys-boot/grub + sys-boot/grub \ + sys-boot/shim \ + sys-boot/shim-signed GRUB_SRC="${BOARD_ROOT}/usr/lib/grub/${FLAGS_target}" [[ -d "${GRUB_SRC}" ]] || die "GRUB not installed at ${GRUB_SRC}"