From 5228888a5c29d68fb78ac14eced7269b1aed759a Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Wed, 16 Feb 2022 07:55:20 +0100 Subject: [PATCH] profiles/coreos: move gnuefi systemd USE flag to target SDK bootstrap is failing with: Message: sbat-distro (from ID): ../systemd-stable-250.3/src/boot/efi/meson.build:189:24: ERROR: Problem encountered: Required sbat-distro option not set and autodetection failed The gnuefi USE flag controls whether bootctl and systemd-boot are built, but we only need those on the target. Currently the USE flag is set for SDK as well, so move it to coreos/targets/generic. Signed-off-by: Jeremi Piotrowski --- .../coreos-overlay/profiles/coreos/base/package.use | 7 +++---- .../profiles/coreos/targets/generic/package.use | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use index 59f209a20e..df8d6d701f 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use @@ -28,10 +28,9 @@ net-analyzer/nmap ncat -system-lua # removes mta dependencies app-admin/sudo -sendmail -# use lzma which is the default on non-gentoo systems, use gnuefi for -# bootctl, enable selinux, disable hybrid cgroup as we use the unified -# mode now -sys-apps/systemd build curl idn lzma gnuefi selinux -cgroup-hybrid +# use lzma which is the default on non-gentoo systems, enable selinux, +# disable hybrid cgroup as we use the unified mode now +sys-apps/systemd build curl idn lzma selinux -cgroup-hybrid net-libs/libmicrohttpd -ssl # disable kernel config detection and module building diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.use index 2e7e73ed6f..db23a521ec 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.use +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.use @@ -19,8 +19,8 @@ sys-libs/ncurses minimal sys-libs/pam -berkdb audit sys-libs/gdbm berkdb -# enable journal gateway and container features -sys-apps/systemd audit importd http nat +# enable journal gateway, bootctl and container features +sys-apps/systemd audit gnuefi importd http nat # epoll is needed for systemd-journal-remote to work. coreos/bugs#919 net-libs/libmicrohttpd epoll