From db14a01fc791f8bcf87c13bf326eae8402063a4b Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Fri, 9 Dec 2022 11:45:17 +0100 Subject: [PATCH] profiles: Do not install repos.conf from sys-apps/portage The package installs a default repos.conf in /usr/share/portage/config/repos.conf. Normally it contained a default configuration for gentoo repository, but we have a modification in the ebuild that clobbers the contents of the file with a comment line. Which means that this configuration file is empty. We do so, because we are putting our own configuration in /etc anyway. To minimize the amount of modifications put into the ebuild, we can add /usr/share/portage/config/repos.conf into INSTALL_MASK. This is one modification less and it's putting us closer to moving sys-apps/portage to portage-stable. --- .../coreos-overlay/profiles/coreos/base/make.defaults | 2 ++ 1 file changed, 2 insertions(+) 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 e65bd636c4..b976a01424 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 @@ -80,11 +80,13 @@ CONFIG_PROTECT=" # Remove Gentoo init files since we use systemd. # Remove build-id, there is some issue with it causing collisions. # Remove default files from sys-power/acpid. +# Do not install default repos.conf, we always put repository configuration in /etc. INSTALL_MASK=" /usr/lib*/*.la /etc/init.d /etc/conf.d /usr/lib/debug/.build-id /etc/acpi + /usr/share/portage/config/repos.conf " # Prevent 'ignition' binary from being installed from sys-apps/ignition binary package.