From c8d526dd0173d7e6902f4c6025c6884a766d0c18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20L=C3=BCke?= Date: Fri, 25 Sep 2020 18:14:12 +0200 Subject: [PATCH] sys-kernel/coreos-firmware: Disable savedconfig flag and file creation The savedconfig feature reads and, if not set, generates a file under /etc/portage/savedconfig/ to source a build configuration. We probably don't want this and specially not on the final image, therefore, disable reading and also don't write the file to the final image. --- .../coreos-overlay/profiles/coreos/base/package.use | 3 +++ .../coreos-firmware/coreos-firmware-99999999.ebuild | 7 ++++--- 2 files changed, 7 insertions(+), 3 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 8e431ab5ff..b23ddbbec2 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 @@ -104,3 +104,6 @@ app-misc/jq oniguruma # Disable sse2 from CPU_FLAGS_X86 to avoid config error around simd net-misc/rsync -cpu_flags_x86_sse2 + +# Don't read the firmware config from /etc/portage/savedconfig/ +sys-kernel/coreos-firmware -savedconfig diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/coreos-firmware-99999999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/coreos-firmware-99999999.ebuild index 60ef0eea51..9598604114 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/coreos-firmware-99999999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/coreos-firmware-99999999.ebuild @@ -166,9 +166,10 @@ src_prepare() { } src_install() { - if use !savedconfig; then - save_config ${PN}.conf - fi + # Flatcar: Don't save the firmware config to /etc/portage/savedconfig/ + # if use !savedconfig; then + # save_config ${PN}.conf + # fi rm ${PN}.conf || die insinto /lib/firmware/ doins -r *