From 5bf90df9a4c57b3600e5ef7a6ffe3b8e08d575d8 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Tue, 13 Dec 2022 15:34:38 +0100 Subject: [PATCH] profiles: Disable binpkg-multi-instance feature The binpkg-multi-instance feature seems to be about having multiple binary packages of a single source package, in case those packages were built with different USE flags and stuff. So far we have not used this feature, and it looks like that the update of portage has made this feature to be enabled by default. The enabling broke the image build, because this feature makes portage to use a bit different directory structure to store binary packages. So instead of storing sys-devel/gcc binary package in ${PKGDIR}/sys-devel/gcc-${VERSION}.tbz2, the binary package is stored in ${PKGDIR}/sys-devel/gcc/gcc-${VERSION}-${BUILD_ID}.xpak. Maybe we could consider using this feature at some point in future, but for now disable it to keep building things working. --- .../coreos-overlay/profiles/coreos/base/make.defaults | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 b976a01424..a7cb3dd0c6 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 @@ -105,7 +105,7 @@ PORTAGE_BUNZIP2_COMMAND="lbunzip2" # Always build binary packages, remove old build logs, avoid running as root. FEATURES="buildpkg clean-logs compressdebug parallel-install splitdebug userfetch userpriv usersandbox ipc-sandbox network-sandbox - -ccache -merge-sync" + -ccache -merge-sync -binpkg-multi-instance" # No need to restrict access to build directories in dev environments. PORTAGE_WORKDIR_MODE="0755"