From 66733328c65a30e84c5cbfe1ae5c4e91868611bd Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Mon, 13 Jun 2022 11:41:43 +0200 Subject: [PATCH] base/coreos: add ignition as a Flatcar dependency We add `sys-apps/ignition` as a `coreos-base/coreos` dependency to get `/usr/libexec/ignition-rmcfg` available on the _real_ root. Now we want `/usr/bin/ignition` to be in the chroot until it's being copied to the initramfs but we don't want it on the actual root. With `PKG_INSTALL_MASK`, we'll prevent `/usr/bin/ignition` to be added to the image in the `./build_image` - at this time, initramfs is already created and `sys-apps/ignition` is a binary package. Signed-off-by: Mathieu Tortuyaux --- .../coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild | 1 + .../coreos-overlay/profiles/coreos/base/make.defaults | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild index c583b3271e..f052baf90b 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild @@ -152,6 +152,7 @@ RDEPEND="${RDEPEND} sys-apps/gawk sys-apps/gptfdisk sys-apps/grep + sys-apps/ignition sys-apps/iproute2 sys-apps/kexec-tools sys-apps/keyutils diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults index 30715dc7dc..e65bd636c4 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults @@ -87,6 +87,11 @@ INSTALL_MASK=" /etc/acpi " +# Prevent 'ignition' binary from being installed from sys-apps/ignition binary package. +PKG_INSTALL_MASK=" + /usr/bin/ignition +" + # Keep the default languages small. # (not many things respect this though) LINGUAS="en"