From 110f58e4d1484e750581f7ad66285fb8e0a941c8 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Mon, 25 Jan 2021 07:59:35 +0100 Subject: [PATCH] profiles: Disable split-usr explicitly for generic images We don't want to have separate /bin, /lib, /usr/bin and /usr/lib directories. The former two are meant to be symlinks to the latter two. The `split-usr` USE flag gets enabled with the profiles update in portage-stable, so before doing the update, clear the flag in the overlay. This is not done for SDK images, since they seem to have split /usr on purpose. --- .../profiles/coreos/targets/generic/package.use.force | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.use.force diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.use.force b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.use.force new file mode 100644 index 0000000000..7b3b0d7387 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.use.force @@ -0,0 +1,4 @@ +# We don't have a separate /{bin,lib} and /usr/{bin,lib} +sys-apps/coreutils -split-usr +sys-apps/systemd -split-usr +sys-apps/shadow -split-usr