From e798d0a1b462a99e20136d98c4fcebe0d140d958 Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Tue, 12 Dec 2023 17:11:59 +0000 Subject: [PATCH] WIP: grub_install: switch to BOARD_GRUB by default Signed-off-by: Jeremi Piotrowski --- build_library/grub_install.sh | 2 +- .../coreos-devel/board-packages/board-packages-0.0.1.ebuild | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/build_library/grub_install.sh b/build_library/grub_install.sh index 3cd3f8053c..e176998f59 100755 --- a/build_library/grub_install.sh +++ b/build_library/grub_install.sh @@ -50,7 +50,7 @@ CORE_NAME= # Whether the SDK's grub or the board root's grub is used. Once amd64 is # fixed up the board root's grub will always be used. -BOARD_GRUB=0 +BOARD_GRUB=1 case "${FLAGS_target}" in i386-pc) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1.ebuild index e24bee2c0a..9cd818a194 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1.ebuild @@ -25,9 +25,7 @@ RDEPEND=" coreos-base/nova-agent-container coreos-base/nova-agent-watcher ) - arm64? ( - sys-boot/grub - ) + sys-boot/grub app-containers/containerd app-containers/docker app-containers/docker-cli