From e48a011b84d1e83594a24810690f4c3d6f0d4e4a Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Tue, 10 Jan 2023 09:16:08 +0100 Subject: [PATCH] profiles: Disable split-usr for generic images completely We do specify -split-usr in make.defaults for the USE variable but it's not enough - the base profile in portage-stable forces this flag and this overrides our defaults. As a workaround, we were using package.use.force to force-disable split-usr for selected packages. Now, with addition of more split-usr-using packages in app-alternatives the list in package.use.force would grow. Instead of listing all the packages having split-usr in their IUSE, use the use.force and use.mask file to unforce and mask split-usr for all packages in generic images. As a bonus, this also allows us to drop a customization we did in sys-apps/policycoreutils package. --- .../profiles/coreos/targets/generic/package.use.force | 4 ---- .../coreos-overlay/profiles/coreos/targets/generic/use.force | 4 ++++ .../coreos-overlay/profiles/coreos/targets/generic/use.mask | 4 ++++ 3 files changed, 8 insertions(+), 4 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.use.force create mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/use.force create mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/use.mask 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 deleted file mode 100644 index 7b3b0d7387..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.use.force +++ /dev/null @@ -1,4 +0,0 @@ -# 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 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/use.force b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/use.force new file mode 100644 index 0000000000..f29fb18c73 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/use.force @@ -0,0 +1,4 @@ +# We don't have a separate /{bin,lib} and /usr/{bin,lib}. But the base +# profile in portage-stable forces split-usr, so here we unforce it +# and in use.mask we mask it. +-split-usr diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/use.mask b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/use.mask new file mode 100644 index 0000000000..9a467dab41 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/use.mask @@ -0,0 +1,4 @@ +# We don't have a separate /{bin,lib} and /usr/{bin,lib}. But the base +# profile in portage-stable forces split-usr, so in use.force we +# unforce it and here we mask it. +split-usr